dustymugs must have made a correction to pseudo_color -- no black background anymore...

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

diff --git a/doc/html/images/st_colormap_bluered.png b/doc/html/images/st_colormap_bluered.png
new file mode 100644 (file)
index 0000000..9d1db05
Binary files /dev/null and b/doc/html/images/st_colormap_bluered.png differ

diff --git a/doc/html/images/st_colormap_fire.png b/doc/html/images/st_colormap_fire.png
new file mode 100644 (file)
index 0000000..ad42cd5
Binary files /dev/null and b/doc/html/images/st_colormap_fire.png differ

diff --git a/doc/html/images/st_colormap_pseudo.png b/doc/html/images/st_colormap_pseudo.png
index 7562a05d14efef9fc8f4ff2879d00a2337193fa7..b8e3f3f47d9496ef024c2f56e595a5651442c975 100644 (file)
Binary files a/doc/html/images/st_colormap_pseudo.png and b/doc/html/images/st_colormap_pseudo.png differ

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index f674c52f5e080c48f985bf601f5f59047ee2646c..b5ed134193a09fbec2a390e6abc3805ba1da4fa7 100644 (file)
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -7523,7 +7523,7 @@ FROM dummy_rast WHERE rid=2;
                        <!-- Optionally add a "See Also" section -->
                        <refsection>
                                <title>See Also</title>
-                               <para><xref linkend="RT_ST_GDALDrivers" />, <xref linkend="RT_ST_AsGDALRaster" />, <xref linkend="RT_Raster_Applications" /></para>
+                               <para><xref linkend="RT_ST_AsGDALRaster" />, <xref linkend="RT_ST_ColorMap" />, <xref linkend="RT_ST_GDALDrivers" />,  <xref linkend="RT_Raster_Applications" /></para>
                        </refsection>
                </refentry>
                
@@ -10906,8 +10906,10 @@ FROM (SELECT
        , ref.rast, '8BUI'::text, i*5) As rast
        FROM ref cross JOIN generate_series(1,10,3) As i ) As shapes ;</programlisting>
 <programlisting>SELECT ST_NumBands(rast) As n_orig
-   , ST_NumBands(ST_ColorMap(rast, 'pseudocolor')) As npseudo
    , ST_NumBands(ST_ColorMap(rast, 'greyscale')) As ngrey
+   , ST_NumBands(ST_ColorMap(rast, 'pseudocolor')) As npseudo
+   , ST_NumBands(ST_ColorMap(rast, 'fire')) As nfire
+   , ST_NumBands(ST_ColorMap(rast, 'bluered')) As nbluered
    , ST_NumBands(ST_ColorMap(rast, '100% 255 0 0
 80% 160 0 0
 50% 130 0 0
@@ -10915,17 +10917,19 @@ FROM (SELECT
 20% 60 0 0
 0% 0 0 0
 nv 255 255 255')) As nred
-FROM funky_shapes;
-
- n_orig | npseudo | ngrey | nred
---------+---------+-------+------
-      1 |       4 |     1 |    3
-</programlisting>                      
+FROM funky_shapes;</programlisting>
+<screen>
+ n_orig | ngrey | npseudo | nfire | nbluered | nred
+--------+-------+---------+-------+----------+------
+      1 |     1 |       4 |     4 |        4 |    3
+</screen>                      
                        </refsection>
                        <refsection><title>Examples: Compare different color map looks using ST_AsPNG</title>
                                <programlisting>SELECT ST_AsPNG(rast) As orig_png
  , ST_AsPNG(ST_ColorMap(rast,'greyscale')) As grey_png
  , ST_AsPNG(ST_ColorMap(rast, 'pseudocolor')) As pseudo_png
+ , ST_AsPNG(ST_ColorMap(rast, 'pseudocolor')) As fire_png
+ , ST_AsPNG(ST_ColorMap(rast, 'bluered')) As bluered_png
  , ST_AsPNG(ST_ColorMap(rast, '100% 255 0 0
 80% 160 0 0
 50% 130 0 0
@@ -10936,7 +10940,7 @@ nv 255 255 255')) As red_png
 FROM funky_shapes;</programlisting>
 
 <informaltable>
-  <tgroup cols="2">
+  <tgroup cols="3">
        <tbody>
          <row>
                <entry><para><informalfigure>
@@ -10957,8 +10961,6 @@ FROM funky_shapes;</programlisting>
                        </mediaobject>
                  </informalfigure></para>
                 </entry>
-        </row>
-       <row>
                <entry><para><informalfigure>
                        <mediaobject>
                          <imageobject>
@@ -10968,6 +10970,26 @@ FROM funky_shapes;</programlisting>
                        </mediaobject>
                  </informalfigure></para>
                 </entry>
+       </row>
+       <row>
+                <entry><para><informalfigure>
+                       <mediaobject>
+                         <imageobject>
+                               <imagedata fileref="images/st_colormap_fire.png" />
+                         </imageobject>
+                         <caption><para>fire_png</para></caption>
+                       </mediaobject>
+                 </informalfigure></para>
+                </entry>
+                <entry><para><informalfigure>
+                       <mediaobject>
+                         <imageobject>
+                               <imagedata fileref="images/st_colormap_bluered.png" />
+                         </imageobject>
+                         <caption><para>bluered_png</para></caption>
+                       </mediaobject>
+                 </informalfigure></para>
+                </entry>
                 <entry><para><informalfigure>
                        <mediaobject>
                          <imageobject>