Changeset 7036 for trunk/mapserver/mapchart.c

Timestamp:

Nov 14, 2007, 5:44:16 AM (17 years ago)

Author:

tbonfort

Message:

fix bug with color allocation in paletted gd images

File:

• trunk/mapserver/mapchart.c (modified) (2 diffs)

trunk/mapserver/mapchart.c

@@ -208 +208 @@
         if(y!=vertOriginClipped) { /*don't draw bars of height == 0 (i.e. either values==0, or clipped)*/
             if( MS_RENDERER_GD(map->outputformat) ) {
-                color = gdImageColorAllocate(image->img.gd, layer->class[c]->styles[0]->color.red,
+                color = gdImageColorResolve(image->img.gd, 
+                        layer->class[c]->styles[0]->color.red,
                         layer->class[c]->styles[0]->color.green,
                         layer->class[c]->styles[0]->color.blue);
                 outlinecolor=-1;outlinewidth=1;
                 if(MS_VALID_COLOR(layer->class[c]->styles[0]->outlinecolor)) {
-                    outlinecolor = gdImageColorAllocate(image->img.gd, layer->class[c]->styles[0]->outlinecolor.red,
+                    outlinecolor = gdImageColorResolve(image->img.gd, 
+                            layer->class[c]->styles[0]->outlinecolor.red,
                             layer->class[c]->styles[0]->outlinecolor.green,
                             layer->class[c]->styles[0]->outlinecolor.blue);
@@ -319 +321 @@
         if( MS_RENDERER_GD(map->outputformat) )
         {
-            color = gdImageColorAllocate(image->img.gd, layer->class[i]->styles[0]->color.red,
+            color = gdImageColorResolve(image->img.gd, layer->class[i]->styles[0]->color.red,
                                                 layer->class[i]->styles[0]->color.green,
                                                 layer->class[i]->styles[0]->color.blue);
             outlinecolor=-1;outlinewidth=1;
             if(MS_VALID_COLOR(layer->class[i]->styles[0]->outlinecolor)) {
-                outlinecolor = gdImageColorAllocate(image->img.gd, layer->class[i]->styles[0]->outlinecolor.red,
+                outlinecolor = gdImageColorResolve(image->img.gd, layer->class[i]->styles[0]->outlinecolor.red,
                         layer->class[i]->styles[0]->outlinecolor.green,
                         layer->class[i]->styles[0]->outlinecolor.blue);