Better to use unsigned char

mhugent · mhugent · commit 7747d1fdeaf0 · 2012-01-18T17:08:23.000+01:00
diff --git a/src/analysis/raster/qgsrelief.cpp b/src/analysis/raster/qgsrelief.cpp
@@ -164,9 +164,9 @@ int QgsRelief::processRaster( QProgressDialog* p )
   float* scanLine2 = ( float * ) CPLMalloc( sizeof( float ) * xSize );
   float* scanLine3 = ( float * ) CPLMalloc( sizeof( float ) * xSize );
 
-  char* resultRedLine = ( char * ) CPLMalloc( sizeof( char ) * xSize );
-  char* resultGreenLine = ( char * ) CPLMalloc( sizeof( char ) * xSize );
-  char* resultBlueLine = ( char * ) CPLMalloc( sizeof( char ) * xSize );
+  unsigned char* resultRedLine = ( unsigned char * ) CPLMalloc( sizeof( unsigned char ) * xSize );
+  unsigned char* resultGreenLine = ( unsigned char * ) CPLMalloc( sizeof( unsigned char ) * xSize );
+  unsigned char* resultBlueLine = ( unsigned char * ) CPLMalloc( sizeof( unsigned char ) * xSize );
 
   if ( p )
   {
@@ -278,7 +278,7 @@ int QgsRelief::processRaster( QProgressDialog* p )
 }
 
 bool QgsRelief::processNineCellWindow( float* x1, float* x2, float* x3, float* x4, float* x5, float* x6, float* x7, float* x8, float* x9,
-                                       char* red, char* green, char* blue )
+                                       unsigned char* red, unsigned char* green, unsigned char* blue )
 {
   //1. component: colour and hillshade from 300 degrees
   int r = 0;
@@ -363,9 +363,9 @@ bool QgsRelief::processNineCellWindow( float* x1, float* x2, float* x3, float* x
     b = b3 * 0.1 + b * 0.9;
   }
 
-  *red = ( char )r;
-  *green = ( char )g;
-  *blue = ( char )b;
+  *red = ( unsigned char )r;
+  *green = ( unsigned char )g;
+  *blue = ( unsigned char )b;
   return true;
 }
 
diff --git a/src/analysis/raster/qgsrelief.h b/src/analysis/raster/qgsrelief.h
@@ -89,7 +89,7 @@ class ANALYSIS_EXPORT QgsRelief
     QList< ReliefColor > mReliefColors;
 
     bool processNineCellWindow( float* x1, float* x2, float* x3, float* x4, float* x5, float* x6, float* x7, float* x8, float* x9,
-                                char* red, char* green, char* blue );
+                                unsigned char* red, unsigned char* green, unsigned char* blue );
 
     /**Opens the input file and returns the dataset handle and the number of pixels in x-/y- direction*/
     GDALDatasetH openInputFile( int& nCellsX, int& nCellsY );

Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,9 @@ int QgsRelief::processRaster( QProgressDialog* p )`
`164`	`164`	`float* scanLine2 = ( float * ) CPLMalloc( sizeof( float ) * xSize );`
`165`	`165`	`float* scanLine3 = ( float * ) CPLMalloc( sizeof( float ) * xSize );`
`166`	`166`
`167`		`- char* resultRedLine = ( char * ) CPLMalloc( sizeof( char ) * xSize );`
`168`		`- char* resultGreenLine = ( char * ) CPLMalloc( sizeof( char ) * xSize );`
`169`		`- char* resultBlueLine = ( char * ) CPLMalloc( sizeof( char ) * xSize );`
	`167`	`+ unsigned char* resultRedLine = ( unsigned char * ) CPLMalloc( sizeof( unsigned char ) * xSize );`
	`168`	`+ unsigned char* resultGreenLine = ( unsigned char * ) CPLMalloc( sizeof( unsigned char ) * xSize );`
	`169`	`+ unsigned char* resultBlueLine = ( unsigned char * ) CPLMalloc( sizeof( unsigned char ) * xSize );`
`170`	`170`
`171`	`171`	`if ( p )`
`172`	`172`	`{`
`@@ -278,7 +278,7 @@ int QgsRelief::processRaster( QProgressDialog* p )`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`bool QgsRelief::processNineCellWindow( float* x1, float* x2, float* x3, float* x4, float* x5, float* x6, float* x7, float* x8, float* x9,`
`281`		`- char* red, char* green, char* blue )`
	`281`	`+ unsigned char* red, unsigned char* green, unsigned char* blue )`
`282`	`282`	`{`
`283`	`283`	`//1. component: colour and hillshade from 300 degrees`
`284`	`284`	`int r = 0;`
`@@ -363,9 +363,9 @@ bool QgsRelief::processNineCellWindow( float* x1, float* x2, float* x3, float* x`
`363`	`363`	`b = b3 * 0.1 + b * 0.9;`
`364`	`364`	`}`
`365`	`365`
`366`		`- *red = ( char )r;`
`367`		`- *green = ( char )g;`
`368`		`- *blue = ( char )b;`
	`366`	`+ *red = ( unsigned char )r;`
	`367`	`+ *green = ( unsigned char )g;`
	`368`	`+ *blue = ( unsigned char )b;`
`369`	`369`	`return true;`
`370`	`370`	`}`
`371`	`371`