[trunk] Remove remaining of OPJ_INT64_F/OPJ_UINT64_F before move to C99 convention

[openjpeg.git] / libopenjpeg / mct.c

diff --git a/libopenjpeg/mct.c b/libopenjpeg/mct.c
index 870993b06d250b01f4a8163b960dd00934190224..2cf581be2cdfc2b4a3fe61225035d0246c1279d1 100644 (file)
--- a/libopenjpeg/mct.c
+++ b/libopenjpeg/mct.c
@@ -45,6 +45,16 @@ static const double mct_norms[3] = { 1.732, .8292, .8292 };
 /* </summary> */
 static const double mct_norms_real[3] = { 1.732, 1.805, 1.573 };
 
+const OPJ_FLOAT64 * get_mct_norms ()
+{
+       return mct_norms;
+}
+
+const OPJ_FLOAT64 * get_mct_norms_real ()
+{
+       return mct_norms_real;
+}
+
 /* <summary> */
 /* Foward reversible MCT. */
 /* </summary> */
@@ -188,3 +198,114 @@ void mct_decode_real(
 double mct_getnorm_real(int compno) {
        return mct_norms_real[compno];
 }
+
+
+opj_bool mct_encode_custom(
+                                          // MCT data
+                                          OPJ_BYTE * pCodingdata,
+                                          // size of components
+                                          OPJ_UINT32 n,
+                                          // components
+                                          OPJ_BYTE ** pData,
+                                          // nb of components (i.e. size of pData)
+                                          OPJ_UINT32 pNbComp,
+                                          // tells if the data is signed
+                                          OPJ_UINT32 isSigned)
+{
+       OPJ_FLOAT32 * lMct = (OPJ_FLOAT32 *) pCodingdata;
+       OPJ_UINT32 i;
+       OPJ_UINT32 j;
+       OPJ_UINT32 k;
+       OPJ_UINT32 lNbMatCoeff = pNbComp * pNbComp;
+       OPJ_INT32 * lCurrentData = 00;
+       OPJ_INT32 * lCurrentMatrix = 00;
+       OPJ_INT32 ** lData = (OPJ_INT32 **) pData;
+       OPJ_UINT32 lMultiplicator = 1 << 13;
+       OPJ_INT32 * lMctPtr;
+
+       lCurrentData = (OPJ_INT32 *) opj_malloc((pNbComp + lNbMatCoeff) * sizeof(OPJ_INT32));
+       if (! lCurrentData) {
+               return OPJ_FALSE;
+       }
+
+       lCurrentMatrix = lCurrentData + pNbComp;
+
+       for (i =0;i<lNbMatCoeff;++i) {
+               lCurrentMatrix[i] = (OPJ_INT32) (*(lMct++) * lMultiplicator);
+       }
+
+       for (i = 0; i < n; ++i)  {
+               lMctPtr = lCurrentMatrix;
+               for (j=0;j<pNbComp;++j) {
+                       lCurrentData[j] = (*(lData[j]));
+               }
+
+               for (j=0;j<pNbComp;++j) {
+                       *(lData[j]) = 0;
+                       for (k=0;k<pNbComp;++k) {
+                               *(lData[j]) += fix_mul(*lMctPtr, lCurrentData[k]);
+                               ++lMctPtr;
+                       }
+
+                       ++lData[j];
+               }
+       }
+
+       opj_free(lCurrentData);
+
+       return OPJ_TRUE;
+}
+
+opj_bool mct_decode_custom(
+                                          /* MCT data */
+                                          OPJ_BYTE * pDecodingData,
+                                          /* size of components */
+                                          OPJ_UINT32 n,
+                                          /* components */
+                                          OPJ_BYTE ** pData,
+                                          /* nb of components (i.e. size of pData) */
+                                          OPJ_UINT32 pNbComp,
+                                          /* tells if the data is signed */
+                                          OPJ_UINT32 isSigned)
+{
+       OPJ_FLOAT32 * lMct;
+       OPJ_UINT32 i;
+       OPJ_UINT32 j;
+       OPJ_UINT32 k;
+
+       OPJ_FLOAT32 * lCurrentData = 00;
+       OPJ_FLOAT32 * lCurrentResult = 00;
+       OPJ_FLOAT32 ** lData = (OPJ_FLOAT32 **) pData;
+
+       lCurrentData = (OPJ_FLOAT32 *) opj_malloc (2 * pNbComp * sizeof(OPJ_FLOAT32));
+       if
+               (! lCurrentData)
+       {
+               return OPJ_FALSE;
+       }
+       lCurrentResult = lCurrentData + pNbComp;
+
+       for
+               (i = 0; i < n; ++i)
+       {
+               lMct = (OPJ_FLOAT32 *) pDecodingData;
+               for
+                       (j=0;j<pNbComp;++j)
+               {
+                       lCurrentData[j] = (OPJ_FLOAT32) (*(lData[j]));
+               }
+               for
+                       (j=0;j<pNbComp;++j)
+               {
+                       lCurrentResult[j] = 0;
+                       for
+                               (k=0;k<pNbComp;++k)
+                       {
+                               lCurrentResult[j] += *(lMct++) * lCurrentData[k];
+                       }
+                       *(lData[j]++) = (OPJ_FLOAT32) (lCurrentResult[j]);
+               }
+       }
+       opj_free(lCurrentData);
+       return OPJ_TRUE;
+}