From: Bborie Park <bkpark at ucdavis.edu>
Date: Wed, 17 Jul 2013 14:45:32 +0000 (+0000)
Subject: Fixed variable datatype in ST_Neighborhood. Ticket #2384
X-Git-Tag: 2.2.0rc1~1440
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0032d97b2249722fafe74bd1998ef9695b03183;p=postgis

Fixed variable datatype in ST_Neighborhood. Ticket #2384

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

diff --git a/NEWS b/NEWS
index 9bf157cdc..c86d0eebc 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ PostGIS 2.2.0
 
   - #2371, Support GEOS versions with more than 1 digit in micro
   - #2383, Removed unsafe use of \' from raster warning message
+  - #2384, Fixed variable datatype in ST_Neighborhood
 
 PostGIS 2.1.0
 2013/MM/DD
diff --git a/raster/rt_pg/rtpostgis.sql.in b/raster/rt_pg/rtpostgis.sql.in
index c0a2b1b36..43dcad6b2 100644
--- a/raster/rt_pg/rtpostgis.sql.in
+++ b/raster/rt_pg/rtpostgis.sql.in
@@ -6609,8 +6609,8 @@ CREATE OR REPLACE FUNCTION st_neighborhood(
 	RETURNS double precision[][]
 	AS $$
 	DECLARE
-		wx int;
-		wy int;
+		wx double precision;
+		wy double precision;
 		rtn double precision[][];
 	BEGIN
 		IF (st_geometrytype($3) != 'ST_Point') THEN
diff --git a/raster/test/regress/rt_neighborhood.sql b/raster/test/regress/rt_neighborhood.sql
index 25bc74bb9..2d422404f 100644
--- a/raster/test/regress/rt_neighborhood.sql
+++ b/raster/test/regress/rt_neighborhood.sql
@@ -87,4 +87,11 @@ SELECT
 	ST_Neighborhood(rast, 1, 4, 4, 1, 0)
 FROM raster_neighborhood;
 
+SELECT
+	ST_Neighborhood(rast, 1, 'POINT(0 0)'::geometry, 1, 1)
+FROM raster_neighborhood;
+SELECT
+	ST_Neighborhood(rast, 1, 'POINT(3 -3)'::geometry, 2, 2)
+FROM raster_neighborhood;
+
 DROP TABLE IF EXISTS raster_neighborhood;
diff --git a/raster/test/regress/rt_neighborhood_expected b/raster/test/regress/rt_neighborhood_expected
index e801c8ae5..6e53cd877 100644
--- a/raster/test/regress/rt_neighborhood_expected
+++ b/raster/test/regress/rt_neighborhood_expected
@@ -15,3 +15,5 @@ NOTICE:  table "raster_neighborhood" does not exist, skipping
 {{1,1,1,1,1},{NULL,1,1,NULL,1},{1,1,1,1,1},{1,NULL,1,1,NULL},{1,1,1,1,1}}
 {{1,1,1},{1,1,NULL},{1,1,1},{NULL,1,1},{1,1,1}}
 {{1,1,1}}
+{{NULL,NULL,NULL},{NULL,NULL,1},{NULL,1,1}}
+{{1,1,1,1,1},{NULL,1,1,NULL,1},{1,1,1,1,1},{1,NULL,1,1,NULL},{1,1,1,1,1}}