[mapserver-commits] r11555 - in trunk/msautotest/renderers: . expected

Wed Apr 13 11:21:25 EDT 2011

Author: tbonfort
Date: 2011-04-13 08:21:25 -0700 (Wed, 13 Apr 2011)
New Revision: 11555

Added:
   trunk/msautotest/renderers/expected/raster_simple.cairopng.png
   trunk/msautotest/renderers/expected/raster_simple.gif.png
   trunk/msautotest/renderers/expected/raster_simple.pdf.png
   trunk/msautotest/renderers/expected/raster_simple.png.png
   trunk/msautotest/renderers/expected/raster_simple.svg.png
   trunk/msautotest/renderers/expected/raster_simple_opacity.cairopng.png
   trunk/msautotest/renderers/expected/raster_simple_opacity.gif.png
   trunk/msautotest/renderers/expected/raster_simple_opacity.pdf.png
   trunk/msautotest/renderers/expected/raster_simple_opacity.png.png
   trunk/msautotest/renderers/expected/raster_simple_opacity.svg.png
   trunk/msautotest/renderers/raster_simple.map
   trunk/msautotest/renderers/raster_simple_opacity.map
Log:
add simple raster tests


Added: trunk/msautotest/renderers/expected/raster_simple.cairopng.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/raster_simple.cairopng.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/raster_simple.gif.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/raster_simple.gif.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/raster_simple.pdf.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/raster_simple.pdf.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/raster_simple.png.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/raster_simple.png.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/raster_simple.svg.png
===================================================================

--- trunk/msautotest/renderers/expected/raster_simple.svg.png	                        (rev 0)
+++ trunk/msautotest/renderers/expected/raster_simple.svg.png	2011-04-13 15:21:25 UTC (rev 11555)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400pt" height="300pt" viewBox="0 0 400 300" version="1.1">
+<defs>
+<image id="image6" width="400" height="300" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAEsCAIAAABi1XKVAAAABmJLR0QA/wD/AP+gvaeTAAAE90lEQVR4nO3WUY0UQBRFQYYgBANoQsJqQQKaMICTxcD9mGyymXdIlYKXzs1JPx7vXwASvgkWUCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQI1kf8+P726hP+c3/+/nr1CVwkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTIL1Ed7ss5klk2B9hDf7bGbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUV
 mySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTI/fP199AsBz/LCADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsICMx/vj1ScAPMcHC8j4+uoDAJ4lWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZPwDaeRnWaSv/9IAAAAASUVORK5CYII="/>
+</defs>
+<g id="surface2">
+<rect x="0" y="0" width="400" height="300" style="fill:rgb(100%,100%,0%);fill-opacity:1;stroke:none;"/>
+<use xlink:href="#image6"/>
+</g>
+</svg>

Added: trunk/msautotest/renderers/expected/raster_simple_opacity.cairopng.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/raster_simple_opacity.cairopng.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/raster_simple_opacity.gif.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/raster_simple_opacity.gif.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/raster_simple_opacity.pdf.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/raster_simple_opacity.pdf.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/raster_simple_opacity.png.png
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/renderers/expected/raster_simple_opacity.png.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/msautotest/renderers/expected/raster_simple_opacity.svg.png
===================================================================
--- trunk/msautotest/renderers/expected/raster_simple_opacity.svg.png	                        (rev 0)
+++ trunk/msautotest/renderers/expected/raster_simple_opacity.svg.png	2011-04-13 15:21:25 UTC (rev 11555)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400pt" height="300pt" viewBox="0 0 400 300" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="400" height="300" style="fill:rgb(0%,0%,0%);fill-opacity:0.5;stroke:none;"/>
+  </g>
+</mask>
+<image id="image10" width="400" height="300" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAEsCAIAAABi1XKVAAAABmJLR0QA/wD/AP+gvaeTAAAE90lEQVR4nO3WUY0UQBRFQYYgBANoQsJqQQKaMICTxcD9mGyymXdIlYKXzs1JPx7vXwASvgkWUCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQI1kf8+P726hP+c3/+/nr1CVwkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTIL1Ed7ss5klk2B9hDf7bGbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxU
 VmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTILFRWbJJFhcZJZMgsVFZskkWFxklkyCxUVmySRYXGSWTI/fP199AsBz/LCADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsIAMwQIyBAvIECwgQ7CADMECMgQLyBAsIEOwgAzBAjIEC8gQLCBDsICMx/vj1ScAPMcHC8j4+uoDAJ4lWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZAgWkCFYQIZgARmCBWQIFpAhWECGYAEZggVkCBaQIVhAhmABGYIFZPwDaeRnWaSv/9IAAAAASUVORK5CYII="/>
+<clipPath id="clip1">
+  <rect width="400" height="300"/>
+</clipPath>
+<g id="surface9" clip-path="url(#clip1)">
+<use xlink:href="#image10"/>
+</g>
+</defs>
+<g id="surface2">
+<rect x="0" y="0" width="400" height="300" style="fill:rgb(100%,100%,0%);fill-opacity:1;stroke:none;"/>
+<use xlink:href="#surface9" mask="url(#mask0)"/>
+</g>
+</svg>

Copied: trunk/msautotest/renderers/raster_simple.map (from rev 11523, trunk/msautotest/gdal/unclassified.map)
===================================================================
--- trunk/msautotest/renderers/raster_simple.map	                        (rev 0)
+++ trunk/msautotest/renderers/raster_simple.map	2011-04-13 15:21:25 UTC (rev 11555)
@@ -0,0 +1,34 @@
+#
+# Test use of 24bit images with a dummy class used to populate the legend.
+# The image should come through as 24bit since there is no expression in the
+# class.
+#
+MAP
+
+NAME TEST
+STATUS ON
+SIZE 400 300
+EXTENT 0.5 0.5 399.5 299.5
+IMAGECOLOR 255 255 0
+
+IMAGETYPE png24_t
+
+OUTPUTFORMAT
+  NAME png24_t
+  DRIVER "GDAL/PNG"
+  IMAGEMODE RGBA
+  TRANSPARENT ON
+END
+
+LAYER
+  NAME rgb
+  TYPE raster
+  STATUS default
+  DATA ../gdal/data/rgba.tif
+  PROCESSING "BANDS=1,2,3"
+  CLASS
+    KEYIMAGE "data/grid.gif"
+  END
+END
+
+END # of map file

Copied: trunk/msautotest/renderers/raster_simple_opacity.map (from rev 11523, trunk/msautotest/gdal/unclassified.map)
===================================================================
--- trunk/msautotest/renderers/raster_simple_opacity.map	                        (rev 0)
+++ trunk/msautotest/renderers/raster_simple_opacity.map	2011-04-13 15:21:25 UTC (rev 11555)
@@ -0,0 +1,35 @@
+#
+# Test use of 24bit images with a dummy class used to populate the legend.
+# The image should come through as 24bit since there is no expression in the
+# class.
+#
+MAP
+
+NAME TEST
+STATUS ON
+SIZE 400 300
+EXTENT 0.5 0.5 399.5 299.5
+IMAGECOLOR 255 255 0
+
+IMAGETYPE png24_t
+
+OUTPUTFORMAT
+  NAME png24_t
+  DRIVER "GDAL/PNG"
+  IMAGEMODE RGBA
+  TRANSPARENT ON
+END
+
+LAYER
+  NAME rgb
+  TYPE raster
+  STATUS default
+  DATA ../gdal/data/rgba.tif
+  PROCESSING "BANDS=1,2,3"
+  OPACITY 50
+  CLASS
+    KEYIMAGE "data/grid.gif"
+  END
+END
+
+END # of map file

