[mapserver-commits] r11957 - in trunk/docs: . en/mapfile

[svn at osgeo.org]

Author: tbonfort
Date: 2011-07-19 04:21:47 -0700 (Tue, 19 Jul 2011)
New Revision: 11957

Modified:
   trunk/docs/conf.py
   trunk/docs/en/mapfile/outputformat.txt
Log:
mapfile keyword fixups, and add docs for AGG GAMMA FORMATOPTION (#3165)


Modified: trunk/docs/conf.py
===================================================================
--- trunk/docs/conf.py	2011-07-19 11:06:48 UTC (rev 11956)
+++ trunk/docs/conf.py	2011-07-19 11:21:47 UTC (rev 11957)
@@ -298,7 +298,8 @@
             r'PLUGIN|QUERY|RASTER|RIGHT|ROUND|SDE|SELECTED|SIMPLE|SINGLE|'
             r'SMALL|SQUARE|TINY|TRIANGLE|TRUE|TRUETYPE|UC|UL|UR|VECTOR|'
             r'WFS|WMS|ALPHA|'
-            r'GIF|JPEG|JPG|PNG|WBMP|SWF|PDF|GTIFF|PC256|RGB|RGBA|INT16|FLOAT32|GD|AGG'
+            r'GIF|JPEG|JPG|PNG|WBMP|SWF|PDF|GTIFF|PC256|RGB|RGBA|INT16|FLOAT32|GD|'
+            r'AGG|CAIRO|PNG8|SVG|KML|KMZ|GDAL'
             r')\b')
 
 keywords = (r'(ALIGN|'

Modified: trunk/docs/en/mapfile/outputformat.txt
===================================================================
--- trunk/docs/en/mapfile/outputformat.txt	2011-07-19 11:06:48 UTC (rev 11956)
+++ trunk/docs/en/mapfile/outputformat.txt	2011-07-19 11:21:47 UTC (rev 11957)
@@ -21,61 +21,64 @@
       MIMETYPE "image/png"
       IMAGEMODE RGB
       EXTENSION "png"
+      FORMATOPTION "GAMMA=0.75"
     END
     OUTPUTFORMAT
-      NAME gif
-      DRIVER "GD/GIF"
+      NAME "gif"
+      DRIVER GD/GIF
       MIMETYPE "image/gif"
       IMAGEMODE PC256
       EXTENSION "gif"
     END
     OUTPUTFORMAT
-      NAME png8
-      DRIVER "AGG/PNG8"
+      NAME "png8"
+      DRIVER AGG/PNG8
       MIMETYPE "image/png; mode=8bit"
       IMAGEMODE RGB
       EXTENSION "png"
       FORMATOPTION "QUANTIZE_FORCE=on"
       FORMATOPTION "QUANTIZE_COLORS=256"
+      FORMATOPTION "GAMMA=0.75"
     END
     OUTPUTFORMAT
-      NAME jpeg
-      DRIVER "AGG/JPEG"
+      NAME "jpeg"
+      DRIVER AGG/JPEG
       MIMETYPE "image/jpeg"
       IMAGEMODE RGB
       EXTENSION "jpg"
+      FORMATOPTION "GAMMA=0.75"
     END
     OUTPUTFORMAT
-      NAME svg
-      DRIVER "CAIRO/SVG"
+      NAME "svg"
+      DRIVER CAIRO/SVG
       MIMETYPE "image/svg+xml"
       IMAGEMODE RGB
       EXTENSION "svg"
     END
     OUTPUTFORMAT
-      NAME pdf
-      DRIVER "CAIRO/PDF"
+      NAME "pdf"
+      DRIVER CAIRO/PDF
       MIMETYPE "application/x-pdf"
       IMAGEMODE RGB
       EXTENSION "pdf"
     END
     OUTPUTFORMAT
-      NAME GTiff
-      DRIVER "GDAL/GTiff"
+      NAME "GTiff"
+      DRIVER GDAL/GTiff
       MIMETYPE "image/tiff"
       IMAGEMODE RGB
       EXTENSION "tif"
     END
     OUTPUTFORMAT
-      NAME kml
-      DRIVER "KML"
+      NAME "kml"
+      DRIVER KML
       MIMETYPE "application/vnd.google-earth.kml.xml"
       IMAGEMODE RGB
       EXTENSION "kml"
     END
     OUTPUTFORMAT
-      NAME kmz
-      DRIVER "KMZ"
+      NAME "kmz"
+      DRIVER KMZ
       MIMETYPE "application/vnd.google-earth.kmz"
       IMAGEMODE RGB
       EXTENSION "kmz"
@@ -169,6 +172,10 @@
       to record this in the resulting file as the nodata value. This is
       automatically set in WCS mode if rangeset_nullvalue is set. 
     - OGR/\*: See OGR Output document for details of OGR format options.
+    - AGG/\*: GAMMA=n is used to specify the gamma correction to apply to polygon
+      rendering. Allowed values are ]0.0,1.0] , default is 0.75. This value is
+      used to prevent artifacts from appearing on the border of contiguous
+      polygons. Set to 1.0 to disable gamma correction.
     - AGG/PNG: COMPRESSION=n is used to determine the ZLIB compression applied to
       the png creation. n is expected to be an integer value from 0 to 9, with 0
       meaning *no* compression (not recommended), 1 meaning fastest compression,