[mapserver-commits] r11401 - trunk/msautotest/renderers

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-30 14:27:11 -0700 (Wed, 30 Mar 2011)
New Revision: 11401

Modified:
   trunk/msautotest/renderers/force_palette_rgba.map
   trunk/msautotest/renderers/force_pc256_rgba.map
   trunk/msautotest/renderers/line_pattern.map
   trunk/msautotest/renderers/run_test.py
Log:
update some tests


Modified: trunk/msautotest/renderers/force_palette_rgba.map
===================================================================
--- trunk/msautotest/renderers/force_palette_rgba.map	2011-03-30 21:20:20 UTC (rev 11400)
+++ trunk/msautotest/renderers/force_palette_rgba.map	2011-03-30 21:27:11 UTC (rev 11401)
@@ -13,10 +13,10 @@
 EXTENT 0.5 0.5 399.5 299.5
 IMAGECOLOR 255 255 0
 SHAPEPATH "../gdal"
-IMAGETYPE png24
+IMAGETYPE png
 
 OUTPUTFORMAT
-  NAME png24
+  NAME png
   DRIVER "AGG/PNG"
   EXTENSION "png"
   MIMETYPE "image/png"
@@ -37,10 +37,10 @@
 END
 
 OUTPUTFORMAT
-  NAME png
-  DRIVER "GD/PNG"
-  EXTENSION "png"
-  MIMETYPE "image/png"
+  NAME gif
+  DRIVER "GD/GIF"
+  EXTENSION "gif"
+  MIMETYPE "image/gif"
   IMAGEMODE PC256
   TRANSPARENT ON
 END

Modified: trunk/msautotest/renderers/force_pc256_rgba.map
===================================================================
--- trunk/msautotest/renderers/force_pc256_rgba.map	2011-03-30 21:20:20 UTC (rev 11400)
+++ trunk/msautotest/renderers/force_pc256_rgba.map	2011-03-30 21:27:11 UTC (rev 11401)
@@ -13,10 +13,10 @@
 EXTENT 0.5 0.5 399.5 299.5
 IMAGECOLOR 255 255 0
 SHAPEPATH "../gdal"
-IMAGETYPE png24
+IMAGETYPE png
 
 OUTPUTFORMAT
-  NAME png24
+  NAME png
   DRIVER "AGG/PNG"
   EXTENSION "png"
   MIMETYPE "image/png"
@@ -39,10 +39,10 @@
 END
 
 OUTPUTFORMAT
-  NAME png
-  DRIVER "GD/PNG"
-  EXTENSION "png"
-  MIMETYPE "image/png"
+  NAME gif
+  DRIVER "GD/GIF"
+  EXTENSION "gif"
+  MIMETYPE "image/gif"
   IMAGEMODE PC256
   TRANSPARENT ON
   FORMATOPTION "QUANTIZE_FORCE=ON"

Modified: trunk/msautotest/renderers/line_pattern.map
===================================================================
--- trunk/msautotest/renderers/line_pattern.map	2011-03-30 21:20:20 UTC (rev 11400)
+++ trunk/msautotest/renderers/line_pattern.map	2011-03-30 21:27:11 UTC (rev 11401)
@@ -16,9 +16,9 @@
     class
         style
             color 0 0 255
-            width 1
+            width 3
             linecap butt
-            pattern 4 2 2 2 end
+            pattern 12 6 6 6 end
         end
     end
 end

Modified: trunk/msautotest/renderers/run_test.py
===================================================================
--- trunk/msautotest/renderers/run_test.py	2011-03-30 21:20:20 UTC (rev 11400)
+++ trunk/msautotest/renderers/run_test.py	2011-03-30 21:27:11 UTC (rev 11401)
@@ -44,7 +44,7 @@
 # main()
 
 if __name__ == '__main__':
-    renderers = ['png24','png']
+    renderers = ['pdf','svg','png','gif','cairopng']
 
     version_info = os.popen( 'shp2img -v' ).read()
     if '-r' in sys.argv: