[mapserver-commits] r11221 - in trunk/msautotest/gdal: . expected
svn at osgeo.org
svn at osgeo.org
Fri Mar 18 10:14:15 EDT 2011
Author: warmerdam
Date: 2011-03-18 07:14:15 -0700 (Fri, 18 Mar 2011)
New Revision: 11221
Added:
trunk/msautotest/gdal/alpha_on_alpha_overlay.map
trunk/msautotest/gdal/expected/alpha_on_alpha_overlay.png
trunk/msautotest/gdal/expected/simplealpha.png
trunk/msautotest/gdal/expected/simplealpha_plug.png
trunk/msautotest/gdal/simplealpha.map
trunk/msautotest/gdal/simplealpha_plug.map
Removed:
trunk/msautotest/gdal/expected/force_pc256.png
trunk/msautotest/gdal/force_pc256.map
Modified:
trunk/msautotest/gdal/class16_oddscale.map
trunk/msautotest/gdal/classtest2.map
trunk/msautotest/gdal/classtest2_plugin.map
trunk/msautotest/gdal/expected/classtest1.png
trunk/msautotest/gdal/expected/classtest2.png
trunk/msautotest/gdal/expected/classtest2_plugin.png
trunk/msautotest/gdal/expected/gd_png_tr_256_res.png
trunk/msautotest/gdal/expected/grayalpha.png
trunk/msautotest/gdal/expected/grayalpha_plug.png
trunk/msautotest/gdal/expected/lut_inline.png
trunk/msautotest/gdal/expected/nonsquare.png
trunk/msautotest/gdal/expected/processing_bands.png
trunk/msautotest/gdal/expected/rawmode_multiband.png
trunk/msautotest/gdal/expected/rgba_overlay_res.png
trunk/msautotest/gdal/expected/rot_out.png
trunk/msautotest/gdal/expected/trlay1.png
trunk/msautotest/gdal/expected/trlay2.png
trunk/msautotest/gdal/gd_png_tr_256_res.map
trunk/msautotest/gdal/lut_1_crv.map
trunk/msautotest/gdal/lut_float.map
trunk/msautotest/gdal/nodata_8bit.map
trunk/msautotest/gdal/nonsquare.map
trunk/msautotest/gdal/offsite_8bitgrey.map
trunk/msautotest/gdal/offsite_pct_rgb.map
trunk/msautotest/gdal/ows_extent.map
trunk/msautotest/gdal/wmsclient.map
Log:
update to reflect renderer updates, and alpha changes. A few new tests
Added: trunk/msautotest/gdal/alpha_on_alpha_overlay.map
===================================================================
--- trunk/msautotest/gdal/alpha_on_alpha_overlay.map (rev 0)
+++ trunk/msautotest/gdal/alpha_on_alpha_overlay.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -0,0 +1,39 @@
+#
+# This tests overlaying an RGBA image on an RGBA image (itself). This is
+# intended to test the general mixing case in msAlphaBlend(). The resulting
+# image should be essentially the same as the source, except in areas of
+# partial alpha the alpha will "densify" somewhat.
+#
+
+MAP
+
+NAME TEST
+STATUS ON
+SIZE 400 300
+EXTENT 0.5 0.5 399.5 299.5
+IMAGECOLOR 255 255 0
+
+OUTPUTFORMAT
+ NAME png24_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE RGBA
+ TRANSPARENT OFF
+END
+
+LAYER
+ NAME rgb
+ TYPE raster
+ STATUS default
+ DATA data/rgba.tif
+ OFFSITE 111 222 111
+END
+
+LAYER
+ NAME rgb2
+ TYPE raster
+ STATUS default
+ DATA data/rgba.tif
+ OFFSITE 111 222 111
+END
+
+END # of map file
Modified: trunk/msautotest/gdal/class16_oddscale.map
===================================================================
--- trunk/msautotest/gdal/class16_oddscale.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/class16_oddscale.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -33,7 +33,7 @@
CLASS
NAME "red"
EXPRESSION ([pixel] < -3)
- COLOR 255 0 0
+ STYLE COLOR 255 0 0 END
END
CLASS
NAME "green"
Modified: trunk/msautotest/gdal/classtest2.map
===================================================================
--- trunk/msautotest/gdal/classtest2.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/classtest2.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -12,7 +12,11 @@
EXTENT 0.5 0.5 399.5 299.5
IMAGECOLOR 255 255 0
-IMAGETYPE png
+OUTPUTFORMAT
+ NAME png8_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE PC256
+END
LAYER
NAME block
Modified: trunk/msautotest/gdal/classtest2_plugin.map
===================================================================
--- trunk/msautotest/gdal/classtest2_plugin.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/classtest2_plugin.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -30,7 +30,10 @@
CLASS
NAME "Hole"
EXPRESSION ([pixel] == 111)
- COLOR 255 0 0
+ STYLE
+ COLOR 255 0 0
+ OPACITY 75
+ END
END
END
Added: trunk/msautotest/gdal/expected/alpha_on_alpha_overlay.png
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/gdal/expected/alpha_on_alpha_overlay.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/msautotest/gdal/expected/classtest1.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/classtest2.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/classtest2_plugin.png
===================================================================
(Binary files differ)
Deleted: trunk/msautotest/gdal/expected/force_pc256.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/gd_png_tr_256_res.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/grayalpha.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/grayalpha_plug.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/lut_inline.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/nonsquare.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/processing_bands.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/rawmode_multiband.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/rgba_overlay_res.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/rot_out.png
===================================================================
(Binary files differ)
Added: trunk/msautotest/gdal/expected/simplealpha.png
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/gdal/expected/simplealpha.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/gdal/expected/simplealpha_plug.png
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/gdal/expected/simplealpha_plug.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/msautotest/gdal/expected/trlay1.png
===================================================================
(Binary files differ)
Modified: trunk/msautotest/gdal/expected/trlay2.png
===================================================================
(Binary files differ)
Deleted: trunk/msautotest/gdal/force_pc256.map
===================================================================
--- trunk/msautotest/gdal/force_pc256.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/force_pc256.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -1,44 +0,0 @@
-
-#
-# Tests the quantization option allowing conversion of
-# RGB or RGBA images to 8bit just before saving to PNG.
-#
-# See http://mapserver.gis.umn.edu/bugs/show_bug.cgi?id=1690
-#
-MAP
-
-NAME TEST
-STATUS ON
-SIZE 400 300
-EXTENT 0.5 0.5 399.5 299.5
-IMAGECOLOR 255 255 0
-
-IMAGETYPE png8_t
-
-OUTPUTFORMAT
- NAME png8_t
- DRIVER "GD/PNG"
- EXTENSION "png"
- MIMETYPE "image/png"
- IMAGEMODE RGBA
- TRANSPARENT OFF
- FORMATOPTION "QUANTIZE_FORCE=ON"
- FORMATOPTION "QUANTIZE_DITHER=OFF"
- FORMATOPTION "QUANTIZE_COLORS=10"
-END
-
-LAYER
- NAME grey
- TYPE raster
- STATUS default
- DATA data/grey.tif
-END
-
-LAYER
- NAME grid1
- TYPE raster
- STATUS default
- DATA data/grid.gif
-END
-
-END # of map file
Modified: trunk/msautotest/gdal/gd_png_tr_256_res.map
===================================================================
--- trunk/msautotest/gdal/gd_png_tr_256_res.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/gd_png_tr_256_res.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -18,7 +18,11 @@
"datum=WGS84"
END
-IMAGETYPE png
+OUTPUTFORMAT
+ NAME png8_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE PC256
+END
#
# Start of layer definitions
Modified: trunk/msautotest/gdal/lut_1_crv.map
===================================================================
--- trunk/msautotest/gdal/lut_1_crv.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/lut_1_crv.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -9,6 +9,12 @@
EXTENT 0.5 0.5 399.5 299.5
IMAGECOLOR 255 255 0
+OUTPUTFORMAT
+ NAME png8_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE PC256
+END
+
LAYER
NAME grey
TYPE raster
Modified: trunk/msautotest/gdal/lut_float.map
===================================================================
--- trunk/msautotest/gdal/lut_float.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/lut_float.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -11,6 +11,12 @@
EXTENT 0.5 0.5 399.5 299.5
IMAGECOLOR 255 255 0
+OUTPUTFORMAT
+ NAME png8_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE PC256
+END
+
LAYER
NAME grey
TYPE raster
Modified: trunk/msautotest/gdal/nodata_8bit.map
===================================================================
--- trunk/msautotest/gdal/nodata_8bit.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/nodata_8bit.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -11,7 +11,11 @@
EXTENT 0.5 0.5 399.5 299.5
IMAGECOLOR 255 255 0
-IMAGETYPE png
+OUTPUTFORMAT
+ NAME png8_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE PC256
+END
LAYER
NAME grey
Modified: trunk/msautotest/gdal/nonsquare.map
===================================================================
--- trunk/msautotest/gdal/nonsquare.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/nonsquare.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -10,8 +10,13 @@
SIZE 500 500
EXTENT 0.2 0.6 99.8 299.4
IMAGECOLOR 255 255 0
-IMAGETYPE PNG
+OUTPUTFORMAT
+ NAME png8_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE PC256
+END
+
CONFIG MS_NONSQUARE YES
PROJECTION
Modified: trunk/msautotest/gdal/offsite_8bitgrey.map
===================================================================
--- trunk/msautotest/gdal/offsite_8bitgrey.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/offsite_8bitgrey.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -11,7 +11,11 @@
EXTENT 0.5 0.5 399.5 299.5
IMAGECOLOR 255 255 0
-IMAGETYPE png
+OUTPUTFORMAT
+ NAME png8_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE PC256
+END
LAYER
NAME grey
Modified: trunk/msautotest/gdal/offsite_pct_rgb.map
===================================================================
--- trunk/msautotest/gdal/offsite_pct_rgb.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/offsite_pct_rgb.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -11,7 +11,11 @@
EXTENT 0.5 0.5 399.5 299.5
IMAGECOLOR 255 255 0
-IMAGETYPE png
+OUTPUTFORMAT
+ NAME png8_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE PC256
+END
LAYER
NAME grey
Modified: trunk/msautotest/gdal/ows_extent.map
===================================================================
--- trunk/msautotest/gdal/ows_extent.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/ows_extent.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -11,7 +11,11 @@
EXTENT 1000.5 1000.5 1399.5 1299.5
IMAGECOLOR 255 255 0
-IMAGETYPE png
+OUTPUTFORMAT
+ NAME png8_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE PC256
+END
LAYER
NAME grey
Added: trunk/msautotest/gdal/simplealpha.map
===================================================================
--- trunk/msautotest/gdal/simplealpha.map (rev 0)
+++ trunk/msautotest/gdal/simplealpha.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -0,0 +1,26 @@
+
+#
+# Simple alpha image render on blank background.
+#
+MAP
+
+NAME TEST
+STATUS ON
+SIZE 400 300
+EXTENT 0.5 0.5 399.5 299.5
+IMAGECOLOR 255 255 0
+
+OUTPUTFORMAT
+ NAME png24_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE RGBA
+END
+
+LAYER
+ NAME grey_overlay
+ TYPE raster
+ STATUS default
+ DATA data/greyalpha.vrt
+END
+
+END # of map file
Added: trunk/msautotest/gdal/simplealpha_plug.map
===================================================================
--- trunk/msautotest/gdal/simplealpha_plug.map (rev 0)
+++ trunk/msautotest/gdal/simplealpha_plug.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -0,0 +1,28 @@
+
+#
+# Simple alpha image render on blank background.
+#
+# REQUIRES: SUPPORTS=AGG
+#
+MAP
+
+NAME TEST
+STATUS ON
+SIZE 400 300
+EXTENT 0.5 0.5 399.5 299.5
+IMAGECOLOR 255 255 0
+
+OUTPUTFORMAT
+ NAME png24_t
+ DRIVER "AGG/PNG"
+ IMAGEMODE RGBA
+END
+
+LAYER
+ NAME grey_overlay
+ TYPE raster
+ STATUS default
+ DATA data/greyalpha.vrt
+END
+
+END # of map file
Modified: trunk/msautotest/gdal/wmsclient.map
===================================================================
--- trunk/msautotest/gdal/wmsclient.map 2011-03-18 14:11:16 UTC (rev 11220)
+++ trunk/msautotest/gdal/wmsclient.map 2011-03-18 14:14:15 UTC (rev 11221)
@@ -11,7 +11,11 @@
EXTENT -180 -60 180 85
IMAGECOLOR 255 255 0
-IMAGETYPE png
+OUTPUTFORMAT
+ NAME png8_t
+ DRIVER "GDAL/PNG"
+ IMAGEMODE PC256
+END
WEB
IMAGEPATH "./tmp/"
More information about the mapserver-commits
mailing list