Permalink
Browse files

update tests for master from 7.0

  • Loading branch information...
tbonfort committed Feb 25, 2016
1 parent 6321296 commit 2fc36ed9f8c4b522685738e9ef4dfb93cea8db6e
Showing with 542 additions and 18 deletions.
  1. +28 −0 msautotest/gdal/5band.map
  2. +57 −0 msautotest/gdal/data/5band.vrt
  3. BIN msautotest/gdal/data/rgb_12bit.tif
  4. BIN msautotest/gdal/expected/5band.png
  5. BIN msautotest/gdal/expected/lut_inline_12bits.png
  6. +25 −0 msautotest/gdal/lut_inline_12bits.map
  7. BIN msautotest/misc/expected/listexpression.png
  8. BIN msautotest/renderers/expected/labels-bitmap-multiline.png
  9. BIN msautotest/renderers/expected/labels-bitmap.png
  10. BIN msautotest/renderers/expected/line_label_follow_retry.cairo.png
  11. BIN msautotest/renderers/expected/line_label_follow_retry.pdf
  12. BIN msautotest/renderers/expected/line_label_follow_retry.png
  13. +76 −0 msautotest/renderers/expected/line_label_follow_retry.svg
  14. BIN msautotest/renderers/expected/marker_pixmap.cairo.png
  15. BIN msautotest/renderers/expected/marker_pixmap.pdf
  16. BIN msautotest/renderers/expected/marker_pixmap.png
  17. +0 −1 msautotest/renderers/expected/marker_pixmap.svg
  18. BIN msautotest/renderers/expected/multilabel.cairo.png
  19. BIN msautotest/renderers/expected/multilabel.pdf
  20. BIN msautotest/renderers/expected/multilabel.png
  21. +4 −12 msautotest/renderers/expected/multilabel.svg
  22. BIN msautotest/renderers/expected/polygon-simple.cairo.png
  23. BIN msautotest/renderers/expected/polygon-simple.pdf
  24. BIN msautotest/renderers/expected/polygon-simple.png
  25. +0 −1 msautotest/renderers/expected/polygon-simple.svg
  26. +1 −1 msautotest/renderers/labels-bitmap-multiline.map
  27. +1 −1 msautotest/renderers/labels-bitmap.map
  28. +265 −0 msautotest/renderers/line_label_follow_retry.map
  29. +12 −0 msautotest/wxs/expected/wfs_filter_postgis_bbox_hits.xml
  30. +12 −0 msautotest/wxs/expected/wfs_filter_postgis_filter_item_hits.xml
  31. +12 −0 msautotest/wxs/expected/wfs_filter_postgis_filter_item_hits_start_index.xml
  32. +12 −0 msautotest/wxs/expected/wfs_filter_postgis_property_is_equal_hits.xml
  33. BIN msautotest/wxs/expected/wms_get_map_line_multi_symbol_text_sld.png
  34. BIN msautotest/wxs/expected/wms_get_map_line_multi_symbol_text_sld_postgis.png
  35. BIN msautotest/wxs/expected/wms_get_map_namedlayer_nostyle_layerfeatureconstraints_postgis.png
  36. BIN msautotest/wxs/expected/wms_get_map_namedlayer_nostyle_postgis.png
  37. +1 −0 msautotest/wxs/wfs_200_cite_postgis.map
  38. +30 −2 msautotest/wxs/wfs_filter_postgis.map
  39. +6 −0 msautotest/wxs/wms_sld_postgis.map
@@ -0,0 +1,28 @@
#
# Test a R,G,B,unknown,Alpha image
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 my_layer
TYPE raster
STATUS ON
DATA data/5band.vrt
END
END # of map file
@@ -0,0 +1,57 @@
<VRTDataset rasterXSize="400" rasterYSize="300">
<GeoTransform> 0.0000000000000000e+00, 1.0000000000000000e+00, 0.0000000000000000e+00, 3.0000000000000000e+02, 0.0000000000000000e+00, -1.0000000000000000e+00</GeoTransform>
<Metadata domain="IMAGE_STRUCTURE">
<MDI key="INTERLEAVE">BAND</MDI>
</Metadata>
<VRTRasterBand dataType="Byte" band="1">
<ColorInterp>Red</ColorInterp>
<SimpleSource>
<SourceFilename relativeToVRT="1">rgba.tif</SourceFilename>
<SourceBand>1</SourceBand>
<SourceProperties RasterXSize="400" RasterYSize="300" DataType="Byte" BlockXSize="400" BlockYSize="20" />
<SrcRect xOff="0" yOff="0" xSize="400" ySize="300" />
<DstRect xOff="0" yOff="0" xSize="400" ySize="300" />
</SimpleSource>
</VRTRasterBand>
<VRTRasterBand dataType="Byte" band="2">
<ColorInterp>Green</ColorInterp>
<SimpleSource>
<SourceFilename relativeToVRT="1">rgba.tif</SourceFilename>
<SourceBand>2</SourceBand>
<SourceProperties RasterXSize="400" RasterYSize="300" DataType="Byte" BlockXSize="400" BlockYSize="20" />
<SrcRect xOff="0" yOff="0" xSize="400" ySize="300" />
<DstRect xOff="0" yOff="0" xSize="400" ySize="300" />
</SimpleSource>
</VRTRasterBand>
<VRTRasterBand dataType="Byte" band="3">
<ColorInterp>Blue</ColorInterp>
<SimpleSource>
<SourceFilename relativeToVRT="1">rgba.tif</SourceFilename>
<SourceBand>3</SourceBand>
<SourceProperties RasterXSize="400" RasterYSize="300" DataType="Byte" BlockXSize="400" BlockYSize="20" />
<SrcRect xOff="0" yOff="0" xSize="400" ySize="300" />
<DstRect xOff="0" yOff="0" xSize="400" ySize="300" />
</SimpleSource>
</VRTRasterBand>
<VRTRasterBand dataType="Byte" band="4">
<ComplexSource>
<SourceFilename relativeToVRT="1">rgba.tif</SourceFilename>
<SourceBand>1</SourceBand>
<SourceProperties RasterXSize="400" RasterYSize="300" DataType="Byte" BlockXSize="400" BlockYSize="20" />
<SrcRect xOff="0" yOff="0" xSize="400" ySize="300" />
<DstRect xOff="0" yOff="0" xSize="400" ySize="300" />
<ScaleOffset>0</ScaleOffset>
<ScaleRatio>0</ScaleRatio>
</ComplexSource>
</VRTRasterBand>
<VRTRasterBand dataType="Byte" band="5">
<ColorInterp>Alpha</ColorInterp>
<SimpleSource>
<SourceFilename relativeToVRT="1">rgba.tif</SourceFilename>
<SourceBand>4</SourceBand>
<SourceProperties RasterXSize="400" RasterYSize="300" DataType="Byte" BlockXSize="400" BlockYSize="20" />
<SrcRect xOff="0" yOff="0" xSize="400" ySize="300" />
<DstRect xOff="0" yOff="0" xSize="400" ySize="300" />
</SimpleSource>
</VRTRasterBand>
</VRTDataset>
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,25 @@
#
# Test 16-bit (actually 12-bit) LUT
#
MAP
NAME TEST
STATUS ON
SIZE 400 300
EXTENT 0.5 0.5 399.5 299.5
IMAGECOLOR 255 255 0
IMAGETYPE PNG24
LAYER
NAME grey
TYPE raster
STATUS default
DATA data/rgb_12bit.tif
PROCESSING "LUT_1=1605:30,2569:128,3372:200,4095:255"
PROCESSING "LUT_2=2055:196,4095:255"
PROCESSING "LUT_3=0:0,4095:255"
END
END # of map file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -9,6 +9,5 @@
<use xlink:href="#image6" transform="matrix(1.21534,-1.21534,1.21534,1.21534,35.609127,33)"/>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,0%,0%);fill-opacity:1;" d="M 29 82.5 C 29 87.832031 21 87.832031 21 82.5 C 21 77.167969 29 77.167969 29 82.5 "/>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,0%,0%);fill-opacity:1;" d="M 78.5 33 C 78.5 38.332031 70.5 38.332031 70.5 33 C 70.5 27.667969 78.5 27.667969 78.5 33 "/>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 8.007812 103.390625 C 8.621094 102.570312 9.292969 102.15625 10.023438 102.15625 C 10.429688 102.15625 10.761719 102.265625 11.023438 102.484375 C 11.28125 102.695312 11.449219 102.996094 11.523438 103.390625 C 11.898438 102.933594 12.234375 102.617188 12.539062 102.4375 C 12.851562 102.25 13.203125 102.15625 13.601562 102.15625 C 14.089844 102.15625 14.46875 102.3125 14.742188 102.625 C 15.023438 102.929688 15.164062 103.34375 15.164062 103.875 L 15.164062 106.734375 C 15.164062 107.027344 15.1875 107.28125 15.242188 107.5 C 15.261719 107.59375 15.296875 107.664062 15.351562 107.703125 C 15.414062 107.734375 15.527344 107.757812 15.695312 107.765625 L 16.054688 107.78125 L 16.164062 107.796875 L 16.164062 108.125 L 13.117188 108.125 L 13.117188 107.796875 L 13.210938 107.78125 L 13.585938 107.765625 C 13.75 107.757812 13.859375 107.734375 13.914062 107.703125 C 13.976562 107.664062 14.015625 107.59375 14.039062 107.5 C 14.078125 107.28125 14.101562 107.027344 14.101562 106.734375 L 14.101562 104.078125 C 14.101562 103.621094 14.042969 103.304688 13.929688 103.125 C 13.8125 102.9375 13.601562 102.84375 13.289062 102.84375 C 12.765625 102.84375 12.199219 103.148438 11.585938 103.75 L 11.585938 106.734375 L 11.617188 107.265625 C 11.625 107.476562 11.65625 107.605469 11.710938 107.65625 C 11.773438 107.710938 11.90625 107.746094 12.117188 107.765625 L 12.476562 107.78125 L 12.585938 107.796875 L 12.585938 108.125 L 9.539062 108.125 L 9.539062 107.796875 L 9.632812 107.78125 L 10.007812 107.765625 C 10.171875 107.757812 10.28125 107.734375 10.335938 107.703125 C 10.398438 107.664062 10.4375 107.59375 10.460938 107.5 C 10.5 107.28125 10.523438 107.027344 10.523438 106.734375 L 10.523438 104.078125 C 10.523438 103.621094 10.464844 103.304688 10.351562 103.125 C 10.234375 102.9375 10.027344 102.84375 9.726562 102.84375 C 9.164062 102.84375 8.589844 103.148438 8.007812 103.75 L 8.007812 106.734375 C 8.007812 107.027344 8.03125 107.28125 8.085938 107.5 C 8.105469 107.59375 8.140625 107.664062 8.195312 107.703125 C 8.257812 107.734375 8.371094 107.757812 8.539062 107.765625 L 8.898438 107.78125 L 9.007812 107.796875 L 9.007812 108.125 L 5.960938 108.125 L 5.960938 107.796875 L 6.054688 107.78125 L 6.414062 107.765625 C 6.621094 107.746094 6.75 107.710938 6.804688 107.65625 C 6.867188 107.605469 6.902344 107.476562 6.914062 107.265625 L 6.945312 106.734375 L 6.945312 103.6875 L 6.914062 103.15625 C 6.902344 102.949219 6.867188 102.820312 6.804688 102.765625 C 6.75 102.703125 6.621094 102.667969 6.414062 102.65625 L 6.054688 102.625 L 5.960938 102.625 L 5.960938 102.296875 L 8.007812 102.296875 Z M 20.304688 107.328125 C 19.949219 107.671875 19.632812 107.917969 19.351562 108.0625 C 19.078125 108.195312 18.773438 108.265625 18.429688 108.265625 C 17.9375 108.265625 17.527344 108.109375 17.195312 107.796875 C 16.859375 107.476562 16.695312 107.078125 16.695312 106.609375 C 16.695312 106.058594 16.914062 105.609375 17.351562 105.265625 C 17.621094 105.046875 17.9375 104.898438 18.304688 104.8125 C 18.679688 104.71875 19.1875 104.671875 19.835938 104.671875 L 20.054688 104.671875 L 20.054688 103.953125 C 20.054688 103.039062 19.703125 102.578125 19.007812 102.578125 C 18.683594 102.578125 18.398438 102.679688 18.148438 102.875 C 18 102.992188 17.90625 103.242188 17.867188 103.625 L 17.867188 103.71875 L 17.148438 103.71875 L 17.148438 102.65625 C 17.886719 102.324219 18.574219 102.15625 19.210938 102.15625 C 19.761719 102.15625 20.210938 102.289062 20.554688 102.546875 C 20.773438 102.714844 20.917969 102.898438 20.992188 103.09375 C 21.074219 103.28125 21.117188 103.554688 21.117188 103.90625 L 21.117188 106.515625 C 21.117188 106.976562 21.152344 107.304688 21.226562 107.5 C 21.308594 107.6875 21.453125 107.78125 21.664062 107.78125 C 21.726562 107.78125 21.820312 107.765625 21.945312 107.734375 L 21.976562 108.125 C 21.726562 108.21875 21.496094 108.265625 21.289062 108.265625 C 20.765625 108.265625 20.4375 107.953125 20.304688 107.328125 Z M 20.054688 107.203125 L 20.054688 105.015625 L 19.804688 105.015625 C 19.1875 105.015625 18.703125 105.148438 18.351562 105.40625 C 17.996094 105.65625 17.820312 106.007812 17.820312 106.453125 C 17.820312 106.796875 17.929688 107.078125 18.148438 107.296875 C 18.367188 107.515625 18.636719 107.625 18.960938 107.625 C 19.273438 107.625 19.636719 107.484375 20.054688 107.203125 Z M 24.382812 103.875 L 24.382812 106.734375 C 24.382812 107.027344 24.40625 107.28125 24.460938 107.5 C 24.480469 107.59375 24.515625 107.664062 24.570312 107.703125 C 24.632812 107.734375 24.746094 107.757812 24.914062 107.765625 L 25.273438 107.78125 L 25.507812 107.796875 L 25.507812 108.125 L 22.335938 108.125 L 22.335938 107.796875 L 22.429688 107.78125 L 22.789062 107.765625 C 22.996094 107.746094 23.125 107.710938 23.179688 107.65625 C 23.242188 107.605469 23.277344 107.476562 23.289062 107.265625 L 23.320312 106.734375 L 23.320312 103.6875 L 23.289062 103.15625 C 23.277344 102.949219 23.242188 102.820312 23.179688 102.765625 C 23.125 102.703125 22.996094 102.667969 22.789062 102.65625 L 22.429688 102.625 L 22.335938 102.625 L 22.335938 102.296875 L 24.382812 102.296875 L 24.382812 103.390625 C 24.859375 102.570312 25.492188 102.15625 26.273438 102.15625 C 26.386719 102.15625 26.507812 102.179688 26.632812 102.21875 L 26.632812 103.8125 L 26.039062 103.8125 L 26.039062 103.71875 L 25.976562 103.3125 C 25.964844 103.199219 25.9375 103.125 25.898438 103.09375 C 25.867188 103.054688 25.796875 103.03125 25.695312 103.03125 C 25.433594 103.03125 25.1875 103.105469 24.960938 103.25 C 24.742188 103.398438 24.546875 103.605469 24.382812 103.875 Z M 29.226562 105.25 L 29.226562 106.734375 L 29.257812 107.265625 C 29.257812 107.484375 29.292969 107.621094 29.367188 107.671875 C 29.4375 107.726562 29.648438 107.761719 29.992188 107.78125 L 30.085938 107.796875 L 30.085938 108.125 L 27.179688 108.125 L 27.179688 107.796875 L 27.273438 107.78125 L 27.632812 107.765625 C 27.839844 107.746094 27.96875 107.710938 28.023438 107.65625 C 28.085938 107.605469 28.121094 107.476562 28.132812 107.265625 L 28.164062 106.734375 L 28.164062 101.03125 L 28.132812 100.5 C 28.121094 100.304688 28.085938 100.179688 28.023438 100.125 C 27.96875 100.0625 27.839844 100.027344 27.632812 100.015625 L 27.273438 99.984375 L 27.179688 99.984375 L 27.179688 99.640625 L 29.226562 99.640625 L 29.226562 105 L 29.476562 105 L 30.835938 103.6875 C 30.949219 103.574219 31.121094 103.398438 31.351562 103.15625 C 31.453125 103.042969 31.542969 102.949219 31.617188 102.875 C 31.679688 102.824219 31.710938 102.777344 31.710938 102.734375 C 31.710938 102.671875 31.640625 102.640625 31.507812 102.640625 C 31.496094 102.640625 31.417969 102.636719 31.273438 102.625 C 31.167969 102.625 31.074219 102.625 30.992188 102.625 L 30.882812 102.625 L 30.882812 102.296875 L 33.164062 102.296875 L 33.164062 102.625 L 33.054688 102.625 C 32.679688 102.65625 32.433594 102.703125 32.320312 102.765625 C 32.214844 102.828125 31.882812 103.140625 31.320312 103.703125 L 30.304688 104.703125 L 32.054688 106.765625 L 32.632812 107.40625 C 32.789062 107.574219 32.902344 107.679688 32.976562 107.71875 C 33.046875 107.75 33.214844 107.773438 33.476562 107.78125 L 33.570312 107.796875 L 33.570312 108.125 L 31.945312 108.125 L 29.476562 105.25 Z M 38.835938 107.859375 C 38.15625 108.128906 37.542969 108.265625 36.992188 108.265625 C 36.136719 108.265625 35.4375 107.980469 34.898438 107.40625 C 34.367188 106.824219 34.101562 106.074219 34.101562 105.15625 C 34.101562 104.273438 34.339844 103.554688 34.820312 103 C 35.296875 102.4375 35.914062 102.15625 36.664062 102.15625 C 37.359375 102.15625 37.898438 102.390625 38.273438 102.859375 C 38.648438 103.328125 38.835938 104 38.835938 104.875 L 38.835938 104.984375 L 35.273438 104.984375 C 35.273438 105.789062 35.382812 106.386719 35.601562 106.78125 C 35.945312 107.40625 36.464844 107.71875 37.164062 107.71875 C 37.820312 107.71875 38.375 107.585938 38.835938 107.3125 Z M 35.289062 104.640625 L 37.710938 104.640625 L 37.710938 104.40625 C 37.710938 103.980469 37.6875 103.667969 37.648438 103.46875 C 37.617188 103.273438 37.546875 103.09375 37.445312 102.9375 C 37.234375 102.636719 36.953125 102.484375 36.601562 102.484375 C 36.195312 102.484375 35.871094 102.683594 35.632812 103.078125 C 35.402344 103.464844 35.289062 103.984375 35.289062 104.640625 Z M 41.648438 103.875 L 41.648438 106.734375 C 41.648438 107.027344 41.671875 107.28125 41.726562 107.5 C 41.746094 107.59375 41.78125 107.664062 41.835938 107.703125 C 41.898438 107.734375 42.011719 107.757812 42.179688 107.765625 L 42.539062 107.78125 L 42.773438 107.796875 L 42.773438 108.125 L 39.601562 108.125 L 39.601562 107.796875 L 39.695312 107.78125 L 40.054688 107.765625 C 40.261719 107.746094 40.390625 107.710938 40.445312 107.65625 C 40.507812 107.605469 40.542969 107.476562 40.554688 107.265625 L 40.585938 106.734375 L 40.585938 103.6875 L 40.554688 103.15625 C 40.542969 102.949219 40.507812 102.820312 40.445312 102.765625 C 40.390625 102.703125 40.261719 102.667969 40.054688 102.65625 L 39.695312 102.625 L 39.601562 102.625 L 39.601562 102.296875 L 41.648438 102.296875 L 41.648438 103.390625 C 42.125 102.570312 42.757812 102.15625 43.539062 102.15625 C 43.652344 102.15625 43.773438 102.179688 43.898438 102.21875 L 43.898438 103.8125 L 43.304688 103.8125 L 43.304688 103.71875 L 43.242188 103.3125 C 43.230469 103.199219 43.203125 103.125 43.164062 103.09375 C 43.132812 103.054688 43.0625 103.03125 42.960938 103.03125 C 42.699219 103.03125 42.453125 103.105469 42.226562 103.25 C 42.007812 103.398438 41.8125 103.605469 41.648438 103.875 Z M 41.648438 103.875 "/>
</g>
</svg>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 2fc36ed

Please sign in to comment.