Additional corrections and cleanup for ST_BandNoDataValue

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

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index 91c1c37162743b6726a210417790ebea34c171c6..7c41c950e211a2aec6720d2c04e1c1cb4caf56db 100644 (file)
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -2502,14 +2502,10 @@ FROM dummy_rast WHERE rid=2) As foo;
                
                        <refsynopsisdiv>
                                <funcsynopsis>
-                               <funcprototype>
-                                       <funcdef>integer <function>ST_BandNoDataValue</function></funcdef>
-                                       <paramdef><type>raster </type> <parameter>rast</parameter></paramdef>
-                                 </funcprototype>
                                  <funcprototype>
-                                       <funcdef>integer <function>ST_BandNoDataValue</function></funcdef>
+                                       <funcdef>double precision <function>ST_BandNoDataValue</function></funcdef>
                                        <paramdef><type>raster </type> <parameter>rast</parameter></paramdef>
-                                       <paramdef><type>integer </type> <parameter>bandnum</parameter></paramdef>
+                                       <paramdef><type>integer </type> <parameter>bandnum=1</parameter></paramdef>
                                  </funcprototype>
                                </funcsynopsis>
                        </refsynopsisdiv>

diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c
index d22fd887ca4b29fa0a0027ffa5a24b66fa187752..258c42dee9b205ca75df9a0a3b37c15b1bb10f1c 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in.c
+++ b/raster/rt_pg/rtpostgis.sql.in.c
@@ -1779,16 +1779,11 @@ CREATE OR REPLACE FUNCTION st_hasnoband(rast raster, nband int DEFAULT 1)
 -- Raster Band Accessors
 -----------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION st_bandnodatavalue(rast raster, band integer)
+CREATE OR REPLACE FUNCTION st_bandnodatavalue(rast raster, band integer DEFAULT 1)
     RETURNS double precision
     AS 'MODULE_PATHNAME','RASTER_getBandNoDataValue'
     LANGUAGE 'C' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_bandnodatavalue(raster)
-    RETURNS double precision
-    AS $$ SELECT st_bandnodatavalue($1, 1) $$
-    LANGUAGE SQL IMMUTABLE STRICT;
-
 CREATE OR REPLACE FUNCTION st_bandisnodata(rast raster, band integer,
         forceChecking boolean)
     RETURNS boolean

diff --git a/raster/rt_pg/rtpostgis_drop.sql.in.c b/raster/rt_pg/rtpostgis_drop.sql.in.c
index d29a4b8830b4f09f2efc1eac21e4cabd6514efdb..fd3dca312ba8d0ee170e7c3a085114f1a2adbdc0 100644 (file)
--- a/raster/rt_pg/rtpostgis_drop.sql.in.c
+++ b/raster/rt_pg/rtpostgis_drop.sql.in.c
@@ -84,3 +84,8 @@ DROP FUNCTION IF EXISTS ST_HasNoBand(raster);
 
 --function out parameters changed so can not just create or replace
 DROP FUNCTION IF EXISTS ST_BandMetaData(raster, integer);
+
+--function out parameter changed
+DROP FUNCTION IF EXISTS ST_BandNoDataValue(raster, integer);
+--function no longer exists
+DROP FUNCTION IF EXISTS ST_BandNoDataValue(raster);