[mapserver-commits] r10519 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-09-24 20:56:14 +0000 (Fri, 24 Sep 2010)
New Revision: 10519

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapswf.c
Log:
Fixed SWF: not a valid Bitmap FillStyle (#3548)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-09-24 20:47:12 UTC (rev 10518)
+++ trunk/mapserver/HISTORY.TXT	2010-09-24 20:56:14 UTC (rev 10519)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed SWF: not a valid Bitmap FillStyle (#3548)
+
 - Set dependency on libxml2 when building --with-wfs (#3512)
 
 - Fixed TRUE is undefined in shptreevis (#3545)

Modified: trunk/mapserver/mapswf.c
===================================================================
--- trunk/mapserver/mapswf.c	2010-09-24 20:47:12 UTC (rev 10518)
+++ trunk/mapserver/mapswf.c	2010-09-24 20:56:14 UTC (rev 10519)
@@ -500,6 +500,7 @@
     
     oFill = SWFShape_addBitmapFill(oShape, oBitmap, flags);
     /* oFill = SWFShape_addBitmapFill(oShape, oBitmap, 0); */
+    if ( ! oFill ) return NULL;
     
     SWFShape_setRightFill(oShape, oFill);
     destroySWFFill(oFill);
@@ -627,7 +628,7 @@
     data = gd2bitmap(img, &size, &bytesPerColor);
     dbldata = bitmap2dbl(data,&size,&bytesPerColor);
     free(data); /* memory leak cf ticket #2555 */
-    oShape = bitmap2shape(dbldata, size, img->sx, img->sy, SWFFILL_SOLID, image);
+    oShape = bitmap2shape(dbldata, size, img->sx, img->sy, SWFFILL_TILED_BITMAP image);
     StoreDblData(dbldata, image); /* memory leak cf ticket #2555 */
     return oShape;
 }
@@ -2225,7 +2226,7 @@
         data = gd2bitmap(tile, &size, &bytesPerColor);
         dbldata = bitmap2dbl(data,&size,&bytesPerColor);
         oShape = bitmap2shape(dbldata, size, tile->sx, tile->sy, 
-                              SWFFILL_SOLID, image);/* SWFFILL_TILED_BITMAP); */
+                              SWFFILL_TILED_BITMAP, image);
         StoreShape(oShape, image);
     }
     else