[mapguide-commits] r5236 - trunk/MgDev/Server/src/Services/Rendering

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2010-10-03 07:06:27 +0000 (Sun, 03 Oct 2010)
New Revision: 5236

Modified:
   trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
Log:
On behalf of: Spark Liu

Fix the problem that rendering map error when it contains a watermark with appearance override.

Reason: When overriding appearance, the original code uses "Get" instead of "Orphan", which makes the override data's destructor be invoked twice after rendering.

Fix: Use "Orphan" instead of "Get". 

Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp	2010-10-02 09:38:13 UTC (rev 5235)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp	2010-10-03 07:06:27 UTC (rev 5236)
@@ -1059,7 +1059,7 @@
                 }
                 if (instance->GetAppearanceOverride())
                 {
-                    wdef->AdoptAppearance(instance->GetAppearanceOverride());
+                    wdef->AdoptAppearance(instance->OrphanAppearanceOverride());
                 }
                 ds.StylizeWatermark(dr, wdef, drawWidth, drawHeight, saveWidth, saveHeight);
             }