[GRASS-SVN] r68194 - grass/branches/releasebranch_7_0/lib/pngdriver

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Apr 1 03:29:35 PDT 2016


Author: martinl
Date: 2016-04-01 03:29:35 -0700 (Fri, 01 Apr 2016)
New Revision: 68194

Modified:
   grass/branches/releasebranch_7_0/lib/pngdriver/read_png.c
Log:
png driver: fix typo from r68191

Modified: grass/branches/releasebranch_7_0/lib/pngdriver/read_png.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/pngdriver/read_png.c	2016-04-01 10:28:43 UTC (rev 68193)
+++ grass/branches/releasebranch_7_0/lib/pngdriver/read_png.c	2016-04-01 10:29:35 UTC (rev 68194)
@@ -64,7 +64,7 @@
 	G_fatal_error(_("Unable to allocate PNG structure"));
 
     if (setjmp(png_jmpbuf(png_ptr)))
-	G_fatal_error(_("Unable to readi PNG file"));
+	G_fatal_error(_("Unable to read PNG file"));
 
     input = fopen(png.file_name, "rb");
     if (!input)
@@ -80,7 +80,7 @@
     if (depth != 8)
 	G_fatal_error(_("Input PNG file is not 8-bit"));
 
-    if (i_width != (unsigned int)png.width || i_height != (unsigned int)png.height)
+    if (i_width != (unsigned long)png.width || i_height != (unsigned long)png.height)
 	G_fatal_error
 	    (_("Input PNG file has incorrect dimensions: expected: %dx%d got: %lux%lu"),
 	     png.width, png.height, (unsigned long) i_width, (unsigned long) i_height);



More information about the grass-commit mailing list