handle better null values

rblazek · rblazek · commit 6b28fc27cc86 · 2010-02-11T09:53:41.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12924 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/grass/qgis.g.info.c b/src/providers/grass/qgis.g.info.c
@@ -108,6 +108,8 @@ int main( int argc, char **argv )
         rast_type = G_get_raster_map_type( fd );
         cell = G_allocate_c_raster_buf();
         dcell = G_allocate_d_raster_buf();
+        void *ptr;
+        double val;
 
         if ( rast_type == CELL_TYPE )
         {
@@ -116,7 +118,8 @@ int main( int argc, char **argv )
             G_fatal_error(( "Unable to read raster map <%s> row %d" ),
                           rast_opt->answer, row );
           }
-          fprintf( stdout, "value:%d\n", cell[col] );
+          val = cell[col];
+          ptr = &(cell[col]);
         }
         else
         {
@@ -125,7 +128,16 @@ int main( int argc, char **argv )
             G_fatal_error(( "Unable to read raster map <%s> row %d" ),
                           rast_opt->answer, row );
           }
-          fprintf( stdout, "value:%f\n", dcell[col] );
+          val = dcell[col];
+          ptr = &(dcell[col]);
+        }
+        if ( G_is_null_value( ptr, rast_type ) )
+        {
+          fprintf( stdout, "value:null\n" );
+        }
+        else
+        {
+          fprintf( stdout, "value:%f\n", val );
         }
       }
       G_close_cell( fd );

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,8 @@ int main( int argc, char **argv )`
`108`	`108`	`rast_type = G_get_raster_map_type( fd );`
`109`	`109`	`cell = G_allocate_c_raster_buf();`
`110`	`110`	`dcell = G_allocate_d_raster_buf();`
	`111`	`+ void *ptr;`
	`112`	`+ double val;`
`111`	`113`
`112`	`114`	`if ( rast_type == CELL_TYPE )`
`113`	`115`	`{`
`@@ -116,7 +118,8 @@ int main( int argc, char **argv )`
`116`	`118`	`G_fatal_error(( "Unable to read raster map <%s> row %d" ),`
`117`	`119`	`rast_opt->answer, row );`
`118`	`120`	`}`
`119`		`- fprintf( stdout, "value:%d\n", cell[col] );`
	`121`	`+ val = cell[col];`
	`122`	`+ ptr = &(cell[col]);`
`120`	`123`	`}`
`121`	`124`	`else`
`122`	`125`	`{`
`@@ -125,7 +128,16 @@ int main( int argc, char **argv )`
`125`	`128`	`G_fatal_error(( "Unable to read raster map <%s> row %d" ),`
`126`	`129`	`rast_opt->answer, row );`
`127`	`130`	`}`
`128`		`- fprintf( stdout, "value:%f\n", dcell[col] );`
	`131`	`+ val = dcell[col];`
	`132`	`+ ptr = &(dcell[col]);`
	`133`	`+ }`
	`134`	`+ if ( G_is_null_value( ptr, rast_type ) )`
	`135`	`+ {`
	`136`	`+ fprintf( stdout, "value:null\n" );`
	`137`	`+ }`
	`138`	`+ else`
	`139`	`+ {`
	`140`	`+ fprintf( stdout, "value:%f\n", val );`
`129`	`141`	`}`
`130`	`142`	`}`
`131`	`143`	`G_close_cell( fd );`