[GRASS-SVN] r44248 - in grass/branches/releasebranch_6_4: imagery/i.atcorr lib/pngdriver

[svn_grass at osgeo.org]

Author: neteler
Date: 2010-11-07 23:33:44 -0800 (Sun, 07 Nov 2010)
New Revision: 44248

Modified:
   grass/branches/releasebranch_6_4/imagery/i.atcorr/common.cpp
   grass/branches/releasebranch_6_4/lib/pngdriver/read_png.c
Log:
Fix warnings (backport r44247)

Modified: grass/branches/releasebranch_6_4/imagery/i.atcorr/common.cpp
===================================================================
--- grass/branches/releasebranch_6_4/imagery/i.atcorr/common.cpp	2010-11-08 03:29:15 UTC (rev 44247)
+++ grass/branches/releasebranch_6_4/imagery/i.atcorr/common.cpp	2010-11-08 07:33:44 UTC (rev 44248)
@@ -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/branches/releasebranch_6_4/lib/pngdriver/read_png.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/pngdriver/read_png.c	2010-11-08 03:29:15 UTC (rev 44247)
+++ grass/branches/releasebranch_6_4/lib/pngdriver/read_png.c	2010-11-08 07:33:44 UTC (rev 44248)
@@ -47,7 +47,7 @@
     if (i_width != width || i_height != height)
 	G_fatal_error
 	    ("PNG: input file has incorrect dimensions: expected: %dx%d got: %lux%lu",
-	     width, height, i_width, i_height);
+	     width, height, (unsigned long) i_width, (unsigned long) i_height);
 
     if (true_color) {
 	if (color_type != PNG_COLOR_TYPE_RGB_ALPHA)