[mapserver-commits] r11400 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2011-03-30 14:20:20 -0700 (Wed, 30 Mar 2011)
New Revision: 11400

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/shp2img.c
Log:
fix -i flag to honour map level format settings

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-30 20:42:04 UTC (rev 11399)
+++ trunk/mapserver/HISTORY.TXT	2011-03-30 21:20:20 UTC (rev 11400)
@@ -15,6 +15,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fix shp2img's -i flag to honour map level transparent, image quality and 
+  interlace settings.
+
 - Make sure command-line programs use an exit status other than 0 
   when an error is encountered. (#3753)
 

Modified: trunk/mapserver/shp2img.c
===================================================================
--- trunk/mapserver/shp2img.c	2011-03-30 20:42:04 UTC (rev 11399)
+++ trunk/mapserver/shp2img.c	2011-03-30 21:20:20 UTC (rev 11400)
@@ -176,8 +176,9 @@
       {
           msFree( (char *) map->imagetype );
           map->imagetype = msStrdup( argv[i+1] );
-          msApplyOutputFormat( &(map->outputformat), format, MS_NOOVERRIDE,
-                               MS_NOOVERRIDE, MS_NOOVERRIDE );
+          msApplyOutputFormat( &(map->outputformat), format, 
+                               map->transparent, map->interlace, 
+                               map->imagequality );
       }
       i+=1;
     }