[mapguide-commits] r1189 - in trunk/MgDev/Server/src/Services:
Mapping Rendering
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Mar 9 06:21:02 EST 2007
Author: waltweltonlair
Date: 2007-03-09 06:21:02 -0500 (Fri, 09 Mar 2007)
New Revision: 1189
Modified:
trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.h
trunk/MgDev/Server/src/Services/Rendering/OpQueryFeatureProperties.cpp
trunk/MgDev/Server/src/Services/Rendering/OpQueryFeatures.cpp
trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp
trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp
Log:
Fix the Linux build - again and again.
Also eliminated some warnings in ServerRenderingService.
Modified: trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.h
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.h 2007-03-09 11:00:06 UTC (rev 1188)
+++ trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.h 2007-03-09 11:21:02 UTC (rev 1189)
@@ -95,7 +95,7 @@
int width,
int height);
- static MgStylizationUtil::TransformCache* MgStylizationUtil::GetLayerToMapTransform(TransformCacheMap& cache,
+ static MgStylizationUtil::TransformCache* GetLayerToMapTransform(TransformCacheMap& cache,
CREFSTRING featureName,
MgResourceIdentifier* resId,
MgCoordinateSystem* dstCs,
Modified: trunk/MgDev/Server/src/Services/Rendering/OpQueryFeatureProperties.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/OpQueryFeatureProperties.cpp 2007-03-09 11:00:06 UTC (rev 1188)
+++ trunk/MgDev/Server/src/Services/Rendering/OpQueryFeatureProperties.cpp 2007-03-09 11:21:02 UTC (rev 1189)
@@ -55,8 +55,9 @@
INT32 maxFeatures = 0;
m_stream->GetInt32(maxFeatures);
- INT32 bIgnoreScale = 0;
- m_stream->GetInt32(bIgnoreScale);
+ INT32 iIgnoreScale = 0;
+ m_stream->GetInt32(iIgnoreScale);
+ bool bIgnoreScale = (iIgnoreScale != 0);
BeginExecution();
Modified: trunk/MgDev/Server/src/Services/Rendering/OpQueryFeatures.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/OpQueryFeatures.cpp 2007-03-09 11:00:06 UTC (rev 1188)
+++ trunk/MgDev/Server/src/Services/Rendering/OpQueryFeatures.cpp 2007-03-09 11:21:02 UTC (rev 1189)
@@ -55,8 +55,9 @@
INT32 maxFeatures = 0;
m_stream->GetInt32(maxFeatures);
- INT32 bIgnoreScale = 0;
- m_stream->GetInt32(bIgnoreScale);
+ INT32 iIgnoreScale = 0;
+ m_stream->GetInt32(iIgnoreScale);
+ bool bIgnoreScale = (iIgnoreScale != 0);
BeginExecution();
Modified: trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp 2007-03-09 11:00:06 UTC (rev 1188)
+++ trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp 2007-03-09 11:21:02 UTC (rev 1189)
@@ -53,8 +53,9 @@
STRING format;
m_stream->GetString(format);
- INT32 bKeepSelection = 0;
- m_stream->GetInt32(bKeepSelection);
+ INT32 iKeepSelection = 0;
+ m_stream->GetInt32(iKeepSelection);
+ bool bKeepSelection = (iKeepSelection != 0);
BeginExecution();
Modified: trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp 2007-03-09 11:00:06 UTC (rev 1188)
+++ trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp 2007-03-09 11:21:02 UTC (rev 1189)
@@ -53,8 +53,9 @@
STRING format;
m_stream->GetString(format);
- INT32 bKeepSelection = 0;
- m_stream->GetInt32(bKeepSelection);
+ INT32 iKeepSelection = 0;
+ m_stream->GetInt32(iKeepSelection);
+ bool bKeepSelection = (iKeepSelection != 0);
BeginExecution();
@@ -97,8 +98,9 @@
STRING format;
m_stream->GetString(format);
- INT32 bKeepSelection = 0;
- m_stream->GetInt32(bKeepSelection);
+ INT32 iKeepSelection = 0;
+ m_stream->GetInt32(iKeepSelection);
+ bool bKeepSelection = (iKeepSelection != 0);
BeginExecution();
@@ -152,8 +154,9 @@
STRING format;
m_stream->GetString(format);
- INT32 bKeepSelection = 0;
- m_stream->GetInt32(bKeepSelection);
+ INT32 iKeepSelection = 0;
+ m_stream->GetInt32(iKeepSelection);
+ bool bKeepSelection = (iKeepSelection != 0);
BeginExecution();
More information about the mapguide-commits
mailing list