From cdc800b0869afd6262cad0e4d8ff12694b0971f8 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 23 Mar 2016 20:28:58 +0100
Subject: [PATCH] Fix setting of nodata value for grayscale rasters

---
 plugins/input/pgraster/pgraster_wkb_reader.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/input/pgraster/pgraster_wkb_reader.cpp b/plugins/input/pgraster/pgraster_wkb_reader.cpp
index d3304a7cf..b97d0cdc3 100644
--- a/plugins/input/pgraster/pgraster_wkb_reader.cpp
+++ b/plugins/input/pgraster/pgraster_wkb_reader.cpp
@@ -269,15 +269,13 @@ mapnik::raster_ptr read_grayscale_band(mapnik::box2d<double> const& bbox,
   image.set(0xffffffff);
 
 
-  int val;
-  int nodataval;
   uint8_t * data = image.bytes();
   int ps = 4; // sizeof(image::pixel_type)
   int off;
-  nodataval = reader(); // nodata value, need to read anyway
+  int nodataval = reader();
   for (int y=0; y<height; ++y) {
     for (int x=0; x<width; ++x) {
-      val = reader();
+      int val = reader();
       // Apply harsh type clipping rules ala GDAL
       if ( val < 0 ) val = 0;
       if ( val > 255 ) val = 255;
@@ -297,7 +295,7 @@ mapnik::raster_ptr read_grayscale_band(mapnik::box2d<double> const& bbox,
     }
   }
   mapnik::raster_ptr raster = std::make_shared<mapnik::raster>(bbox, image, 1.0);
-  if ( hasnodata ) raster->set_nodata(val);
+  if ( hasnodata ) raster->set_nodata(nodataval);
   return raster;
 }