[mapserver-commits] r8622 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-02-26 08:50:14 -0500 (Thu, 26 Feb 2009)
New Revision: 8622

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogcsld.c
Log:
Fix build problem with mapogcsld.c when ows services are not available

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-02-26 12:55:04 UTC (rev 8621)
+++ trunk/mapserver/HISTORY.TXT	2009-02-26 13:50:14 UTC (rev 8622)
@@ -12,6 +12,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fix build problem with mapogcsld.c when OWS services are not available (#473)
+
 - Fix build on windows (maputil.c)
 
 Version 5.4.0-beta2 (2009-2-25):

Modified: trunk/mapserver/mapogcsld.c
===================================================================
--- trunk/mapserver/mapogcsld.c	2009-02-26 12:55:04 UTC (rev 8621)
+++ trunk/mapserver/mapogcsld.c	2009-02-26 13:50:14 UTC (rev 8622)
@@ -3311,6 +3311,8 @@
 char *msSLDGetGraphicSLD(styleObj *psStyle, layerObj *psLayer,
                          int bNeedMarkSybol, int nVersion)
 {
+#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR)
+
     char *pszSLD = NULL;
     int nSymbol = -1;
     symbolObj *psSymbol = NULL;
@@ -3651,6 +3653,12 @@
     }
 
     return pszSLD;
+
+#else
+    return NULL;
+
+#endif
+
 }
 
 
@@ -3663,6 +3671,8 @@
 /************************************************************************/
 char *msSLDGenerateLineSLD(styleObj *psStyle, layerObj *psLayer, int nVersion)
 {
+#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR)
+
     char *pszSLD = NULL;
     char szTmp[100];
     char szHexColor[7];
@@ -3785,6 +3795,9 @@
 
     return pszSLD;
 
+#else
+    return NULL;
+#endif
 }
 
 
@@ -3795,6 +3808,8 @@
 /************************************************************************/
 char *msSLDGeneratePolygonSLD(styleObj *psStyle, layerObj *psLayer, int nVersion)
 {
+#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR)
+
     char szTmp[100];
     char *pszSLD = NULL;
     char szHexColor[7];
@@ -3918,6 +3933,10 @@
     pszSLD = msStringConcatenate(pszSLD, szTmp);
 
     return pszSLD;
+
+#else
+    return NULL;
+#endif
 }
 
 /************************************************************************/
@@ -3927,6 +3946,7 @@
 /************************************************************************/
 char *msSLDGeneratePointSLD(styleObj *psStyle, layerObj *psLayer, int nVersion)
 {
+#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR)
     char *pszSLD = NULL;
     char *pszGraphicSLD = NULL;
     char szTmp[100];
@@ -3950,6 +3970,11 @@
     pszSLD = msStringConcatenate(pszSLD, szTmp);
 
     return pszSLD;
+
+#else
+    return NULL;
+
+#endif
 }
 
 
@@ -3962,6 +3987,7 @@
 /************************************************************************/
 char *msSLDGenerateTextSLD(classObj *psClass, layerObj *psLayer, int nVersion)
 {
+#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR)
     char *pszSLD = NULL;
 
     char szTmp[100];
@@ -4190,6 +4216,9 @@
     }
     return pszSLD;
 
+#else
+    return NULL;
+#endif
 }