Permalink
Browse files

Fix build issues with OGR disabled

  • Loading branch information...
tbonfort committed Nov 16, 2015
1 parent e47e642 commit ab2a6129435ca37d02730a6faf85593afa0daf9b
Showing with 4 additions and 1 deletion.
  1. +1 −1 mapimageio.c
  2. +1 −0 mapogcfilter.c
  3. +2 −0 mapogr.cpp
View
@@ -210,7 +210,7 @@ int saveAsJPEG(mapObj *map, rasterBufferObj *rb, streamInfo *info,
/* If the user doesn't provide a value for JPEGMEM, we want to be sure */
/* that at least the image size will be used before creating the temporary file */
cinfo.mem->max_memory_to_use =
- MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
+ MS_MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
}
}
View
@@ -40,6 +40,7 @@
#include "mapowscommon.h"
#include "maptime.h"
#include "mapows.h"
+#include <ctype.h>
static int FLTHasUniqueTopLevelDuringFilter(FilterEncodingNode *psFilterNode);
View
@@ -1318,6 +1318,7 @@ static int msOGRFileClose(layerObj *layer, msOGRFileInfo *psInfo )
return MS_SUCCESS;
}
+#endif /* USE_OGR */
/************************************************************************/
/* msOGREscapeSQLParam */
@@ -1345,6 +1346,7 @@ static char *msOGREscapeSQLParam(layerObj *layer, const char *pszString)
#endif /* USE_OGR */
}
+#ifdef USE_OGR
/**********************************************************************
* msOGRTranslateMsExpressionToOGRSQL()
*

0 comments on commit ab2a612

Please sign in to comment.