From 6b28fc27cc86efe1b6d61d0ff063253624f3a210 Mon Sep 17 00:00:00 2001 From: rblazek Date: Thu, 11 Feb 2010 09:53:41 +0000 Subject: [PATCH] handle better null values git-svn-id: http://svn.osgeo.org/qgis/trunk@12924 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/providers/grass/qgis.g.info.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/providers/grass/qgis.g.info.c b/src/providers/grass/qgis.g.info.c index 6fdcaf92ca29..1a4843793450 100644 --- 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 );