[mapserver-commits] [mapserver/mapserver] 0badcf: Output format: add a AGG/MIXED pseudo driver.

GitHub noreply at github.com
Thu Jul 7 13:07:20 PDT 2016 

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: 0badcfe0f193e46b4c4875194f7d53ce3723906f
      https://github.com/mapserver/mapserver/commit/0badcfe0f193e46b4c4875194f7d53ce3723906f
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-06-26 (Sun, 26 Jun 2016)

  Changed paths:
    M mapoutput.c
    M mapserver.h
    M mapwcs.c
    M mapwcs11.c
    M mapwcs20.c
    M mapwms.c

  Log Message:
  -----------
  Output format: add a AGG/MIXED pseudo driver.

This driver redirects to a concrete driver when the image
has non-opaque pixels, and to another one when the image
is fully opaque.

Requires to define TRANSPARENT_FORMAT and OPAQUE_FORMAT
FORMAT_OPTION on OUTPUTFORMATs that instanciate that
driver. Those underlying formats can be AGG/PNG, AGG/JPEG
or a GDAL/ one (anyone that uses AGG/ for rendering)

Two predefined formats image/jpeg-png and image/jpeg-png8
are added.

Example of custom mixed formats:

    OUTPUTFORMAT
      NAME jpeg_low
      MIMETYPE "image/jpeg; quality=50"
      DRIVER AGG/JPEG
      IMAGEMODE RGB
      FORMATOPTION "QUALITY=50"
    END

    OUTPUTFORMAT
      NAME jpeg_low_png
      MIMETYPE "image/jpeg_low-png"
      DRIVER AGG/MIXED
      FORMATOPTION "TRANSPARENT_FORMAT=png"
      FORMATOPTION "OPAQUE_FORMAT=jpeg_low"
    END

    OUTPUTFORMAT
      NAME jpeg_high
      MIMETYPE "image/jpeg; quality=99"
      DRIVER AGG/JPEG
      IMAGEMODE RGB
      FORMATOPTION "QUALITY=99"
    END

    OUTPUTFORMAT
      NAME jpeg_high_png8
      MIMETYPE "image/jpeg_high-png8"
      DRIVER AGG/MIXED
      FORMATOPTION "TRANSPARENT_FORMAT=png8"
      FORMATOPTION "OPAQUE_FORMAT=jpeg_high"
    END


  Commit: 57f8ed31d84d17653bc7d158f4d800cd11353562
      https://github.com/mapserver/mapserver/commit/57f8ed31d84d17653bc7d158f4d800cd11353562
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-06-26 (Sun, 26 Jun 2016)

  Changed paths:
    M mapoutput.c

  Log Message:
  -----------
  Use image/vnd.jpeg-png[8] as mime type to use the vendor tree


  Commit: abfdfe20751093bd1da6e13b19c40b98d0ec4cc8
      https://github.com/mapserver/mapserver/commit/abfdfe20751093bd1da6e13b19c40b98d0ec4cc8
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M msautotest/wxs/expected/ows_all_wms_capabilities.xml
    M msautotest/wxs/expected/ows_all_wms_capabilities_post.xml
    M msautotest/wxs/expected/ows_wms_capabilities.xml
    M msautotest/wxs/expected/wcs11_cap.txt
    M msautotest/wxs/expected/wcs11_cap.xml
    M msautotest/wxs/expected/wcs11_caps_section1.xml
    M msautotest/wxs/expected/wcs11_caps_section3.xml
    M msautotest/wxs/expected/wcs11_caps_updatesequence.xml
    M msautotest/wxs/expected/wcs11_post_cap.xml
    M msautotest/wxs/expected/wcs11_post_caps_section1.xml
    M msautotest/wxs/expected/wcs11_post_caps_section3.xml
    M msautotest/wxs/expected/wcs11_post_caps_updatesequence.xml
    M msautotest/wxs/expected/wcs_20_cap.txt
    M msautotest/wxs/expected/wcs_20_cap.xml
    M msautotest/wxs/expected/wcs_20_cap_200.xml
    M msautotest/wxs/expected/wcs_20_cap_accept_versions.xml
    M msautotest/wxs/expected/wcs_20_cap_sections_all.xml
    M msautotest/wxs/expected/wcs_20_cap_sections_all_specific.xml
    M msautotest/wxs/expected/wcs_20_cap_sections_service_metadata.xml
    M msautotest/wxs/expected/wcs_20_cap_updatesequence.xml
    M msautotest/wxs/expected/wcs_20_post_cap.xml
    M msautotest/wxs/expected/wcs_cap_highversion_x.y.xml
    M msautotest/wxs/expected/wcs_cap_highversion_x.y.z.xml
    M msautotest/wxs/expected/wcs_cap_noversion.xml
    M msautotest/wxs/expected/wcs_empty_cap111.xml
    M msautotest/wxs/expected/wcs_empty_cap201.xml
    M msautotest/wxs/expected/wcs_empty_cap_latestversion.xml
    M msautotest/wxs/expected/wms111_test_xml_escaping.xml
    M msautotest/wxs/expected/wms130_test_xml_escaping.xml
    M msautotest/wxs/expected/wms_cap.xml
    M msautotest/wxs/expected/wms_cap130.xml
    M msautotest/wxs/expected/wms_cap130_postgis.xml
    M msautotest/wxs/expected/wms_cap_latestversion.xml
    M msautotest/wxs/expected/wms_cap_latestversion_postgis.xml
    M msautotest/wxs/expected/wms_cap_postgis.xml
    M msautotest/wxs/expected/wms_caps_updatesequence.xml
    M msautotest/wxs/expected/wms_caps_updatesequence_postgis.xml
    M msautotest/wxs/expected/wms_dimension_cap.xml
    M msautotest/wxs/expected/wms_dimension_cap130.xml
    M msautotest/wxs/expected/wms_empty_cap111.xml
    M msautotest/wxs/expected/wms_empty_cap130.xml
    M msautotest/wxs/expected/wms_empty_cap_latestversion.xml
    M msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml
    M msautotest/wxs/expected/wms_get_caps.xml
    M msautotest/wxs/expected/wms_inspire_cap.xml
    M msautotest/wxs/expected/wms_inspire_cap_111.xml
    M msautotest/wxs/expected/wms_inspire_cap_111_eng.xml
    M msautotest/wxs/expected/wms_inspire_cap_111_ger.xml
    M msautotest/wxs/expected/wms_inspire_cap_eng.xml
    M msautotest/wxs/expected/wms_inspire_cap_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
    M msautotest/wxs/expected/wms_nosld_cap.xml
    M msautotest/wxs/expected/wms_nosld_cap_postgis.xml
    M msautotest/wxs/expected/wms_rast_cap.xml
    M msautotest/wxs/expected/wms_time_cap130.xml
    M msautotest/wxs/expected/wms_time_cap130_postgis_postgis.xml

  Log Message:
  -----------
  Adjust expected results of WMS/WCS GetCapabilities response to expose image/vnd.jpeg-png and image/vnd.jpeg-png8


  Commit: 85ab097d700862b4f74fba1c867fe6dd247ddac6
      https://github.com/mapserver/mapserver/commit/85ab097d700862b4f74fba1c867fe6dd247ddac6
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M msautotest/wxs/expected/wms_rast_cap.xml
    A msautotest/wxs/expected/wms_raster_jpeg_png.jpg
    A msautotest/wxs/expected/wms_raster_jpeg_png.png
    M msautotest/wxs/wms_raster.map

  Log Message:
  -----------
  Test image/vnd.jpeg-png


  Commit: fe792ccaf7ce2fa0c2e3acf96c5fce51788075d1
      https://github.com/mapserver/mapserver/commit/fe792ccaf7ce2fa0c2e3acf96c5fce51788075d1
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-07-07 (Thu, 07 Jul 2016)

  Changed paths:
    M mapoutput.c
    M mapserver.h
    M mapwcs.c
    M mapwcs11.c
    M mapwcs20.c
    M mapwms.c
    M msautotest/wxs/expected/ows_all_wms_capabilities.xml
    M msautotest/wxs/expected/ows_all_wms_capabilities_post.xml
    M msautotest/wxs/expected/ows_wms_capabilities.xml
    M msautotest/wxs/expected/wcs11_cap.txt
    M msautotest/wxs/expected/wcs11_cap.xml
    M msautotest/wxs/expected/wcs11_caps_section1.xml
    M msautotest/wxs/expected/wcs11_caps_section3.xml
    M msautotest/wxs/expected/wcs11_caps_updatesequence.xml
    M msautotest/wxs/expected/wcs11_post_cap.xml
    M msautotest/wxs/expected/wcs11_post_caps_section1.xml
    M msautotest/wxs/expected/wcs11_post_caps_section3.xml
    M msautotest/wxs/expected/wcs11_post_caps_updatesequence.xml
    M msautotest/wxs/expected/wcs_20_cap.txt
    M msautotest/wxs/expected/wcs_20_cap.xml
    M msautotest/wxs/expected/wcs_20_cap_200.xml
    M msautotest/wxs/expected/wcs_20_cap_accept_versions.xml
    M msautotest/wxs/expected/wcs_20_cap_sections_all.xml
    M msautotest/wxs/expected/wcs_20_cap_sections_all_specific.xml
    M msautotest/wxs/expected/wcs_20_cap_sections_service_metadata.xml
    M msautotest/wxs/expected/wcs_20_cap_updatesequence.xml
    M msautotest/wxs/expected/wcs_20_post_cap.xml
    M msautotest/wxs/expected/wcs_cap_highversion_x.y.xml
    M msautotest/wxs/expected/wcs_cap_highversion_x.y.z.xml
    M msautotest/wxs/expected/wcs_cap_noversion.xml
    M msautotest/wxs/expected/wcs_empty_cap111.xml
    M msautotest/wxs/expected/wcs_empty_cap201.xml
    M msautotest/wxs/expected/wcs_empty_cap_latestversion.xml
    M msautotest/wxs/expected/wms111_test_xml_escaping.xml
    M msautotest/wxs/expected/wms130_test_xml_escaping.xml
    M msautotest/wxs/expected/wms_cap.xml
    M msautotest/wxs/expected/wms_cap130.xml
    M msautotest/wxs/expected/wms_cap130_postgis.xml
    M msautotest/wxs/expected/wms_cap_latestversion.xml
    M msautotest/wxs/expected/wms_cap_latestversion_postgis.xml
    M msautotest/wxs/expected/wms_cap_postgis.xml
    M msautotest/wxs/expected/wms_caps_updatesequence.xml
    M msautotest/wxs/expected/wms_caps_updatesequence_postgis.xml
    M msautotest/wxs/expected/wms_dimension_cap.xml
    M msautotest/wxs/expected/wms_dimension_cap130.xml
    M msautotest/wxs/expected/wms_empty_cap111.xml
    M msautotest/wxs/expected/wms_empty_cap130.xml
    M msautotest/wxs/expected/wms_empty_cap_latestversion.xml
    M msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml
    M msautotest/wxs/expected/wms_get_caps.xml
    M msautotest/wxs/expected/wms_inspire_cap.xml
    M msautotest/wxs/expected/wms_inspire_cap_111.xml
    M msautotest/wxs/expected/wms_inspire_cap_111_eng.xml
    M msautotest/wxs/expected/wms_inspire_cap_111_ger.xml
    M msautotest/wxs/expected/wms_inspire_cap_eng.xml
    M msautotest/wxs/expected/wms_inspire_cap_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap111_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
    M msautotest/wxs/expected/wms_nosld_cap.xml
    M msautotest/wxs/expected/wms_nosld_cap_postgis.xml
    M msautotest/wxs/expected/wms_rast_cap.xml
    A msautotest/wxs/expected/wms_raster_jpeg_png.jpg
    A msautotest/wxs/expected/wms_raster_jpeg_png.png
    M msautotest/wxs/expected/wms_time_cap130.xml
    M msautotest/wxs/expected/wms_time_cap130_postgis_postgis.xml
    M msautotest/wxs/wms_raster.map

  Log Message:
  -----------
  Merge branch 'jpegpng'


Compare: https://github.com/mapserver/mapserver/compare/013fdec44536...fe792ccaf7ce

More information about the mapserver-commits mailing list