[mapserver-commits] r8794 - sandbox/graphics
svn at osgeo.org
svn at osgeo.org
Sat Mar 14 05:05:44 EDT 2009
Author: tbonfort
Date: 2009-03-14 05:05:44 -0400 (Sat, 14 Mar 2009)
New Revision: 8794
Modified:
sandbox/graphics/mapserver.h
Log:
code formatting revert, again
Modified: sandbox/graphics/mapserver.h
===================================================================
--- sandbox/graphics/mapserver.h 2009-03-14 08:55:20 UTC (rev 8793)
+++ sandbox/graphics/mapserver.h 2009-03-14 09:05:44 UTC (rev 8794)
@@ -15,7 +15,7 @@
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice shall be included in
+ * The above copyright notice and this permission notice shall be included in
* all copies of this Software or works derived from this Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
@@ -31,7 +31,7 @@
#define MAP_H
/*
-** MapServer version - to be updated for every release
+** MapServer version - to be updated for every release
*/
#define MS_VERSION "5.3-dev"
@@ -43,7 +43,7 @@
#define MS_VERSION_NUM (MS_VERSION_MAJOR*10000+MS_VERSION_MINOR*100+MS_VERSION_REV)
-/*
+/*
** Main includes. If a particular header was needed by several .c files then
** I just put it here. What the hell, it works and it's all right here. -SDL-
*/
@@ -155,8 +155,8 @@
with RGB map images */
#define MS_GD_ALPHA 1000
-/* Number of layer, class and style ptrs to alloc at once in the
- corresponding msGrow...() functions. Replaces former MS_MAXLAYERS,
+/* Number of layer, class and style ptrs to alloc at once in the
+ corresponding msGrow...() functions. Replaces former MS_MAXLAYERS,
MS_MAXCLASSES and MS_MAXSTYLES with dynamic allocation (see RFC-17). */
#define MS_LAYER_ALLOCSIZE 64
#define MS_CLASS_ALLOCSIZE 8
@@ -252,23 +252,23 @@
# define MS_NINT(x) lrint(x)
/*# define MS_NINT(x) lround(x) */
#elif defined(_MSC_VER) && defined(_WIN32) && !defined(USE_GENERIC_MS_NINT)
- static __inline long int MS_NINT (double flt)
+ static __inline long int MS_NINT (double flt)
{ int intgr;
-
+
_asm
{ fld flt
fistp intgr
} ;
-
+
return intgr ;
- }
+ }
#elif defined(i386) && defined(__GNUC_PREREQ) && !defined(USE_GENERIC_MS_NINT)
- static __inline long int MS_NINT( double __x )
+ static __inline long int MS_NINT( double __x )
{
- long int __lrintres;
- __asm__ __volatile__
- ("fistpl %0"
- : "=m" (__lrintres) : "t" (__x) : "st");
+ long int __lrintres;
+ __asm__ __volatile__
+ ("fistpl %0"
+ : "=m" (__lrintres) : "t" (__x) : "st");
return __lrintres;
}
#else
@@ -299,7 +299,6 @@
#define MS_DRIVER_SVG(format) (strncasecmp((format)->driver,"svg",3)==0)
#define MS_DRIVER_AGG(format) (strncasecmp((format)->driver,"agg/",3)==0)
#define MS_DRIVER_CAIRO(format) (strncasecmp((format)->driver,"cairo/",6)==0)
-#define MS_DRIVER_OGL(format) (strncasecmp((format)->driver,"ogl/",6)==0)
#define MS_DRIVER_TEMPLATE(format) (strncasecmp((format)->driver,"template",8)==0)
#define MS_RENDER_WITH_GD 1
@@ -310,8 +309,7 @@
#define MS_RENDER_WITH_SVG 6
#define MS_RENDER_WITH_AGG 7
#define MS_RENDER_WITH_TEMPLATE 8 /* query results only */
-#define MS_RENDER_WITH_CAIRO 9
-#define MS_RENDER_WITH_OGL 10
+#define MS_RENDER_WITH_CAIRO 9
#define MS_RENDERER_GD(format) ((format)->renderer == MS_RENDER_WITH_GD)
#define MS_RENDERER_SWF(format) ((format)->renderer == MS_RENDER_WITH_SWF)
@@ -320,7 +318,7 @@
#define MS_RENDERER_IMAGEMAP(format) ((format)->renderer == MS_RENDER_WITH_IMAGEMAP)
#define MS_RENDERER_SVG(format) ((format)->renderer == MS_RENDER_WITH_SVG)
#define MS_RENDERER_AGG(format) ((format)->renderer == MS_RENDER_WITH_AGG)
-#define MS_RENDERER_PLUGIN(format) ((format)->renderer == MS_RENDER_WITH_CAIRO || (format)->renderer == MS_RENDER_WITH_OGL)
+#define MS_RENDERER_PLUGIN(format) ((format)->renderer == MS_RENDER_WITH_CAIRO)
#define MS_RENDERER_TEMPLATE(format) ((format)->renderer == MS_RENDER_WITH_TEMPLATE)
#define MS_CELLSIZE(min,max,d) ((max - min)/(d-1)) /* where min/max are from an MapServer pixel center-to-pixel center extent */
@@ -370,18 +368,18 @@
enum MS_JOIN_CONNECTION_TYPE {MS_DB_XBASE, MS_DB_CSV, MS_DB_MYSQL, MS_DB_ORACLE, MS_DB_POSTGRES};
enum MS_JOIN_TYPE {MS_JOIN_ONE_TO_ONE, MS_JOIN_ONE_TO_MANY};
-enum MS_ALIGN_VALUE {MS_ALIGN_LEFT, MS_ALIGN_CENTER, MS_ALIGN_RIGHT};
+enum MS_ALIGN_VALUE {MS_ALIGN_LEFT, MS_ALIGN_CENTER, MS_ALIGN_RIGHT};
-enum MS_CAPS_JOINS_AND_CORNERS {MS_CJC_NONE, MS_CJC_BEVEL, MS_CJC_BUTT, MS_CJC_MITER, MS_CJC_ROUND, MS_CJC_SQUARE, MS_CJC_TRIANGLE};
+enum MS_CAPS_JOINS_AND_CORNERS {MS_CJC_NONE, MS_CJC_BEVEL, MS_CJC_BUTT, MS_CJC_MITER, MS_CJC_ROUND, MS_CJC_SQUARE, MS_CJC_TRIANGLE};
enum MS_RETURN_VALUE {MS_SUCCESS, MS_FAILURE, MS_DONE};
enum MS_IMAGEMODE { MS_IMAGEMODE_PC256, MS_IMAGEMODE_RGB, MS_IMAGEMODE_RGBA, MS_IMAGEMODE_INT16, MS_IMAGEMODE_FLOAT32, MS_IMAGEMODE_BYTE, MS_IMAGEMODE_NULL };
enum MS_GEOS_OPERATOR {MS_GEOS_EQUALS, MS_GEOS_DISJOINT, MS_GEOS_TOUCHES, MS_GEOS_OVERLAPS, MS_GEOS_CROSSES, MS_GEOS_INTERSECTS, MS_GEOS_WITHIN, MS_GEOS_CONTAINS, MS_GEOS_BEYOND, MS_GEOS_DWITHIN};
-#define MS_FILE_DEFAULT MS_FILE_MAP
+#define MS_FILE_DEFAULT MS_FILE_MAP
#ifndef SWIG
-/* Filter object */
-typedef enum
+/* Filter object */
+typedef enum
{
FILTER_NODE_TYPE_UNDEFINED = -1,
FILTER_NODE_TYPE_LOGICAL = 0,
@@ -436,7 +434,7 @@
#ifdef SWIG
%immutable;
#endif
- char *filename;
+ char *filename;
int numfonts;
hashTableObj fonts;
#ifdef SWIG
@@ -487,12 +485,12 @@
/* container for expression options such as case-insensitiveness */
/* This is a boolean container. */
int flags;
-
+
/* logical expression options */
char **items;
int *indexes;
int numitems;
-
+
/* regular expression options */
ms_regex_t regex; /* compiled regular expression to be matched */
int compiled;
@@ -511,19 +509,19 @@
char *name;
char **items, **values; /* items/values (process 1 record at a time) */
int numitems;
-
+
char *table;
char *from, *to; /* item names */
-
+
void *joininfo; /* vendor specific (i.e. XBase, MySQL, etc.) stuff to allow for persistant access */
-
+
char *header, *footer;
#ifndef __cplusplus
char *template;
#else
char *_template;
#endif
-
+
enum MS_JOIN_TYPE type;
char *connection;
enum MS_JOIN_CONNECTION_TYPE connectiontype;
@@ -554,7 +552,7 @@
/* The following is used for "don't care" values in transparent, interlace and
imagequality values. */
-#define MS_NOOVERRIDE -1111
+#define MS_NOOVERRIDE -1111
/************************************************************************/
/* queryMapObj */
@@ -594,11 +592,11 @@
typedef struct {
char *font;
enum MS_FONT_TYPE type;
-
+
colorObj color;
colorObj outlinecolor;
int outlinewidth;
-
+
colorObj shadowcolor;
int shadowsizex, shadowsizey;
@@ -631,7 +629,7 @@
int autominfeaturesize; /* true or false */
double minscaledenom,maxscaledenom;
-
+
int mindistance;
int partials; /* can labels run of an image */
@@ -708,12 +706,12 @@
#ifdef SWIG
%mutable;
#endif /* SWIG */
-
+
/*private vars for rfc48*/
/*TODO: how/if to expose these two to swig*/
char *_geomtransformexpression;
int _geomtransform;
-
+
/*should an angle be automatically computed*/
int autoangle;
@@ -730,7 +728,7 @@
double maxvalue;
char *rangeitem;
int rangeitemindex;
-
+
int symbol;
char *symbolname;
@@ -828,7 +826,7 @@
int debug;
char *keyimage;
-
+
char *group;
} classObj;
@@ -866,7 +864,7 @@
#ifndef SWIG
labelPathObj *labelpath; /* Path & bounds of curved labels. Bug #1620 implementation */
#endif /* SWIG */
-
+
} labelCacheMemberObj;
/************************************************************************/
@@ -1219,7 +1217,7 @@
#endif /* SWIG */
int opacity; /* opacity (was transparency) value 0-100 */
-
+
int dump;
int debug;
#ifndef SWIG
@@ -1229,8 +1227,8 @@
#ifdef SWIG
%immutable;
#endif /* SWIG */
-
-#ifndef SWIGJAVA
+
+#ifndef SWIGJAVA
rectObj extent;
#endif /* not SWIGJAVA */
@@ -1321,7 +1319,7 @@
#ifdef SWIG
%immutable;
-#endif /* SWIG */
+#endif /* SWIG */
referenceMapObj reference;
scalebarObj scalebar;
legendObj legend;
@@ -1335,9 +1333,9 @@
int *layerorder;
- int debug;
+ int debug;
- char *datapattern, *templatepattern;
+ char *datapattern, *templatepattern;
#ifdef SWIG
%immutable;
@@ -1364,7 +1362,7 @@
mapObj *map;
PDF *pdf;
void *imagetmp; /* used when the FORMATOPTION "OUTPUT_TYPE=RASTER" */
-} PDFObj;
+} PDFObj;
#endif
/************************************************************************/
@@ -1442,22 +1440,22 @@
int (*LayerIsOpen)(layerObj *layer);
int (*LayerWhichShapes)(layerObj *layer, rectObj rect);
int (*LayerNextShape)(layerObj *layer, shapeObj *shape);
- int (*LayerGetShape)(layerObj *layer, shapeObj *shape,
+ int (*LayerGetShape)(layerObj *layer, shapeObj *shape,
int tile, long record);
int (*LayerClose)(layerObj *layer);
int (*LayerGetItems)(layerObj *layer);
int (*LayerGetExtent)(layerObj *layer, rectObj *extent);
- int (*LayerGetAutoStyle)(mapObj *map, layerObj *layer, classObj *c,
+ int (*LayerGetAutoStyle)(mapObj *map, layerObj *layer, classObj *c,
int tile, long record);
int (*LayerCloseConnection)(layerObj *layer);
- int (*LayerSetTimeFilter)(layerObj *layer,
- const char *timestring,
+ int (*LayerSetTimeFilter)(layerObj *layer,
+ const char *timestring,
const char *timefield);
int (*LayerApplyFilterToLayer)(FilterEncodingNode *psNode, mapObj *map,
- int iLayerIndex,
+ int iLayerIndex,
int bOnlySpatialFilter);
int (*LayerCreateItems)(layerObj *layer, int nt);
@@ -1533,7 +1531,7 @@
pointObj get_metrics_line(pointObj *p, int position, rectObj rect, int ox, int oy, double angle, int buffer, lineObj *poly);
pointObj get_metrics(pointObj *p, int position, rectObj rect, int ox, int oy, double angle, int buffer, shapeObj *poly);
double dist(pointObj a, pointObj b);
-
+
/*
** Main API Functions
*/
@@ -1544,7 +1542,7 @@
MS_DLL_EXPORT mapObj *msNewMapObj(void);
MS_DLL_EXPORT const char *msGetConfigOption( mapObj *map, const char *key);
MS_DLL_EXPORT int msSetConfigOption( mapObj *map, const char *key, const char *value);
-MS_DLL_EXPORT int msTestConfigOption( mapObj *map, const char *key,
+MS_DLL_EXPORT int msTestConfigOption( mapObj *map, const char *key,
int default_result );
MS_DLL_EXPORT void msApplyMapConfigOptions( mapObj *map );
MS_DLL_EXPORT int msMapComputeGeotransform( mapObj *map );
@@ -1552,10 +1550,10 @@
MS_DLL_EXPORT void msMapPixelToGeoref( mapObj *map, double *x, double *y );
MS_DLL_EXPORT void msMapGeorefToPixel( mapObj *map, double *x, double *y );
-MS_DLL_EXPORT int msMapSetExtent(mapObj *map, double minx, double miny,
+MS_DLL_EXPORT int msMapSetExtent(mapObj *map, double minx, double miny,
double maxx, double maxy);
MS_DLL_EXPORT int msMapOffsetExtent( mapObj *map, double x, double y);
-MS_DLL_EXPORT int msMapScaleExtent( mapObj *map, double zoomfactor,
+MS_DLL_EXPORT int msMapScaleExtent( mapObj *map, double zoomfactor,
double minscaledenom, double maxscaledenom);
MS_DLL_EXPORT int msMapSetCenter( mapObj *map, pointObj *center);
MS_DLL_EXPORT int msMapSetRotation( mapObj *map, double rotation_angle );
@@ -1568,7 +1566,7 @@
MS_DLL_EXPORT int msMapIgnoreMissingData( mapObj *map );
/* mapfile.c */
-
+
MS_DLL_EXPORT int msGetLayerIndex(mapObj *map, char *name); /* in mapfile.c */
MS_DLL_EXPORT int msGetSymbolIndex(symbolSetObj *set, char *name, int try_addimage_if_notfound);
MS_DLL_EXPORT mapObj *msLoadMap(char *filename, char *new_mappath);
@@ -1590,7 +1588,7 @@
MS_DLL_EXPORT int msInitLabelCache(labelCacheObj *cache);
MS_DLL_EXPORT int msFreeLabelCache(labelCacheObj *cache);
MS_DLL_EXPORT int msCheckConnection(layerObj * layer); /* connection pooling functions (mapfile.c) */
-MS_DLL_EXPORT void msCloseConnections(mapObj *map);
+MS_DLL_EXPORT void msCloseConnections(mapObj *map);
#if defined USE_PDF
MS_DLL_EXPORT PDF *msDrawMapPDF(mapObj *map, PDF *pdf, hashTableObj fontHash); /* mappdf.c */
@@ -1599,8 +1597,8 @@
MS_DLL_EXPORT void msOGRCleanup(void);
MS_DLL_EXPORT void msGDALCleanup(void);
MS_DLL_EXPORT void msGDALInitialize(void);
+
-
MS_DLL_EXPORT imageObj *msDrawScalebar(mapObj *map); /* in mapscale.c */
MS_DLL_EXPORT int msCalculateScale(rectObj extent, int units, int width, int height, double resolution, double *scaledenom);
MS_DLL_EXPORT double msInchesPerUnit(int units, double center_lat);
@@ -1638,19 +1636,19 @@
MS_DLL_EXPORT int msQueryByRect(mapObj *map, int qlayer, rectObj rect);
MS_DLL_EXPORT int msQueryByFeatures(mapObj *map, int qlayer, int slayer);
MS_DLL_EXPORT int msQueryByShape(mapObj *map, int qlayer, shapeObj *selectshape);
-MS_DLL_EXPORT int msQueryByOperator(mapObj *map, int qlayer, shapeObj *selectshape,
+MS_DLL_EXPORT int msQueryByOperator(mapObj *map, int qlayer, shapeObj *selectshape,
int geos_operator);
MS_DLL_EXPORT int msGetQueryResultBounds(mapObj *map, rectObj *bounds);
MS_DLL_EXPORT int msIsLayerQueryable(layerObj *lp);
MS_DLL_EXPORT void msQueryFree(mapObj *map, int qlayer);
MS_DLL_EXPORT int msRasterQueryByShape(mapObj *map, layerObj *layer, shapeObj *selectshape);
MS_DLL_EXPORT int msRasterQueryByRect(mapObj *map, layerObj *layer, rectObj queryRect);
-MS_DLL_EXPORT int msRasterQueryByPoint(mapObj *map, layerObj *layer, int mode,
+MS_DLL_EXPORT int msRasterQueryByPoint(mapObj *map, layerObj *layer, int mode,
pointObj p, double buffer );
/* in mapstring.c */
-MS_DLL_EXPORT void msStringTrim(char *str);
-MS_DLL_EXPORT void msStringTrimBlanks(char *string);
+MS_DLL_EXPORT void msStringTrim(char *str);
+MS_DLL_EXPORT void msStringTrimBlanks(char *string);
MS_DLL_EXPORT char *msStringTrimLeft(char *string);
MS_DLL_EXPORT char *msStringChop(char *string);
MS_DLL_EXPORT void msStringTrimEOL(char *string);
@@ -1748,7 +1746,7 @@
MS_DLL_EXPORT int msEmbedLegend(mapObj *map, imageObj *img);
MS_DLL_EXPORT int msDrawLegendIcon(mapObj* map, layerObj* lp, classObj* myClass, int width, int height, imageObj *img, int dstX, int dstY);
MS_DLL_EXPORT imageObj *msCreateLegendIcon(mapObj* map, layerObj* lp, classObj* myClass, int width, int height);
-
+
MS_DLL_EXPORT int msLoadFontSet(fontSetObj *fontSet, mapObj *map); /* in maplabel.c */
MS_DLL_EXPORT int msInitFontSet(fontSetObj *fontset);
MS_DLL_EXPORT int msFreeFontSet(fontSetObj *fontset);
@@ -1800,7 +1798,7 @@
MS_DLL_EXPORT int msGetNextBit(char *array, int index, int size);
MS_DLL_EXPORT int msLayerInitItemInfo(layerObj *layer);
-MS_DLL_EXPORT void msLayerFreeItemInfo(layerObj *layer);
+MS_DLL_EXPORT void msLayerFreeItemInfo(layerObj *layer);
MS_DLL_EXPORT int msLayerOpen(layerObj *layer); /* in maplayer.c */
MS_DLL_EXPORT int msLayerIsOpen(layerObj *layer);
@@ -1815,26 +1813,26 @@
MS_DLL_EXPORT int msLayerSetExtent( layerObj *layer, double minx, double miny, double maxx, double maxy);
MS_DLL_EXPORT int msLayerGetAutoStyle(mapObj *map, layerObj *layer, classObj *c, int tile, long record);
MS_DLL_EXPORT void msLayerAddProcessing( layerObj *layer, const char *directive );
-MS_DLL_EXPORT void msLayerSetProcessingKey( layerObj *layer, const char *key,
+MS_DLL_EXPORT void msLayerSetProcessingKey( layerObj *layer, const char *key,
const char *value);
MS_DLL_EXPORT char *msLayerGetProcessing( layerObj *layer, int proc_index);
MS_DLL_EXPORT char *msLayerGetProcessingKey( layerObj *layer, const char *);
MS_DLL_EXPORT int msLayerClearProcessing( layerObj *layer );
MS_DLL_EXPORT char* msLayerGetFilterString( layerObj *layer );
-MS_DLL_EXPORT int msLayerSetTimeFilter(layerObj *lp, const char *timestring,
+MS_DLL_EXPORT int msLayerSetTimeFilter(layerObj *lp, const char *timestring,
const char *timefield);
-/* Helper functions for layers */
-MS_DLL_EXPORT int msLayerMakeBackticsTimeFilter(layerObj *lp, const char *timestring,
+/* Helper functions for layers */
+MS_DLL_EXPORT int msLayerMakeBackticsTimeFilter(layerObj *lp, const char *timestring,
const char *timefield);
-MS_DLL_EXPORT int msLayerMakePlainTimeFilter(layerObj *lp, const char *timestring,
+MS_DLL_EXPORT int msLayerMakePlainTimeFilter(layerObj *lp, const char *timestring,
const char *timefield);
-MS_DLL_EXPORT int msLayerApplyCondSQLFilterToLayer(FilterEncodingNode *psNode, mapObj *map,
+MS_DLL_EXPORT int msLayerApplyCondSQLFilterToLayer(FilterEncodingNode *psNode, mapObj *map,
int iLayerIndex, int bOnlySpatialFilter);
-MS_DLL_EXPORT int msLayerApplyPlainFilterToLayer(FilterEncodingNode *psNode, mapObj *map,
+MS_DLL_EXPORT int msLayerApplyPlainFilterToLayer(FilterEncodingNode *psNode, mapObj *map,
int iLayerIndex, int bOnlySpatialFilter);
@@ -1856,7 +1854,7 @@
MS_DLL_EXPORT int drawSDE(mapObj *map, layerObj *layer, gdImagePtr img);
MS_DLL_EXPORT int msInitializeVirtualTable(layerObj *layer);
-MS_DLL_EXPORT int msConnectLayer(layerObj *layer, const int connectiontype,
+MS_DLL_EXPORT int msConnectLayer(layerObj *layer, const int connectiontype,
const char *library_str);
MS_DLL_EXPORT int msINLINELayerInitializeVirtualTable(layerObj *layer);
@@ -2110,15 +2108,15 @@
/* prototypes for functions in mapsvg.c */
/* ==================================================================== */
-MS_DLL_EXPORT imageObj *msImageCreateSVG(int width, int height,
- outputFormatObj *format, char *imagepath,
+MS_DLL_EXPORT imageObj *msImageCreateSVG(int width, int height,
+ outputFormatObj *format, char *imagepath,
char *imageurl, mapObj *map);
-MS_DLL_EXPORT void msImageStartLayerSVG(mapObj *map, layerObj *layer,
+MS_DLL_EXPORT void msImageStartLayerSVG(mapObj *map, layerObj *layer,
imageObj *image);
-MS_DLL_EXPORT void msDrawLineSymbolSVG(symbolSetObj *symbolset, imageObj *image,
- shapeObj *p, styleObj *style,
+MS_DLL_EXPORT void msDrawLineSymbolSVG(symbolSetObj *symbolset, imageObj *image,
+ shapeObj *p, styleObj *style,
double scalefactor);
MS_DLL_EXPORT void msTransformShapeSVG(shapeObj *shape, rectObj extent, double cellsize,
imageObj *image);
@@ -2126,20 +2124,20 @@
MS_DLL_EXPORT int msSaveImagetoFpSVG(imageObj *image, FILE *fp);
MS_DLL_EXPORT void msFreeImageSVG(imageObj *image);
-MS_DLL_EXPORT void msDrawMarkerSymbolSVG(symbolSetObj *symbolset,
- imageObj *image,
- pointObj *p, styleObj *style,
+MS_DLL_EXPORT void msDrawMarkerSymbolSVG(symbolSetObj *symbolset,
+ imageObj *image,
+ pointObj *p, styleObj *style,
double scalefactor);
-MS_DLL_EXPORT int msDrawTextSVG(imageObj *image, pointObj labelPnt, char *string,
- labelObj *label, fontSetObj *fontset,
+MS_DLL_EXPORT int msDrawTextSVG(imageObj *image, pointObj labelPnt, char *string,
+ labelObj *label, fontSetObj *fontset,
double scalefactor);
MS_DLL_EXPORT int msDrawLabelCacheSVG(imageObj *image, mapObj *map);
-MS_DLL_EXPORT int msDrawRasterLayerSVG(mapObj *map, layerObj *layer,
+MS_DLL_EXPORT int msDrawRasterLayerSVG(mapObj *map, layerObj *layer,
imageObj *image);
-MS_DLL_EXPORT void msDrawShadeSymbolSVG(symbolSetObj *symbolset,
- imageObj *image, shapeObj *p,
+MS_DLL_EXPORT void msDrawShadeSymbolSVG(symbolSetObj *symbolset,
+ imageObj *image, shapeObj *p,
styleObj *style, double scalefactor);
@@ -2199,7 +2197,7 @@
MS_DLL_EXPORT char *copyStringProperty(char **dst, char *src);
MS_DLL_EXPORT int msCopyClass(classObj *dst, classObj *src, layerObj *layer);
MS_DLL_EXPORT int msCopyStyle(styleObj *dst, styleObj *src);
-
+
/* ==================================================================== */
/* end prototypes for functions in mapcopy */
/* ==================================================================== */
@@ -2219,7 +2217,7 @@
/* prototypes for functions in mapcpl.c */
/* ==================================================================== */
MS_DLL_EXPORT const char *msGetBasename( const char *pszFullFilename );
-MS_DLL_EXPORT void *msGetSymbol(const char *pszLibrary,
+MS_DLL_EXPORT void *msGetSymbol(const char *pszLibrary,
const char *pszEntryPoint);
/* ==================================================================== */
@@ -2284,8 +2282,8 @@
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,
+#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);
@@ -2314,8 +2312,8 @@
MS_DLL_EXPORT void msFreeImagePDF(imageObj *image);
MS_DLL_EXPORT int msDrawTextPDF(imageObj *image, pointObj labelPnt, char *string, labelObj *label, fontSetObj *fontset, double scalefactor);
MS_DLL_EXPORT void msDrawStartShapePDF(mapObj *map, layerObj *layer, imageObj *image, shapeObj *shape);
-#ifdef USE_WMS_LYR
-MS_DLL_EXPORT int msDrawWMSLayerPDF(int nLayerId, httpRequestObj *pasReqInfo,
+#ifdef USE_WMS_LYR
+MS_DLL_EXPORT int msDrawWMSLayerPDF(int nLayerId, httpRequestObj *pasReqInfo,
int numRequests, mapObj *map, layerObj *layer, imageObj *image);
#endif
@@ -2425,7 +2423,7 @@
double size, char *font, char *thechars, double angle,
colorObj *shadowcolor, double shdx, double shdy,
int outlinewidth);
- void msRenderEllipseCairo(imageObj *image, double x, double y,
+ void msRenderEllipseCairo(imageObj *image, double x, double y,
double width, double height, double angle,
colorObj *color, colorObj *outlinecolor,
double outlinewidth);
@@ -2446,7 +2444,6 @@
colorObj *outlinecolor,
double outlinewidth);
-
void* msCreateTileTruetypeCairo(imageObj *img, char *text, char *font,
double size, double angle, colorObj *c, colorObj *bc, colorObj *oc,
double ow);
@@ -2464,9 +2461,8 @@
#endif
/* ==================================================================== */
/* end of prototypes for functions in mapcairo.c */
-/* ==================================================================== */
+/* ==================================================================== */
-
typedef struct {
unsigned char *pixelbuffer;
unsigned int width,height;
@@ -2489,30 +2485,30 @@
colorObj *oc, double outlineWidth);
void (*renderPolygonTiled)(imageObj *img, shapeObj *p, colorObj *oc, double outlineWidth, void *tile);
void (*renderLineTiled)(imageObj *img, shapeObj *p, void* tile);
-
+
void (*renderGlyphs)(imageObj *img, double x, double y,
colorObj *color, colorObj *outlinecolor,
double size, char *font, char *thechars, double angle,
colorObj *shadowcolor, double shdx, double shdy,
int outlinewidth);
-
+
void (*renderVectorSymbol)(imageObj *img, double x, double y,
symbolObj *symbol,
- double scale, double angle,
+ double scale, double angle,
colorObj *color,
colorObj *outlinecolor, double outlinewidth);
-
+
void (*renderPixmap)(imageObj *img, double x, double y,
symbolObj *symbol,
double scale, double angle);
-
- void (*renderEllipse)(imageObj *image, double x, double y,
+
+ void (*renderEllipse)(imageObj *image, double x, double y,
double width, double height, double angle,
colorObj *color,
colorObj *outlinecolor, double outlinewidth);
-
+
void (*renderTile)(imageObj *img, void *tile, double x, double y, double angle);
-
+
void (*mergeImages)(imageObj *dest, imageObj *overlay, int opacity, int dstX, int dstY);
/* image i/o */
imageObj* (*createImage)(int width, int height, outputFormatObj *format, colorObj* bg);
@@ -2522,13 +2518,13 @@
/* helper functions */
int (*getTruetypeTextBBox)(imageObj *img,char *font, double size, char *string,
rectObj *rect, double **advances);
-
+
void* (*createTileVector)(symbolObj *symbol, double scale, double angle,
colorObj *color,
colorObj *backgroundcolor,
colorObj *outlinecolor,
double outlinewidth);
-
+
void* (*createTilePixmap)(symbolObj *symbol, double scale, double angle, colorObj *bc);
void* (*createTileEllipse)(double width, double height, double angle,
@@ -2540,7 +2536,7 @@
double ow);
void (*startNewLayer)(imageObj *img, double opacity);
void (*closeNewLayer)(imageObj *img, double opacity);
-
+
void (*transformShape)(shapeObj *shape, rectObj extend, double cellsize);
void (*freeImage)(imageObj *image);
void (*freeTile)(void *tile);
More information about the mapserver-commits
mailing list