From: Bborie Park <bkpark at ucdavis.edu>
Date: Tue, 27 Mar 2012 19:25:23 +0000 (+0000)
Subject: Merge branch 'master' into HEAD
X-Git-Tag: 2.0.0rc1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e3c40f0f2a0ae7beb54e71dc9a9588c7b488b36;p=postgis

Merge branch 'master' into HEAD

git-svn-id: http://svn.osgeo.org/postgis/trunk@9559 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c
index fcd8405ff..94e3a893b 100644
--- a/raster/rt_core/rt_api.c
+++ b/raster/rt_core/rt_api.c
@@ -2489,8 +2489,10 @@ rt_band_get_summary_stats(rt_band band, int exclude_nodata_value, double sample,
 				rtn != -1 && (
 					!exclude_nodata_value || (
 						exclude_nodata_value &&
-						(hasnodata != FALSE) &&
-						FLT_NEQ(value, nodata)
+						(hasnodata != FALSE) && (
+							FLT_NEQ(value, nodata) &&
+							(rt_band_clamped_value_is_nodata(band, value) != 1)
+						)
 					)
 				)
 			) {
@@ -3387,8 +3389,10 @@ rt_band_get_quantiles_stream(rt_band band,
 				status != -1 && (
 					!exclude_nodata_value || (
 						exclude_nodata_value &&
-						(hasnodata != FALSE) &&
-						FLT_NEQ(value, nodata)
+						(hasnodata != FALSE) && (
+							FLT_NEQ(value, nodata) &&
+							(rt_band_clamped_value_is_nodata(band, value) != 1)
+						)
 					)
 				)
 			) {
@@ -3976,8 +3980,10 @@ rt_band_get_value_count(rt_band band, int exclude_nodata_value,
 			if (
 				!exclude_nodata_value || (
 					exclude_nodata_value &&
-					(hasnodata != FALSE) &&
-					FLT_NEQ(pxlval, nodata)
+					(hasnodata != FALSE) && (
+						FLT_NEQ(pxlval, nodata) &&
+						(rt_band_clamped_value_is_nodata(band, pxlval) != 1)
+					)
 				)
 			) {
 				total++;
@@ -4245,7 +4251,7 @@ rt_band_reclass(rt_band srcband, rt_pixtype pixtype,
 				do_nv = 0;
 
 				/* no data*/
-				if (src_hasnodata && hasnodata && ov == src_nodataval) {
+				if (src_hasnodata && hasnodata && FLT_EQ(ov, src_nodataval)) {
 					do_nv = 1;
 					break;
 				}
diff --git a/raster/rt_core/rt_api.h b/raster/rt_core/rt_api.h
index c33641cb8..3bff7c94e 100644
--- a/raster/rt_core/rt_api.h
+++ b/raster/rt_core/rt_api.h
@@ -520,7 +520,7 @@ int rt_band_set_pixel(rt_band band,
 /**
  * Get pixel value
  *
- * @param band : the band to set nodata value to
+ * @param band : the band to get pixel value from
  * @param x : x ordinate (0-based)
  * @param y : x ordinate (0-based)
  * @param *result: result if there is a value
diff --git a/raster/rt_pg/rt_pg.c b/raster/rt_pg/rt_pg.c
index f72964764..31c5f36b8 100644
--- a/raster/rt_pg/rt_pg.c
+++ b/raster/rt_pg/rt_pg.c
@@ -719,7 +719,7 @@ Datum RASTER_to_bytea(PG_FUNCTION_ARGS)
 
 	/* Free raster objects used */
 	rt_raster_destroy(raster);
-	rtdealloc(wkb);
+	pfree(wkb);
 
 	PG_RETURN_POINTER(result);
 }
@@ -763,7 +763,7 @@ Datum RASTER_to_binary(PG_FUNCTION_ARGS)
 
 	/* Free raster objects used */
 	rt_raster_destroy(raster);
-	rtdealloc(wkb);
+	pfree(wkb);
 
 	PG_RETURN_POINTER(result);
 }