Skip to content

Commit

Permalink
Partial cplusplus'ification of mapogcfiltercommon
Browse files Browse the repository at this point in the history
  • Loading branch information
rouault committed Dec 2, 2019
1 parent ef4c443 commit 3bfbc6c
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 155 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ maptree.c mapdebug.c maplexer.c mapquantization.c mapunion.c
mapdraw.c maplibxml2.c mapquery.c maputil.c strptime.c mapdrawgdal.c
mapraster.c mapuvraster.c mapdummyrenderer.c mapobject.c maprasterquery.c
mapwcs.c maperror.c mapogcfilter.c mapregex.c mapwcs11.c mapfile.c
mapogcfiltercommon.c maprendering.c mapwcs20.c mapogcsld.c mapmetadata.c
mapogcfiltercommon.cpp maprendering.c mapwcs20.c mapogcsld.c mapmetadata.c
mapresample.c mapwfs.c mapgdal.c mapogcsos.c mapscale.c mapwfs11.c mapwfs20.c
mapgeomtransform.c mapogroutput.c mapwfslayer.c mapagg.cpp mapkml.cpp
mapgeomutil.cpp mapkmlrenderer.cpp fontcache.c textlayout.c maputfgrid.cpp
Expand Down
16 changes: 11 additions & 5 deletions mapogcfilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@

#include "mapserver.h"

/*dont need ogr for these functikons*/
MS_DLL_EXPORT int FLTIsNumeric(const char *pszValue);
MS_DLL_EXPORT int FLTApplyExpressionToLayer(layerObj *lp, const char *pszExpression);
MS_DLL_EXPORT char *FLTGetExpressionForValuesRanges(layerObj *lp, const char *item, const char *value, int forcecharcter);

#ifdef USE_OGR

/* There is a dependency to OGR for the MiniXML parser */
Expand All @@ -47,6 +42,9 @@ MS_DLL_EXPORT char *FLTGetExpressionForValuesRanges(layerObj *lp, const char *i
#include<libxml/tree.h>
#endif

#ifdef __cplusplus
extern "C" {
#endif

typedef struct {
char *pszWildCard;
Expand All @@ -58,6 +56,10 @@ typedef struct {
/* -------------------------------------------------------------------- */
/* prototypes. */
/* -------------------------------------------------------------------- */
MS_DLL_EXPORT int FLTIsNumeric(const char *pszValue);
MS_DLL_EXPORT int FLTApplyExpressionToLayer(layerObj *lp, const char *pszExpression);
MS_DLL_EXPORT char *FLTGetExpressionForValuesRanges(layerObj *lp, const char *item, const char *value, int forcecharcter);

MS_DLL_EXPORT FilterEncodingNode *FLTParseFilterEncoding(const char *szXMLString);
MS_DLL_EXPORT FilterEncodingNode *FLTCreateFilterEncodingNode(void);
MS_DLL_EXPORT char** FLTSplitFilters(const char* pszStr, int* pnTokens);
Expand Down Expand Up @@ -145,6 +147,10 @@ int FLTApplyFilterToLayerCommonExpressionWithRect(mapObj *map, int iLayerIndex,
int FLTProcessPropertyIsNull(FilterEncodingNode *psFilterNode,
mapObj *map, int i);

#ifdef __cplusplus
}
#endif

#endif


Expand Down

0 comments on commit 3bfbc6c

Please sign in to comment.