[mapguide-commits] r7458 - in sandbox/jng/extra_stylization_funcs: Common/Stylization Server/src/Core

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-04-17 08:40:19 -0700 (Wed, 17 Apr 2013)
New Revision: 7458

Modified:
   sandbox/jng/extra_stylization_funcs/Common/Stylization/ExpressionFunctionHtmlColor.cpp
   sandbox/jng/extra_stylization_funcs/Common/Stylization/Makefile.am
   sandbox/jng/extra_stylization_funcs/Server/src/Core/Makefile.am
Log:
Linux build fixes for extra stylization functions. Update Makefile.am and fix use of non-standard swprintf() in ExpressionFunctionHtmlColor

Modified: sandbox/jng/extra_stylization_funcs/Common/Stylization/ExpressionFunctionHtmlColor.cpp
===================================================================
--- sandbox/jng/extra_stylization_funcs/Common/Stylization/ExpressionFunctionHtmlColor.cpp	2013-04-11 13:27:37 UTC (rev 7457)
+++ sandbox/jng/extra_stylization_funcs/Common/Stylization/ExpressionFunctionHtmlColor.cpp	2013-04-17 15:40:19 UTC (rev 7458)
@@ -102,11 +102,11 @@
 
     wchar_t tmp[32] = { 0 };
     std::wstring str;
-    swprintf(tmp, L"%0.2x", red);
+    swprintf(tmp, 32, L"%0.2x", red);
     str.append(&tmp[0]);
-    swprintf(tmp, L"%0.2x", green);
+    swprintf(tmp, 32, L"%0.2x", green);
     str.append(&tmp[0]);
-    swprintf(tmp, L"%0.2x", blue);
+    swprintf(tmp, 32, L"%0.2x", blue);
     str.append(&tmp[0]);
 
     m_htmlColorValue->SetString(str.c_str());

Modified: sandbox/jng/extra_stylization_funcs/Common/Stylization/Makefile.am
===================================================================
--- sandbox/jng/extra_stylization_funcs/Common/Stylization/Makefile.am	2013-04-11 13:27:37 UTC (rev 7457)
+++ sandbox/jng/extra_stylization_funcs/Common/Stylization/Makefile.am	2013-04-17 15:40:19 UTC (rev 7458)
@@ -30,10 +30,16 @@
   ExpressionFunctionDecap.cpp \
   ExpressionFunctionFeatureClass.cpp \
   ExpressionFunctionFeatureId.cpp \
+  ExpressionFunctionFeatureSource.cpp \
+  ExpressionFunctionHtmlColor.cpp \
   ExpressionFunctionIf.cpp \
+  ExpressionFunctionLayerDefinition.cpp \
   ExpressionFunctionLayerId.cpp \
   ExpressionFunctionLookup.cpp \
+  ExpressionFunctionMapCenterX.cpp \
+  ExpressionFunctionMapCenterY.cpp \
   ExpressionFunctionMapName.cpp \
+  ExpressionFunctionMapScale.cpp \
   ExpressionFunctionRange.cpp \
   ExpressionFunctionSession.cpp \
   ExpressionFunctionUrlEncode.cpp \
@@ -117,10 +123,16 @@
   ExpressionFunctionDecap.h \
   ExpressionFunctionFeatureClass.h \
   ExpressionFunctionFeatureId.h \
+  ExpressionFunctionFeatureSource.h \
+  ExpressionFunctionHtmlColor.h \
   ExpressionFunctionIf.h \
+  ExpressionFunctionLayerDefinition.h \
   ExpressionFunctionLayerId.h \
   ExpressionFunctionLookup.h \
+  ExpressionFunctionMapCenterX.h \
+  ExpressionFunctionMapCenterY.h \
   ExpressionFunctionMapName.h \
+  ExpressionFunctionMapScale.h \
   ExpressionFunctionRange.h \
   ExpressionFunctionSession.h \
   ExpressionFunctionUrlEncode.h \

Modified: sandbox/jng/extra_stylization_funcs/Server/src/Core/Makefile.am
===================================================================
--- sandbox/jng/extra_stylization_funcs/Server/src/Core/Makefile.am	2013-04-11 13:27:37 UTC (rev 7457)
+++ sandbox/jng/extra_stylization_funcs/Server/src/Core/Makefile.am	2013-04-17 15:40:19 UTC (rev 7458)
@@ -260,6 +260,7 @@
 	@cp -f ../../../UnitTest/TestData/Symbology/UT_Annotation3.ldf ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/Symbology/UT_Annotation3.mdf ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/TileService/UT_BaseMap.mdf ../UnitTestFiles
+	@cp -f ../../../UnitTest/TestData/TileService/UT_StylizationFuncs.mdf ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/TileService/UT_Parcels.fs ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/TileService/UT_Parcels.ldf ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/TileService/UT_Parcels.sdf ../UnitTestFiles
@@ -268,6 +269,7 @@
 	@cp -f ../../../UnitTest/TestData/TileService/UT_RoadCenterLines.sdf ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/TileService/UT_VotingDistricts.fs ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/TileService/UT_VotingDistricts.ldf ../UnitTestFiles
+	@cp -f ../../../UnitTest/TestData/TileService/UT_VotingDistrictsFunctions.ldf ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/TileService/UT_VotingDistricts.sdf ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/ServerAdmin/1.1.1.mgd ../UnitTestFiles
 	@cp -f ../../../UnitTest/TestData/CoordinateSystems/epsgcodes.txt ../UnitTestFiles