casa-mp-base

--- common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp.orig 2005-05-04 13:56:00.000000000 -0600

+++ common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp  2009-11-19 02:54:25.000000000 -0700

@@ -379,7 +379,7 @@

     emit_bits((UShort)MARKER_BIT, 1);   /* marker_bit */    

     emit_bits((UShort)mzte_codec.m_iHeight, 15);  /* object_height */    

     emit_bits((UShort)MARKER_BIT, 1);  /* marker_bit */

-    noteProgress("Merge Shape Bitstream ....");

+    noteProgress((char*)"Merge Shape Bitstream ....");

     // MergeShapeBitstream();

   }

 }

@@ -582,7 +582,7 @@

        if ( mzte_codec.m_tiling_disable == 1 && SkipShape == 0 ){ // @@@@@@@

 // FPDAM end: added by Sharp

    //begin: added by SL@Sarnoff (03/03/99)

-   noteProgress("Encoding Shape Bitstream ....");

+   noteProgress((char*)"Encoding Shape Bitstream ....");

     ShapeEnCoding(mzte_codec.m_Image[0].mask, mzte_codec.m_iWidth, mzte_codec.m_iHeight, 

          mzte_codec.m_iWvtDecmpLev, 

          mzte_codec.m_iSTOConstAlpha,

@@ -664,7 +664,7 @@

 {

   Int col, err;

-  noteProgress("Encoding DC coefficients....");

+  noteProgress((char*)"Encoding DC coefficients....");

   for (col=0; col<mzte_codec.m_iColors; col++) 

   {

@@ -673,11 +673,11 @@

     /* initialize DC coefficient info */

     if ((err=ztqInitDC(0, col)))

-      errorHandler("ztqInitDC");

+      errorHandler((char*)"ztqInitDC");

     /* quantize DC coefficients */

     if ((err=encQuantizeDC(col)))

-      errorHandler("encQuantizeDC");

+      errorHandler((char*)"encQuantizeDC");

     /* losslessly encoding DC coefficients */

     wavelet_dc_encode(col);

@@ -685,7 +685,7 @@

     // writeStats();

   }  

-  noteProgress("Completed encoding DC coefficients.");

+  noteProgress((char*)"Completed encoding DC coefficients.");

 }

 /**********************************************************/

@@ -702,7 +702,7 @@

       Put_Quant_and_Max_SQBB(snr_image, spa_lev, col);

     }

    for (col=0; col<mzte_codec.m_iColors; col++) {

-        noteProgress("Single-Quant Mode (Band by Band) - Spatial %d, SNR 0, "\

+        noteProgress((char*)"Single-Quant Mode (Band by Band) - Spatial %d, SNR 0, "\

                  "Color %d",spa_lev,col);

         mzte_codec.m_iCurColor = col;

@@ -754,7 +754,7 @@

   SNR_IMAGE *snr_image;

-  noteProgress("Encoding AC coefficients - Single-Quant Mode....");

+  noteProgress((char*)"Encoding AC coefficients - Single-Quant Mode....");

   /*------- AC: Set spatial and SNR levels to zero -------*/

   mzte_codec.m_iCurSpatialLev = 0;

@@ -776,11 +776,11 @@

     /* initialize AC coefficient info for each color component */

     if ((err=ztqInitAC(0, col)))

-      errorHandler("ztqInitAC");

+      errorHandler((char*)"ztqInitAC");

     /* quantize and mark zerotree structure for AC coefficients */

     if ((err=encQuantizeAndMarkAC(col)))

-      errorHandler("encQuantizeAndMarkAC");

+      errorHandler((char*)"encQuantizeAndMarkAC");

   }

@@ -831,7 +831,7 @@

   /*mzte_codec.m_iTargetSpatialLev = 1;

   mzte_codec.m_iTargetSNRLev = 1; */ //deleted by SL@Sarnoff (03/03/99)

-  noteProgress("Completed encoding AC coefficients - Single-Quant Mode.");

+  noteProgress((char*)"Completed encoding AC coefficients - Single-Quant Mode.");

 }