[mapserver-commits] r11127 - trunk/mapserver
svn at osgeo.org
svn at osgeo.org
Wed Mar 9 14:05:25 EST 2011
Author: assefa
Date: 2011-03-09 11:05:25 -0800 (Wed, 09 Mar 2011)
New Revision: 11127
Modified:
trunk/mapserver/Makefile.vc
trunk/mapserver/mapdraw.c
trunk/mapserver/maperror.c
trunk/mapserver/mapoutput.c
trunk/mapserver/mapserver.h
Log:
remove swf references #3721
Modified: trunk/mapserver/Makefile.vc
===================================================================
--- trunk/mapserver/Makefile.vc 2011-03-09 05:29:39 UTC (rev 11126)
+++ trunk/mapserver/Makefile.vc 2011-03-09 19:05:25 UTC (rev 11127)
@@ -34,7 +34,7 @@
mapraster.obj cgiutil.obj mapsde.obj mapogr.obj maptime.obj \
maptemplate.obj mappostgis.obj maplayer.obj mapresample.obj \
mapwms.obj mapwmslayer.obj mapgml.obj maporaclespatial.obj \
- mapprojhack.obj mapdraw.obj mapgd.obj mapoutput.obj mapswf.obj \
+ mapprojhack.obj mapdraw.obj mapgd.obj mapoutput.obj \
mapgdal.obj mapwfs.obj mapwfs11.obj mapwfslayer.obj mapows.obj maphttp.obj \
mapcontext.obj mapdrawgdal.obj mapjoin.obj mapgraticule.obj \
mapmygis.obj mapimagemap.obj mapcopy.obj maprasterquery.obj \
Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c 2011-03-09 05:29:39 UTC (rev 11126)
+++ trunk/mapserver/mapdraw.c 2011-03-09 19:05:25 UTC (rev 11127)
@@ -172,14 +172,6 @@
image = msImageCreate(map->width, map->height, map->outputformat,
map->web.imagepath, map->web.imageurl, map->resolution, map->defresolution, &map->imagecolor);
}
-#ifdef USE_MING_FLASH
- else if( MS_RENDERER_SWF(map->outputformat) )
- {
- image = msImageCreateSWF(map->width, map->height, map->outputformat,
- map->web.imagepath, map->web.imageurl,
- map->resolution, map->defresolution);
- }
-#endif
else
{
image = NULL;
@@ -394,10 +386,6 @@
#ifdef USE_WMS_LYR
if(MS_RENDERER_PLUGIN(image->format) || MS_RENDERER_RAWDATA(image->format))
status = msDrawWMSLayerLow(map->layerorder[i], pasOWSReqInfo, numOWSRequests, map, lp, image);
-#ifdef USE_MING_FLASH
- else if(MS_RENDERER_SWF(image->format))
- status = msDrawWMSLayerSWF(map->layerorder[i], pasOWSReqInfo, numOWSRequests, map, lp, image);
-#endif
else {
msSetError(MS_WMSCONNERR, "Output format '%s' doesn't support WMS layers.", "msDrawMap()", image->format->name);
status = MS_FAILURE;
@@ -510,10 +498,6 @@
#ifdef USE_WMS_LYR
if(MS_RENDERER_PLUGIN(image->format) || MS_RENDERER_RAWDATA(image->format))
status = msDrawWMSLayerLow(map->layerorder[i], pasOWSReqInfo, numOWSRequests, map, lp, image);
-#ifdef USE_MING_FLASH
- else if(MS_RENDERER_SWF(image->format) )
- status = msDrawWMSLayerSWF(map->layerorder[i], pasOWSReqInfo, numOWSRequests, map, lp, image);
-#endif
#else
status = MS_FAILURE;
@@ -789,22 +773,7 @@
int *classgroup = NULL;
double minfeaturesize = -1;
-/* ==================================================================== */
-/* For Flash, we use a metadata called SWFOUTPUT that */
-/* is used to render vector layers as rasters. It is also true */
-/* if the output movie format indicated in the map file is */
-/* SINGLE. */
-/* ==================================================================== */
-#ifdef USE_MING_FLASH
- if(image && MS_RENDERER_SWF(image->format))
- {
- if ((msLookupHashTable(&(layer->metadata), "SWFOUTPUT") &&
- strcasecmp(msLookupHashTable(&(layer->metadata), "SWFOUTPUT"),"RASTER")==0) ||
- strcasecmp(msGetOutputFormatOption(image->format,"OUTPUT_MOVIE", ""),
- "MULTIPLE") != 0)
- return msDrawVectorLayerAsRasterSWF(map, layer, image);
- }
-#endif
+
//TODO TBT: draw as raster layer in vector renderers
@@ -822,14 +791,6 @@
if(status != MS_SUCCESS) return MS_FAILURE;
/* build item list */
-/* ==================================================================== */
-/* For Flash, we use a metadata called SWFDUMPATTRIBUTES that */
-/* contains a list of attributes that we want to write to the */
-/* flash movie for query purpose. */
-/* ==================================================================== */
- if(image && MS_RENDERER_SWF(image->format))
- status = msLayerWhichItems(layer, MS_FALSE, msLookupHashTable(&(layer->metadata), "SWFDUMPATTRIBUTES"));
- else
status = msLayerWhichItems(layer, MS_FALSE, NULL);
if(status != MS_SUCCESS) {
@@ -1295,10 +1256,6 @@
}
else if( MS_RENDERER_RAWDATA(image->format) )
return msDrawRasterLayerLow(map, layer, image, NULL);
-#ifdef USE_MING_FLASH
- else if( MS_RENDERER_SWF(image->format) )
- return msDrawRasterLayerSWF(map, layer, image);
-#endif
}
return MS_FAILURE;
@@ -1346,11 +1303,6 @@
nStatus = msDrawWMSLayerLow(1, asReqInfo, numReq,
map, layer, image) ;
-#ifdef USE_MING_FLASH
- else if( MS_RENDERER_SWF(image->format) )
- nStatus = msDrawWMSLayerSWF(1, asReqInfo, numReq,
- map, layer, image);
-#endif
else
{
msSetError(MS_WMSCONNERR,
@@ -2280,16 +2232,7 @@
if(!string) return MS_SUCCESS; /* not an error, just don't need to do anything more */
if(strlen(string) == 0) return MS_SUCCESS; /* not an error, just don't need to do anything more */
- /* ======================================================================= */
- /* TODO : This is a temporary hack to call the drawlableswf directly. */
- /* Normally the only functions that should be wrapped here is */
- /* draw_text. We did this since msGetLabelSize has not yet been */
- /* implemented for MING FDB fonts. */
- /* ======================================================================= */
-#ifdef USE_MING_FLASH
- if ( MS_RENDERER_SWF(image->format) )
- return msDrawLabelSWF(image, labelPnt, string, label, &(map->fontset), scalefactor);
-#endif
+
if(label->type == MS_TRUETYPE) {
size = label->size * scalefactor;
@@ -2646,10 +2589,7 @@
return MS_SUCCESS; /* necessary? */
} else if( MS_RENDERER_IMAGEMAP(image->format) )
nReturnVal = msDrawLabelCacheIM(image, map);
-#ifdef USE_MING_FLASH
- else if( MS_RENDERER_SWF(image->format) )
- nReturnVal = msDrawLabelCacheSWF(image, map);
-#endif
+
}
return nReturnVal;
@@ -2685,10 +2625,7 @@
}
else if( MS_RENDERER_IMAGEMAP(image->format) )
msImageStartLayerIM(map, layer, image);
-#ifdef USE_MING_FLASH
- else if( MS_RENDERER_SWF(image->format) )
- msImageStartLayerSWF(map, layer, image);
-#endif
+
}
}
@@ -2722,10 +2659,7 @@
if (image->format->vtable->startShape)
image->format->vtable->startShape(image, shape);
}
-#ifdef USE_MING_FLASH
- else if( MS_RENDERER_SWF(map->outputformat) )
- msDrawStartShapeSWF(map, layer, image, shape);
-#endif
+
}
}
Modified: trunk/mapserver/maperror.c
===================================================================
--- trunk/mapserver/maperror.c 2011-03-09 05:29:39 UTC (rev 11126)
+++ trunk/mapserver/maperror.c 2011-03-09 19:05:25 UTC (rev 11127)
@@ -511,10 +511,6 @@
#ifdef USE_PDF
strcat(version, " OUTPUT=PDF");
#endif
-#ifdef USE_MING_FLASH
- strcat(version, " OUTPUT=SWF");
-#endif
- strcat(version, " OUTPUT=SVG");
#ifdef USE_KML
strcat(version, " OUTPUT=KML");
#endif
Modified: trunk/mapserver/mapoutput.c
===================================================================
--- trunk/mapserver/mapoutput.c 2011-03-09 05:29:39 UTC (rev 11126)
+++ trunk/mapserver/mapoutput.c 2011-03-09 19:05:25 UTC (rev 11127)
@@ -268,17 +268,8 @@
}
#endif
-#ifdef USE_MING_FLASH
- if( strcasecmp(driver,"swf") == 0 )
- {
- format = msAllocOutputFormat( map, "swf", driver );
- format->mimetype = msStrdup("application/x-shockwave-flash");
- format->imagemode = MS_IMAGEMODE_PC256;
- format->extension = msStrdup("swf");
- format->renderer = MS_RENDER_WITH_SWF;
- }
-#endif
+
#ifdef USE_GDAL
if( strncasecmp(driver,"gdal/",5) == 0 )
{
@@ -363,9 +354,7 @@
if( msSelectOutputFormat( map, "jpeg" ) == NULL )
msCreateDefaultOutputFormat( map, "AGG/JPEG" );
- if( msSelectOutputFormat( map, "swf" ) == NULL )
- msCreateDefaultOutputFormat( map, "swf" );
-
+
if( msSelectOutputFormat( map, "imagemap" ) == NULL )
msCreateDefaultOutputFormat( map, "imagemap" );
Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h 2011-03-09 05:29:39 UTC (rev 11126)
+++ trunk/mapserver/mapserver.h 2011-03-09 19:05:25 UTC (rev 11127)
@@ -1601,9 +1601,6 @@
#ifndef SWIG
union {
void *plugin;
-#ifdef USE_MING_FLASH
- void *swf;
-#endif
char *imagemap;
short *raw_16bit;
@@ -2446,35 +2443,8 @@
MS_DLL_EXPORT int msHexDecode(const char *in, unsigned char *out, int numchars);
-/* ==================================================================== */
-/* prototypes for functions in mapswf.c */
-/* ==================================================================== */
-#ifdef USE_MING_FLASH
-MS_DLL_EXPORT imageObj *msImageCreateSWF(int width, int height, outputFormatObj *format, char *imagepath, char *imageurl, double resolution, double defresolution);
-MS_DLL_EXPORT void msImageStartLayerSWF(mapObj *map, layerObj *layer, imageObj *image);
-MS_DLL_EXPORT int msDrawLabelSWF(imageObj *image, pointObj labelPnt, char *string, labelObj *label, fontSetObj *fontset, double scalefactor);
-MS_DLL_EXPORT int msDrawLabelCacheSWF(imageObj *image, mapObj *map);
-MS_DLL_EXPORT void msDrawLineSymbolSWF(symbolSetObj *symbolset, imageObj *image, shapeObj *p, styleObj *style, double scalefactor);
-MS_DLL_EXPORT void msDrawShadeSymbolSWF(symbolSetObj *symbolset, imageObj *image, shapeObj *p, styleObj *style, double scalefactor);
-MS_DLL_EXPORT void msDrawMarkerSymbolSWF(symbolSetObj *symbolset, imageObj *image, pointObj *p, styleObj *style, double scalefactor);
-MS_DLL_EXPORT int msDrawRasterLayerSWF(mapObj *map, layerObj *layer, imageObj *image);
-MS_DLL_EXPORT int msDrawVectorLayerAsRasterSWF(mapObj *map, layerObj *layer, imageObj*image);
-#ifdef USE_WMS_LYR
-MS_DLL_EXPORT int msDrawWMSLayerSWF(int nLayerId, httpRequestObj *pasReqInfo, int numRequests, mapObj *map,
- layerObj *layer, imageObj *image);
-#endif
-MS_DLL_EXPORT void msTransformShapeSWF(shapeObj *shape, rectObj extent, double cellsize);
-MS_DLL_EXPORT int msSaveImageSWF(imageObj *image, char *filename);
-MS_DLL_EXPORT void msFreeImageSWF(imageObj *image);
-MS_DLL_EXPORT int draw_textSWF(imageObj *image, pointObj labelPnt, char *string, labelObj *label, fontSetObj *fontset, double scalefactor);
-MS_DLL_EXPORT void msDrawStartShapeSWF(mapObj *map, layerObj *layer, imageObj *image, shapeObj *shape);
-#endif /* USE_MING_FLASH */
/* ==================================================================== */
-/* End of prototypes for functions in mapswf.c */
-/* ==================================================================== */
-
-/* ==================================================================== */
/* prototypes for functions in mapgeomtransform.c */
/* ==================================================================== */
enum MS_GEOMTRANSFORM_TYPE {
More information about the mapserver-commits
mailing list