[GRASS-SVN] r44247 - in grass/trunk: imagery/i.atcorr lib/pngdriver raster/r.uslek

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-11-07 19:29:15 -0800 (Sun, 07 Nov 2010)
New Revision: 44247

Modified:
   grass/trunk/imagery/i.atcorr/common.cpp
   grass/trunk/lib/pngdriver/read_png.c
   grass/trunk/raster/r.uslek/prct2tex.c
Log:
Fix warnings


Modified: grass/trunk/imagery/i.atcorr/common.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/common.cpp	2010-11-07 23:07:11 UTC (rev 44246)
+++ grass/trunk/imagery/i.atcorr/common.cpp	2010-11-08 03:29:15 UTC (rev 44247)
@@ -8,7 +8,7 @@
 
 Sixs_disc sixs_disc = 
 {
-    {0}, {0}, {0}, {0}, {0}, {0}, 
+    {{0}}, {{0}}, {{0}}, {{0}}, {{0}}, {{0}}, 
     { .4f, .488f, .515f, .55f, .633f, .694f, .86f, 1.536f, 2.25f, 3.75f },/* wldis */
     {0},
     {0}
@@ -16,7 +16,7 @@
 
 Sixs_sos sixs_sos = 
 {
-    {0},
+    {{0}},
     {
 	-1.f, -.9996f, -.9976f, -.9942f, -.9893f, -.9828f,
 	-.9749f, -.9655f, -.9546f, -.9422f, -.9285f, -.9133f, -.8967f,

Modified: grass/trunk/lib/pngdriver/read_png.c
===================================================================
--- grass/trunk/lib/pngdriver/read_png.c	2010-11-07 23:07:11 UTC (rev 44246)
+++ grass/trunk/lib/pngdriver/read_png.c	2010-11-08 03:29:15 UTC (rev 44247)
@@ -47,7 +47,7 @@
     if (i_width != png.width || i_height != png.height)
 	G_fatal_error
 	    ("PNG: input file has incorrect dimensions: expected: %dx%d got: %lux%lu",
-	     png.width, png.height, i_width, i_height);
+	     png.width, png.height, (unsigned long) i_width, (unsigned long) i_height);
 
     if (png.true_color) {
 	if (color_type != PNG_COLOR_TYPE_RGB_ALPHA)

Modified: grass/trunk/raster/r.uslek/prct2tex.c
===================================================================
--- grass/trunk/raster/r.uslek/prct2tex.c	2010-11-07 23:07:11 UTC (rev 44246)
+++ grass/trunk/raster/r.uslek/prct2tex.c	2010-11-08 03:29:15 UTC (rev 44247)
@@ -110,29 +110,29 @@
     /*G_message("in prct2tex()"); */
     /*setup the 3Dvectors and initialize them */
     /* index 0 */
-    struct vector cls_clay[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_clay[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 1 */
-    struct vector cls_sandy_clay[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_sandy_clay[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 2 */
-    struct vector cls_silty_clay[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_silty_clay[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 3 */
-    struct vector cls_sandy_clay_loam[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_sandy_clay_loam[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 4 */
-    struct vector cls_clay_loam[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_clay_loam[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 5 */
-    struct vector cls_silty_clay_loam[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_silty_clay_loam[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 6 */
-    struct vector cls_sand[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_sand[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 7 */
-    struct vector cls_loamy_sand[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_loamy_sand[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 8 */
-    struct vector cls_sandy_loam[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_sandy_loam[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 9 */
-    struct vector cls_loam[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_loam[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 10 */
-    struct vector cls_silt_loam[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_silt_loam[POLYGON_DIMENSION] = { { 0.0 } };
     /* index 11 */
-    struct vector cls_silt[POLYGON_DIMENSION] = { 0.0 };
+    struct vector cls_silt[POLYGON_DIMENSION] = { { 0.0 } };
 
     if ((sand_input + clay_input + silt_input) <= 10.0) {
 	sand_input = sand_input * 100.0;