--- common/video/iso-mpeg4/src/vtc_ztq_QMUtils.cpp.orig 2005-05-04 13:56:01.000000000 -0600 +++ common/video/iso-mpeg4/src/vtc_ztq_QMUtils.cpp 2009-11-19 04:49:28.000000000 -0700 @@ -314,7 +314,7 @@ COEFF_STATE(x,y,c) = S_VAL; break; default: - errorHandler("updateState: type %d for state %d is invalid.", + errorHandler((char*)"updateState: type %d for state %d is invalid.", type, COEFF_STATE(x,y,c)); } break; @@ -328,7 +328,7 @@ COEFF_STATE(x,y,c) = S_VAL; break; default: - errorHandler("updateState: type %d for state %d is invalid.", + errorHandler((char*)"updateState: type %d for state %d is invalid.", type, COEFF_STATE(x,y,c)); } break; @@ -342,7 +342,7 @@ COEFF_STATE(x,y,c) = S_VAL; break; default: - errorHandler("updateState: type %d for state %d is invalid.", + errorHandler((char*)"updateState: type %d for state %d is invalid.", type, COEFF_STATE(x,y,c)); } break; @@ -361,7 +361,7 @@ COEFF_STATE(x,y,c) = S_LVZTR; break; default: - errorHandler("updateState: type %d for state %d is invalid.", + errorHandler((char*)"updateState: type %d for state %d is invalid.", type, COEFF_STATE(x,y,c)); } break; @@ -370,7 +370,7 @@ case S_LVZTR: break; default: - errorHandler("updateState: state %d is invalid.", COEFF_STATE(x,y,c)); + errorHandler((char*)"updateState: state %d is invalid.", COEFF_STATE(x,y,c)); } } @@ -458,7 +458,7 @@ Int oldWidth, oldHeight; Int xLeafStart, yLeafStart; - noteDetail("Updating new coefficients in spatial layer for col %d....",c); + noteDetail((char*)"Updating new coefficients in spatial layer for col %d....",c); oldWidth = mzte_codec.m_spaLayerWidth[mzte_codec.m_iCurSpatialLev][c]>>1; oldHeight = mzte_codec.m_spaLayerHeight[mzte_codec.m_iCurSpatialLev][c]>>1; @@ -486,7 +486,7 @@ COEFF_STATE(x,y,c) = S_INIT; break; default: - errorHandler("Non-leaf state (%d) for leaf coefficient at"\ + errorHandler((char*)"Non-leaf state (%d) for leaf coefficient at"\ "(x=%d, y=%d).", COEFF_STATE(x, y,c), x, y); } @@ -510,7 +510,7 @@ COEFF_STATE(x,y,c) = S_INIT; break; default: - errorHandler("Non-leaf state (%d) for leaf coefficient at"\ + errorHandler((char*)"Non-leaf state (%d) for leaf coefficient at"\ "(x=%d, y=%d).", COEFF_STATE(x, y,c), x, y); } @@ -534,12 +534,12 @@ COEFF_STATE(x,y,c) = S_INIT; break; default: - errorHandler("Non-leaf state (%d) for leaf coefficient at"\ + errorHandler((char*)"Non-leaf state (%d) for leaf coefficient at"\ "(x=%d, y=%d).", COEFF_STATE(x, y,c), x, y); } - noteDetail("Completed updating new coefficients in spatial layer."); + noteDetail((char*)"Completed updating new coefficients in spatial layer."); }