Initialize variables that may cause compile-time warnings in rt_api.c. Added additio...

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

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index 3e81262d5f42e3c15ed1db6abd159272945d25e2..fcfc705c327823e6325385cd934aa821bbb677f7 100644 (file)
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -38,13 +38,23 @@ GEOS_LDFLAGS=@GEOS_LDFLAGS@ -lgeos_c
 RTCORE_CFLAGS=-I$(RT_CORE)
 RTCORE_LDFLAGS=$(RT_CORE)/librtcore.a
 
+# GetText includes and libraries
+GETTEXT_CFLAGS = @GETTEXT_CFLAGS@
+GETTEXT_LDFLAGS = @GETTEXT_LDFLAGS@ @LIBINTL@
+
+# iconv flags
+ICONV_LDFLAGS=@ICONV_LDFLAGS@
+ICONV_CFLAGS=@ICONV_CFLAGS@
+
 CFLAGS = \
        @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ \
        $(RTCORE_CFLAGS) \
        $(LIBLWGEOM_CFLAGS) \
        $(PROJ_CFLAGS) \
        $(LIBGDAL_CFLAGS) \
-       $(GEOS_CFLAGS)
+       $(GEOS_CFLAGS) \
+       $(GETTEXT_CFLAGS) \
+       $(ICONV_CFLAGS)
 
 LDFLAGS = \
        @LDFLAGS@ \
@@ -52,6 +62,8 @@ LDFLAGS = \
        $(LIBLWGEOM_LDFLAGS) \
        $(LIBGDAL_LDFLAGS) \
        $(GEOS_LDFLAGS) \
+       $(GETTEXT_LDFLAGS) \
+       $(ICONV_LDFLAGS) \
        -lm
 
 all: $(RASTER2PGSQL)

diff --git a/raster/loader/raster2pgsql.h b/raster/loader/raster2pgsql.h
index 039cebde4591c410e6cc9d6dc597d4d14a0e513b..b4104de24b68d507aff8fd6919f310a9b771ce7f 100644 (file)
--- a/raster/loader/raster2pgsql.h
+++ b/raster/loader/raster2pgsql.h
@@ -27,7 +27,7 @@
  */
 
 /* For internationalization */
-#ifdef USE_NLS
+#ifdef ENABLE_NLS
 #include <libintl.h>
 #include <locale.h>
 #define _(String) gettext(String)

diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c
index 0a5999c7d703cf52979dac2305177f4842547b29..fcd8405fff9dcff1855e652cad95548ae038e27b 100644 (file)
--- a/raster/rt_core/rt_api.c
+++ b/raster/rt_core/rt_api.c
@@ -10258,13 +10258,13 @@ int rt_raster_intersects_algorithm(
 
        enum line_points {X1, Y1, X2, Y2};
        enum point {pX, pY};
-       double line1[4];
-       double line2[4];
-       double P[2];
-       double Qw[2];
-       double Qr[2];
-       double gt1[6] = {0.0};
-       double gt2[6] = {0.0};
+       double line1[4] = {0.};
+       double line2[4] = {0.};
+       double P[2] = {0.};
+       double Qw[2] = {0.};
+       double Qr[2] = {0.};
+       double gt1[6] = {0.};
+       double gt2[6] = {0.};
        double igt1[6] = {0};
        double igt2[6] = {0};
        double d;