Changeset 7021

Show
Ignore:
Timestamp:
11/08/07 12:50:37 (8 months ago)
Author:
tbonfort
Message:

switch the renderer to GD and call the generic drawlabelcache for pdf and swf

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/mapserver/mappdf.c

    r6928 r7021  
    503503                   "RASTER") == 0) 
    504504    { 
     505        int orig_renderer; 
    505506        imagetmp = (imageObj *)image->img.pdf->imagetmp; 
    506507        msImageInitGD( imagetmp, &map->imagecolor); 
    507         msDrawLabelCacheGD(imagetmp->img.gd, map); 
     508        orig_renderer=image->format->renderer; 
     509        image->format->renderer = MS_RENDER_WITH_GD; 
     510        msDrawLabelCache(imagetmp, map); 
     511        image->format->renderer = orig_renderer; 
    508512        return 0; 
    509513    } 

  • trunk/mapserver/mapserver.h

    r7020 r7021  
    18681868MS_DLL_EXPORT int msDrawTextGD(gdImagePtr img, pointObj labelPnt, char *string, labelObj *label, fontSetObj *fontset, double scalefactor); 
    18691869MS_DLL_EXPORT int msDrawTextLineGD(gdImagePtr img, char *string, labelObj *label, labelPathObj *labelpath, fontSetObj *fontset, double scalefactor); 
    1870 MS_DLL_EXPORT int msDrawLabelCacheGD(gdImagePtr img, mapObj *map); 
    18711870MS_DLL_EXPORT int msDrawLegendIconGD(mapObj *map, layerObj *lp, classObj *theclass, int width, int height, gdImagePtr img, int dstX, int dstY); 
    18721871 
    …… 
    18991898MS_DLL_EXPORT int msDrawTextAGG(imageObj *imgage, pointObj labelPnt, char *string, labelObj *label, fontSetObj *fontset, double scalefactor); 
    19001899MS_DLL_EXPORT int msDrawTextLineAGG(imageObj *image, char *string, labelObj *label, labelPathObj *labelpath, fontSetObj *fontset, double scalefactor); 
    1901 MS_DLL_EXPORT int msDrawLabelCacheAGG(imageObj *image, mapObj *map); 
    19021900 
    19031901MS_DLL_EXPORT void msTransformShapeAGG(shapeObj *shape, rectObj extent, double cellsize); 

  • trunk/mapserver/mapswf.c

    r6912 r7021  
    22742274                  "SINGLE") == 0) 
    22752275    { 
     2276        int orig_renderer; 
    22762277        imagetmp = (imageObj *)((SWFObj *)image->img.swf)->imagetmp; 
    22772278        msImageInitGD( imagetmp, &map->imagecolor); 
    2278         msDrawLabelCacheGD(imagetmp->img.gd, map); 
     2279        orig_renderer=image->format->renderer; 
     2280        image->format->renderer = MS_RENDER_WITH_GD; 
     2281        msDrawLabelCache(imagetmp, map); 
     2282        image->format->renderer = orig_renderer; 
    22792283        oShape = gdImage2Shape(imagetmp->img.gd); 
    22802284        /* nTmp = ((SWFObj *)image->img.swf)->nCurrentMovie; */