From ef5a04df564ad5c27406c41fb55e32ad3aa39d25 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 27 Feb 2012 17:55:22 -0600 Subject: Rename tqt3 color functions --- kjsembed/plugins/imagefx_plugin.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kjsembed/plugins') diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp index ef3d0ed0..b7da9e91 100644 --- a/kjsembed/plugins/imagefx_plugin.cpp +++ b/kjsembed/plugins/imagefx_plugin.cpp @@ -560,9 +560,9 @@ inline const T& kClamp( const T& x, const T& low, const T& high ) } static inline unsigned int intensityValue( unsigned int color ) { - return (unsigned int)( (0.299*qRed( color ) + - 0.587*qGreen( color ) + - 0.1140000000000001*qBlue( color ) ) ); + return (unsigned int)( (0.299*tqRed( color ) + + 0.587*tqGreen( color ) + + 0.1140000000000001*tqBlue( color ) ) ); } struct BumpmapParams { @@ -643,7 +643,7 @@ static void bumpmap_convert_row( uint *row, unsigned int idx = (unsigned int)(intensityValue( *row ) + 0.5); *p++ = lut[(unsigned int) ( waterlevel + ( ( idx - - waterlevel) * qBlue( *row )) / 255.0 )]; + waterlevel) * tqBlue( *row )) / 255.0 )]; } else { unsigned int idx = (unsigned int)(intensityValue( *row ) + 0.5); *p++ = lut[idx]; @@ -730,19 +730,19 @@ static void bumpmap_row( uint *src, * also change */ if (compensate) { - int red = (int)((qRed( *src ) * shade) / (params->compensation * 255)); - int green = (int)((qGreen( *src ) * shade) / (params->compensation * 255)); - int blue = (int)((qBlue( *src ) * shade) / (params->compensation * 255)); - int alpha = (int)((qAlpha( *src ) * shade) / (params->compensation * 255)); + int red = (int)((tqRed( *src ) * shade) / (params->compensation * 255)); + int green = (int)((tqGreen( *src ) * shade) / (params->compensation * 255)); + int blue = (int)((tqBlue( *src ) * shade) / (params->compensation * 255)); + int alpha = (int)((tqAlpha( *src ) * shade) / (params->compensation * 255)); ++src; - *dest++ = qRgba( red, green, blue, alpha ); + *dest++ = tqRgba( red, green, blue, alpha ); } else { - int red = qRed( *src ) * shade / 255; - int green = qGreen( *src ) * shade / 255; - int blue = qBlue( *src ) * shade / 255; - int alpha = qAlpha( *src ) * shade / 255; + int red = tqRed( *src ) * shade / 255; + int green = tqGreen( *src ) * shade / 255; + int blue = tqBlue( *src ) * shade / 255; + int alpha = tqAlpha( *src ) * shade / 255; ++src; - *dest++ = qRgba( red, green, blue, alpha ); + *dest++ = tqRgba( red, green, blue, alpha ); } /* Next pixel */ -- cgit v1.2.1