#1974 revise style colors and generator.c convert calls so they work with windows...

git-svn-id: http://svn.osgeo.org/postgis/trunk@10222 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/html/image_src/generator.c b/doc/html/image_src/generator.c
index 82be408fbb63664f0b36edc65a2460dc4841984a..d6b5c5529df41bf296b861e93ac1084a5f1e604b 100644 (file)
--- a/doc/html/image_src/generator.c
+++ b/doc/html/image_src/generator.c
@@ -237,7 +237,7 @@ addDropShadow(int layerNumber)
        char str[512];
        sprintf(
            str,
-           "convert tmp%d.png -gravity center \\( +clone -background navy -shadow 100x3+4+4 \\) +swap -background none -flatten tmp%d.png",
+           "convert tmp%d.png -gravity center ( +clone -background navy -shadow 100x3+4+4 ) +swap -background none -flatten tmp%d.png",
            layerNumber, layerNumber);
        LWDEBUGF(4, "%s", str);
        system(str);
@@ -256,7 +256,7 @@ addHighlight(int layerNumber)
        char str[512];
        sprintf(
            str,
-           "convert tmp%d.png \\( +clone -channel A -separate +channel -negate -background black -virtual-pixel background -blur 0x3 -shade 120x55 -contrast-stretch 0%% +sigmoidal-contrast 7x50%% -fill grey50 -colorize 10%% +clone +swap -compose overlay -composite \\) -compose In -composite tmp%d.png",
+           "convert tmp%d.png ( +clone -channel A -separate +channel -negate -background black -virtual-pixel background -blur 0x3 -shade 120x55 -contrast-stretch 0%% +sigmoidal-contrast 7x50%% -fill grey50 -colorize 10%% +clone +swap -compose overlay -composite ) -compose In -composite tmp%d.png",
            layerNumber, layerNumber);
        LWDEBUGF(4, "%s", str);
        system(str);

diff --git a/doc/html/image_src/styles.conf b/doc/html/image_src/styles.conf
index 8c1fd5a170ebf1028d435671302c1bbef5720775..acca3c10e6b9a830f02363a74bb4dcc974704d75 100644 (file)
--- a/doc/html/image_src/styles.conf
+++ b/doc/html/image_src/styles.conf
@@ -21,44 +21,44 @@ polygonStrokeWidth = 0
 # The bottom layer in the rendered WKT image
 styleName = Style1
 pointSize = 6
-pointColor = '#00bfff'
+pointColor = #00bfff
 lineWidth = 7
-lineColor = '#00bfff'
-polygonFillColor = '#00bfff'
-polygonStrokeColor = '#00bfff'
+lineColor = #00bfff
+polygonFillColor = #00bfff
+polygonStrokeColor = #00bfff
 polygonStrokeWidth = 0
 
 [Style]
 # The bottom layer in the rendered WKT image
 styleName = Style1-alpha
 pointSize = 6
-pointColor = '#0000ff80'
+pointColor = #0000ff80
 lineWidth = 7
-lineColor = '#0000ff80'
-polygonFillColor = '#0000ff80'
-polygonStrokeColor = '#0000ff80'
+lineColor = #0000ff80
+polygonFillColor = #0000ff80
+polygonStrokeColor = #0000ff80
 polygonStrokeWidth = 0
 
 [Style]
 # The bottom layer in the rendered WKT image
 styleName = Style1-thinline
 pointSize = 6
-pointColor = '#00bfff'
+pointColor = #00bfff
 lineWidth = 3
-lineColor = '#00bfff'
-polygonFillColor = '#00bfff'
-polygonStrokeColor = '#00bfff'
+lineColor = #00bfff
+polygonFillColor = #00bfff
+polygonStrokeColor = #00bfff
 polygonStrokeWidth = 0
 
 [Style]
 # The bottom layer in the rendered WKT image
 styleName = Style1-mediumline
 pointSize = 6
-pointColor = '#00bfff'
+pointColor = #00bfff
 lineWidth = 5
-lineColor = '#00bfff'
-polygonFillColor = '#00bfff'
-polygonStrokeColor = '#00bfff'
+lineColor = #00bfff
+polygonFillColor = #00bfff
+polygonStrokeColor = #00bfff
 polygonStrokeWidth = 0
 
 
@@ -77,11 +77,11 @@ polygonStrokeWidth = 0
 # The second layer in the rendered WKT image
 styleName = Style2-alpha
 pointSize = 6
-pointColor = '#00ff0080'
+pointColor = #00ff0080
 lineWidth = 7
-lineColor = '#00ff0080'
-polygonFillColor = '#00ff0080'
-polygonStrokeColor = '#00ff0080'
+lineColor = #00ff0080
+polygonFillColor = #00ff0080
+polygonStrokeColor = #00ff0080
 polygonStrokeWidth = 0
 
 [Style]