[mapguide-commits] r9567 - in trunk/MgDev/Desktop/MgDesktop: MapLayer Services Services/Drawing Services/Feature Services/Rendering Services/Resource
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Jul 10 06:25:26 PDT 2019
Author: jng
Date: 2019-07-10 06:25:26 -0700 (Wed, 10 Jul 2019)
New Revision: 9567
Modified:
trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp
trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.cpp
trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.cpp
trunk/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSourceCacheItem.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/SpatialContextCacheItem.h
trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.h
trunk/MgDev/Desktop/MgDesktop/Services/MappingService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.cpp
trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp
trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.h
trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourcePackageLoader.h
trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourcePackageManifestHandler.h
trunk/MgDev/Desktop/MgDesktop/Services/Resource/ZipFileHandler.h
trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp
Log:
Fix mg-desktop build in light of GD renderer removal and C++11 switch
Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Layer.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -341,7 +341,7 @@
throw new MgFeatureServiceException(L"MgdLayer::UpdateFeatures", __LINE__, __WFILE__, &arguments, L"", NULL);
}
- auto_ptr<MdfModel::FeatureSource> featureSource;
+ std::unique_ptr<MdfModel::FeatureSource> featureSource;
featureSource.reset(parser.DetachFeatureSource());
// Get the provider name.
@@ -660,7 +660,7 @@
MG_TRY()
Ptr<MgResourceService> resSvc = dynamic_cast<MgResourceService*>(GetMap()->GetService(MgServiceType::ResourceService));
- std::auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resSvc, m_definition));
+ std::unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resSvc, m_definition));
if (ldf.get() != NULL)
{
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
@@ -721,7 +721,7 @@
INT32 ret = -1;
Ptr<MgResourceService> resSvc = dynamic_cast<MgResourceService*>(GetMap()->GetService(MgServiceType::ResourceService));
- std::auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resSvc, m_definition));
+ std::unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resSvc, m_definition));
if (ldf.get() != NULL)
{
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
@@ -783,7 +783,7 @@
INT32 ret = -1;
Ptr<MgResourceService> resSvc = dynamic_cast<MgResourceService*>(GetMap()->GetService(MgServiceType::ResourceService));
- std::auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resSvc, m_definition));
+ std::unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resSvc, m_definition));
if (ldf.get() != NULL)
{
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Map.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -184,7 +184,7 @@
}
// build the runtime map object from the parsed definition
- std::auto_ptr<MdfModel::MapDefinition> mdef(parser.DetachMapDefinition());
+ std::unique_ptr<MdfModel::MapDefinition> mdef(parser.DetachMapDefinition());
assert(mdef.get() != NULL);
MgGeometryFactory gf;
Modified: trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/MapLayer/Selection.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -65,7 +65,7 @@
Ptr<MgResourceIdentifier> layerid = layer->GetLayerDefinition();
Ptr<MgResourceService> resourceService = dynamic_cast<MgResourceService*>(
m_map->GetService(MgServiceType::ResourceService));
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resourceService, layerid));
+ std::unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resourceService, layerid));
Ptr<MgStringCollection> propertyNames = new MgStringCollection();
if(ldf.get() != NULL)
{
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Drawing/DrawingServiceUtil.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -283,7 +283,7 @@
bool& bOpenTempFile, REFSTRING tempFileName)
{
Ptr<MgByteReader> byteReader;
- auto_ptr<DWFPackageReader> reader;
+ std::unique_ptr<DWFPackageReader> reader;
MG_SERVER_DRAWING_SERVICE_TRY()
Modified: trunk/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -114,7 +114,7 @@
}
else
{
- auto_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ std::unique_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Obtain the manifest from the DWF.
DWFInputStream* pStream = reader->extract(MANIFEST_XML.c_str(), false);
@@ -235,7 +235,7 @@
}
else
{
- auto_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ std::unique_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest (and get the mime type from the manifest)
DWFManifest& manifest = reader->getManifest();
@@ -363,7 +363,7 @@
}
else
{
- auto_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ std::unique_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Parse the section name from the resourceName
STRING::size_type index = resourceName.rfind(RESOURCENAME_SEPARATOR);
@@ -518,7 +518,7 @@
}
else
{
- auto_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ std::unique_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest
DWFManifest& manifest = reader->getManifest();
@@ -708,7 +708,7 @@
}
else
{
- auto_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ std::unique_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest
DWFManifest& manifest = reader->getManifest();
@@ -1013,7 +1013,7 @@
}
else
{
- auto_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ std::unique_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Get the ePlot sections in the DWF
DWFManifest& manifest = reader->getManifest();
@@ -1168,7 +1168,7 @@
}
else
{
- auto_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ std::unique_ptr<DWFPackageReader> reader(MgdDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest
DWFManifest& manifest = reader->getManifest();
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureServiceCache.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -392,7 +392,7 @@
// Detach the feature source from the parser.
// It's now the caller's responsibility to delete it.
- auto_ptr<MdfModel::FeatureSource> featureSource;
+ std::unique_ptr<MdfModel::FeatureSource> featureSource;
featureSource.reset(parser.DetachFeatureSource());
if (NULL == featureSource.get())
@@ -440,7 +440,7 @@
featureSource->GetSupplementalSpatialContextInfo();
CHECKNULL(spatialContexts, L"MgCacheManager.GetSpatialContextCacheItem");
- auto_ptr<MgSpatialContextInfo> spatialContextInfo;
+ std::unique_ptr<MgSpatialContextInfo> spatialContextInfo;
spatialContextInfo.reset(new MgSpatialContextInfo());
for (int i = 0; i < spatialContexts->GetCount(); ++i)
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSourceCacheItem.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSourceCacheItem.h 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/FeatureSourceCacheItem.h 2019-07-10 13:25:26 UTC (rev 9567)
@@ -31,7 +31,7 @@
private:
- auto_ptr<MdfModel::FeatureSource> m_featureSource;
+ std::unique_ptr<MdfModel::FeatureSource> m_featureSource;
};
/// Inline Methods
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/SpatialContextCacheItem.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/SpatialContextCacheItem.h 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/SpatialContextCacheItem.h 2019-07-10 13:25:26 UTC (rev 9567)
@@ -34,7 +34,7 @@
private:
- auto_ptr<MgSpatialContextInfo> m_spatialContextInfo;
+ std::unique_ptr<MgSpatialContextInfo> m_spatialContextInfo;
};
/// Inline Methods
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.h 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Feature/TransformCache.h 2019-07-10 13:25:26 UTC (rev 9567)
@@ -34,7 +34,7 @@
private:
static ACE_Recursive_Thread_Mutex sm_mutex;
- auto_ptr<MgdCSTrans> m_xform;
+ std::unique_ptr<MgdCSTrans> m_xform;
Ptr<MgCoordinateSystem> m_coordSys;
Ptr<MgCoordinateSystemTransform> m_transform;
Ptr<MgEnvelope> m_envelope;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/MappingService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/MappingService.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/MappingService.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -186,7 +186,7 @@
m_svcResource = static_cast<MgResourceService*>(fact->CreateService(MgServiceType::ResourceService));
}
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resource));
+ std::unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resource));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
MdfModel::DrawingLayerDefinition* dl = dynamic_cast<MdfModel::DrawingLayerDefinition*>(ldf.get());
MdfModel::GridLayerDefinition* gl = dynamic_cast<MdfModel::GridLayerDefinition*>(ldf.get());
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -26,7 +26,7 @@
if (NULL == map)
throw new MgNullArgumentException(L"MgdProfilingService::ProfileRenderDynamicOverlay", __LINE__, __WFILE__, NULL, L"", NULL);
- auto_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
+ std::unique_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
pPRMResult.reset(new ProfileRenderMapResult());
// Start to profile the ProfileRenderDynamicOverlay process
@@ -39,7 +39,7 @@
// Serialize the ProfileRenderMapResult to xml
MdfParser::SAX2Parser parser;
- auto_ptr<Version> version;
+ std::unique_ptr<Version> version;
version.reset(new Version(2,4,0));
string content = parser.SerializeToXML(pPRMResult.get(),version.get());
ret = new MgByteReader(MgUtil::MultiByteToWideChar(content), MgMimeType::Xml);
@@ -68,7 +68,7 @@
if (NULL == map)
throw new MgNullArgumentException(L"MgdProfilingService::ProfileRenderMap", __LINE__, __WFILE__, NULL, L"", NULL);
- auto_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
+ std::unique_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
pPRMResult.reset(new ProfileRenderMapResult());
// Start to profile the ProfileRenderMap process
@@ -81,7 +81,7 @@
// Serialize the ProfileRenderMapResult to xml
MdfParser::SAX2Parser parser;
- auto_ptr<Version> version;
+ std::unique_ptr<Version> version;
version.reset(new Version(2,4,0));
string content = parser.SerializeToXML(pPRMResult.get(),version.get());
ret = new MgByteReader(MgUtil::MultiByteToWideChar(content), MgMimeType::Xml);
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Rendering/LegendPlotUtil.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -269,7 +269,7 @@
continue;
// get layer definition
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(content));
+ std::unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(content));
// Get bitmaps for rules/themes
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
@@ -1460,7 +1460,7 @@
//Reserve space for rules in the legend
// Get layer definition
Ptr<MgResourceIdentifier> layerid = mapLayer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
+ std::unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
MdfModel::DrawingLayerDefinition* dl = dynamic_cast<MdfModel::DrawingLayerDefinition*>(ldf.get());
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -366,7 +366,7 @@
// Get the layers' resource content in a single request by adding them to a collection
for (int i = layers->GetCount()-1; i >= 0; i--)
{
- auto_ptr<MdfModel::LayerDefinition> ldf;
+ std::unique_ptr<MdfModel::LayerDefinition> ldf;
RSMgdFeatureReader* rsReader = NULL;
Ptr<MgLayerBase> mapLayer = layers->GetItem(i);
@@ -1207,7 +1207,7 @@
// TODO: use user-specified format
RS_String format = L"PNG";
- auto_ptr<RS_ByteData> data;
+ std::unique_ptr<RS_ByteData> data;
data.reset(er.Save(format, imgWidth, imgHeight));
if (NULL != data.get())
Modified: trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -1,7 +1,6 @@
#include "RenderingService.h"
#include "System/ConfigProperties.h"
#include "AGGRenderer.h"
-#include "GDRenderer.h"
#include "ImageFormats.h"
#include "SymbolInstance.h"
#include "Rendering/RSMgFeatureReader.h"
@@ -54,10 +53,6 @@
assert(m_svcDrawing != NULL);
MgConfiguration* pConf = MgConfiguration::GetInstance();
- pConf->GetStringValue(MgdConfigProperties::GeneralPropertiesSection,
- MgdConfigProperties::GeneralPropertyRenderer,
- m_rendererName,
- MgdConfigProperties::DefaultGeneralPropertyRenderer);
pConf->GetIntValue(MgdConfigProperties::RenderingServicePropertiesSection,
MgdConfigProperties::RenderingServicePropertyRasterGridSize,
@@ -104,7 +99,6 @@
bGeneralizeData,
MgdConfigProperties::DefaultRenderingServicePropertyGeneralizeData);
AGGRenderer::s_bGeneralizeData = bGeneralizeData;
- GDRenderer::s_bGeneralizeData = bGeneralizeData;
}
@@ -219,16 +213,16 @@
///////////////////////////////////////////////////////////////////////////////
/// render a map using all layers from the baseGroup
MgByteReader* MgdRenderingService::RenderTile(MgdMap* map,
- MgLayerGroup* baseGroup,
- INT32 scaleIndex,
- INT32 width,
- INT32 height,
- double scale,
- double mcsMinX,
- double mcsMaxX,
- double mcsMinY,
- double mcsMaxY,
- CREFSTRING format)
+ MgLayerGroup* baseGroup,
+ INT32 scaleIndex,
+ INT32 width,
+ INT32 height,
+ double scale,
+ double mcsMinX,
+ double mcsMaxX,
+ double mcsMinY,
+ double mcsMaxY,
+ CREFSTRING format)
{
Ptr<MgByteReader> ret;
@@ -257,7 +251,7 @@
// initialize the renderer (set clipping to false so that we label
// the unclipped geometry)
- auto_ptr<SE_Renderer> dr(CreateRenderer(width, height, bgColor, false, true, tileExtentOffset));
+ std::unique_ptr<AGGRenderer> dr(CreateRenderer(width, height, bgColor, false, true, tileExtentOffset));
// create a temporary collection containing all the layers for the base group
Ptr<MgLayerCollection> layers = map->GetLayers();
@@ -437,9 +431,9 @@
// Non-published RenderDynamicOverlay API with profile result parameter
// pPRMResult - a pointer points to Profile Render Map Result.
MgByteReader* MgdRenderingService::RenderDynamicOverlay(MgdMap* map,
- MgdSelection* selection,
- MgdRenderingOptions* options,
- ProfileRenderMapResult* pPRMResult)
+ MgdSelection* selection,
+ MgdRenderingOptions* options,
+ ProfileRenderMapResult* pPRMResult)
{
Ptr<MgByteReader> ret;
@@ -528,14 +522,13 @@
return ret.Detach();
}
-MgdFeatureInformation* MgdRenderingService::QueryFeatures(
- MgdMap* map,
- MgStringCollection* layerNames,
- MgGeometry* filterGeometry,
- INT32 selectionVariant,
- CREFSTRING featureFilter,
- INT32 maxFeatures,
- INT32 layerAttributeFilter)
+MgdFeatureInformation* MgdRenderingService::QueryFeatures(MgdMap* map,
+ MgStringCollection* layerNames,
+ MgGeometry* filterGeometry,
+ INT32 selectionVariant,
+ CREFSTRING featureFilter,
+ INT32 maxFeatures,
+ INT32 layerAttributeFilter)
{
Ptr<MgdFeatureInformation> ret;
MG_LOG_OPERATION_MESSAGE(L"QueryFeatures");
@@ -602,7 +595,7 @@
double point_buf[2];
double* point = NULL;
- auto_ptr<SE_Renderer> impRenderer;
+ std::unique_ptr<SE_Renderer> impRenderer;
if (geometry && maxFeatures == 1)
{
MgPolygon* polygon = dynamic_cast<MgPolygon*>(geometry);
@@ -668,9 +661,9 @@
}
MgByteReader* MgdRenderingService::RenderDynamicOverlayInternal(MgdMap* map,
- MgdSelection* selection,
- MgdRenderingOptions* options,
- ProfileRenderMapResult* pPRMResult)
+ MgdSelection* selection,
+ MgdRenderingOptions* options,
+ ProfileRenderMapResult* pPRMResult)
{
Ptr<MgByteReader> ret;
@@ -723,7 +716,7 @@
bgColor.alpha() = 0;
// initialize the renderer
- auto_ptr<SE_Renderer> dr(CreateRenderer(width, height, bgColor, true));
+ std::unique_ptr<AGGRenderer> dr(CreateRenderer(width, height, bgColor, true));
bool bIncludeDynamicLayers = ((options->GetBehavior() & MgdRenderingOptions::RenderLayers) == MgdRenderingOptions::RenderLayers);
bool bIncludeBaseLayers = ((options->GetBehavior() & MgdRenderingOptions::RenderBaseLayers) == MgdRenderingOptions::RenderBaseLayers);
@@ -778,8 +771,8 @@
///////////////////////////////////////////////////////////////////////////////
// default arg bKeepSelection = true
MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
- MgdSelection* selection,
- CREFSTRING format)
+ MgdSelection* selection,
+ CREFSTRING format)
{
Ptr<MgByteReader> ret;
MG_LOG_OPERATION_MESSAGE(L"RenderMap");
@@ -824,9 +817,9 @@
///////////////////////////////////////////////////////////////////////////////
// default arg bClip = false
MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
- MgdSelection* selection,
- CREFSTRING format,
- bool bKeepSelection)
+ MgdSelection* selection,
+ CREFSTRING format,
+ bool bKeepSelection)
{
Ptr<MgByteReader> ret;
MG_LOG_OPERATION_MESSAGE(L"RenderMap");
@@ -875,10 +868,10 @@
// color and display sizes as default arguments to call the real rendermap method
// default arg (bKeepSelection = true, bClip = false)
MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
- MgdSelection* selection,
- CREFSTRING format,
- bool bKeepSelection,
- bool bClip)
+ MgdSelection* selection,
+ CREFSTRING format,
+ bool bKeepSelection,
+ bool bClip)
{
Ptr<MgByteReader> ret;
MG_LOG_OPERATION_MESSAGE(L"RenderMap");
@@ -957,12 +950,12 @@
///////////////////////////////////////////////////////////////////////////////
// default arg bKeepSelection = true
MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
- MgdSelection* selection,
- MgEnvelope* extents,
- INT32 width,
- INT32 height,
- MgColor* backgroundColor,
- CREFSTRING format)
+ MgdSelection* selection,
+ MgEnvelope* extents,
+ INT32 width,
+ INT32 height,
+ MgColor* backgroundColor,
+ CREFSTRING format)
{
// Call updated RenderMap API
return RenderMap(map, selection, extents, width, height, backgroundColor, format, true);
@@ -973,13 +966,13 @@
// render the provided extent of the map and align aspect ratios to the provided window
// default arg bKeepSelection = true
MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
- MgdSelection* selection,
- MgEnvelope* extents,
- INT32 width,
- INT32 height,
- MgColor* backgroundColor,
- CREFSTRING format,
- bool bKeepSelection)
+ MgdSelection* selection,
+ MgEnvelope* extents,
+ INT32 width,
+ INT32 height,
+ MgColor* backgroundColor,
+ CREFSTRING format,
+ bool bKeepSelection)
{
Ptr<MgByteReader> ret;
@@ -1065,7 +1058,7 @@
// initialize the renderer with the rendering canvas size - in this
// case it is not necessarily the same size as the requested image
// size due to support for non-square pixels
- auto_ptr<SE_Renderer> dr(CreateRenderer(drawWidth, drawHeight, bgcolor, false));
+ std::unique_ptr<AGGRenderer> dr(CreateRenderer(drawWidth, drawHeight, bgcolor, false));
// call the internal helper API to do all the stylization overhead work
ret = RenderMapInternal(map, selection, NULL, dr.get(), drawWidth, drawHeight, width, height, format, scale, b, false, bKeepSelection, true);
@@ -1079,13 +1072,13 @@
///////////////////////////////////////////////////////////////////////////////
// default argument bKeepSelection = true
MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
- MgdSelection* selection,
- MgCoordinate* center,
- double scale,
- INT32 width,
- INT32 height,
- MgColor* backgroundColor,
- CREFSTRING format)
+ MgdSelection* selection,
+ MgCoordinate* center,
+ double scale,
+ INT32 width,
+ INT32 height,
+ MgColor* backgroundColor,
+ CREFSTRING format)
{
// Call updated RenderMap API
return RenderMap(map, selection, center, scale, width, height, backgroundColor, format, true);
@@ -1095,14 +1088,14 @@
///////////////////////////////////////////////////////////////////////////////
// default arguments bClip = false pProfileRenderMapResult = NULL
MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
- MgdSelection* selection,
- MgCoordinate* center,
- double scale,
- INT32 width,
- INT32 height,
- MgColor* backgroundColor,
- CREFSTRING format,
- bool bKeepSelection)
+ MgdSelection* selection,
+ MgCoordinate* center,
+ double scale,
+ INT32 width,
+ INT32 height,
+ MgColor* backgroundColor,
+ CREFSTRING format,
+ bool bKeepSelection)
{
return RenderMap(map, selection, center, scale, width, height, backgroundColor, format, bKeepSelection, false);
}
@@ -1110,15 +1103,15 @@
///////////////////////////////////////////////////////////////////////////////
// default arguments bClip = false
MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
- MgdSelection* selection,
- MgCoordinate* center,
- double scale,
- INT32 width,
- INT32 height,
- MgColor* backgroundColor,
- CREFSTRING format,
- bool bKeepSelection,
- ProfileRenderMapResult* pPRMResult)
+ MgdSelection* selection,
+ MgCoordinate* center,
+ double scale,
+ INT32 width,
+ INT32 height,
+ MgColor* backgroundColor,
+ CREFSTRING format,
+ bool bKeepSelection,
+ ProfileRenderMapResult* pPRMResult)
{
return RenderMap(map, selection, center, scale, width, height, backgroundColor, format, bKeepSelection, false, pPRMResult);
}
@@ -1128,16 +1121,16 @@
// default args bKeepSelection = true, bClip = false, backgroundColor = map->backgroundColor,
// width = map->getDisplayWidth, height = map->getDisplayHeight
MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
- MgdSelection* selection,
- MgCoordinate* center,
- double scale,
- INT32 width,
- INT32 height,
- MgColor* backgroundColor,
- CREFSTRING format,
- bool bKeepSelection,
- bool bClip,
- ProfileRenderMapResult* pPRMResult)
+ MgdSelection* selection,
+ MgCoordinate* center,
+ double scale,
+ INT32 width,
+ INT32 height,
+ MgColor* backgroundColor,
+ CREFSTRING format,
+ bool bKeepSelection,
+ bool bClip,
+ ProfileRenderMapResult* pPRMResult)
{
Ptr<MgByteReader> ret;
@@ -1186,7 +1179,7 @@
backgroundColor->GetAlpha());
// initialize the appropriate map renderer
- auto_ptr<SE_Renderer> dr(CreateRenderer(width, height, bgcolor, bClip));
+ std::unique_ptr<AGGRenderer> dr(CreateRenderer(width, height, bgcolor, bClip));
if(NULL != pPRMResult)
{
@@ -1226,20 +1219,20 @@
// pack options into object and forward call (select Selection AND Layers)
// maybe keepSelection called by RenderTile
MgByteReader* MgdRenderingService::RenderMapInternal(MgdMap* map,
- MgdSelection* selection,
- MgReadOnlyLayerCollection* roLayers,
- SE_Renderer* dr,
- INT32 drawWidth,
- INT32 drawHeight,
- INT32 saveWidth,
- INT32 saveHeight,
- CREFSTRING format,
- double scale,
- RS_Bounds& b,
- bool expandExtents,
- bool bKeepSelection,
- bool renderWatermark,
- ProfileRenderMapResult* pPRMResult)
+ MgdSelection* selection,
+ MgReadOnlyLayerCollection* roLayers,
+ AGGRenderer* dr,
+ INT32 drawWidth,
+ INT32 drawHeight,
+ INT32 saveWidth,
+ INT32 saveHeight,
+ CREFSTRING format,
+ double scale,
+ RS_Bounds& b,
+ bool expandExtents,
+ bool bKeepSelection,
+ bool renderWatermark,
+ ProfileRenderMapResult* pPRMResult)
{
MgdRenderingOptions options(format, MgdRenderingOptions::RenderSelection |
MgdRenderingOptions::RenderLayers | (bKeepSelection? MgdRenderingOptions::KeepSelection : 0), NULL);
@@ -1255,19 +1248,19 @@
// render map using provided options object from before
// this is called for tiles and for dynamic overlays
MgByteReader* MgdRenderingService::RenderMapInternal(MgdMap* map,
- MgdSelection* selection,
- MgReadOnlyLayerCollection* roLayers,
- SE_Renderer* dr,
- INT32 drawWidth,
- INT32 drawHeight,
- INT32 saveWidth,
- INT32 saveHeight,
- double scale,
- RS_Bounds& b,
- bool expandExtents,
- MgdRenderingOptions* options,
- bool renderWatermark,
- ProfileRenderMapResult* pPRMResult)
+ MgdSelection* selection,
+ MgReadOnlyLayerCollection* roLayers,
+ AGGRenderer* dr,
+ INT32 drawWidth,
+ INT32 drawHeight,
+ INT32 saveWidth,
+ INT32 saveHeight,
+ double scale,
+ RS_Bounds& b,
+ bool expandExtents,
+ MgdRenderingOptions* options,
+ bool renderWatermark,
+ ProfileRenderMapResult* pPRMResult)
{
// set the map scale to the requested scale
map->SetViewScale(scale);
@@ -1383,10 +1376,10 @@
///////////////////////////////////////////////////////////////////////////////
MgByteReader* MgdRenderingService::RenderMapLegend(MgdMap* map,
- INT32 width,
- INT32 height,
- MgColor* backgroundColor,
- CREFSTRING format)
+ INT32 width,
+ INT32 height,
+ MgColor* backgroundColor,
+ CREFSTRING format)
{
Ptr<MgByteReader> ret;
MG_LOG_OPERATION_MESSAGE(L"RenderMapLegend");
@@ -1429,7 +1422,7 @@
backgroundColor->GetAlpha());
//initialize a renderer
- auto_ptr<Renderer> dr(CreateRenderer(width, height, bgcolor, false, false, 0.0));
+ std::unique_ptr<AGGRenderer> dr(CreateRenderer(width, height, bgcolor, false, false, 0.0));
RS_Bounds b(0,0,width,height);
@@ -1457,13 +1450,8 @@
dr->EndMap();
// get a byte representation of the image
- auto_ptr<RS_ByteData> data;
+ std::unique_ptr<RS_ByteData> data(dr->Save(format, width, height));
- if (wcscmp(m_rendererName.c_str(), L"AGG") == 0)
- data.reset(((AGGRenderer*)dr.get())->Save(format, width, height));
- else
- data.reset(((GDRenderer*)dr.get())->Save(format, width, height));
-
if (NULL != data.get())
{
// put this into a byte source
@@ -1502,27 +1490,20 @@
}
///////////////////////////////////////////////////////////////////////////////
-SE_Renderer* MgdRenderingService::CreateRenderer(int width,
- int height,
- RS_Color& bgColor,
- bool requiresClipping,
- bool localOverposting,
- double tileExtentOffset)
+AGGRenderer* MgdRenderingService::CreateRenderer(int width,
+ int height,
+ RS_Color& bgColor,
+ bool requiresClipping,
+ bool localOverposting,
+ double tileExtentOffset)
{
- SE_Renderer* renderer = NULL;
- if (wcscmp(m_rendererName.c_str(), L"AGG") == 0)
- renderer = new AGGRenderer(width, height, bgColor, requiresClipping, localOverposting, tileExtentOffset);
- else
- renderer = new GDRenderer(width, height, bgColor, requiresClipping, localOverposting, tileExtentOffset);
+ auto renderer = new AGGRenderer(width, height, bgColor, requiresClipping, localOverposting, tileExtentOffset);
- if (renderer != NULL)
- {
- renderer->SetRasterGridSize(m_rasterGridSize);
- renderer->SetMinRasterGridSize(m_minRasterGridSize);
- renderer->SetRasterGridSizeOverrideRatio(m_rasterGridSizeOverrideRatio);
- renderer->SetMaxRasterImageWidth(m_maxRasterImageWidth);
- renderer->SetMaxRasterImageHeight(m_maxRasterImageHeight);
- }
+ renderer->SetRasterGridSize(m_rasterGridSize);
+ renderer->SetMinRasterGridSize(m_minRasterGridSize);
+ renderer->SetRasterGridSizeOverrideRatio(m_rasterGridSizeOverrideRatio);
+ renderer->SetMaxRasterImageWidth(m_maxRasterImageWidth);
+ renderer->SetMaxRasterImageHeight(m_maxRasterImageHeight);
return renderer;
}
@@ -1529,14 +1510,14 @@
///////////////////////////////////////////////////////////////////////////////
inline void MgdRenderingService::RenderLayers(MgdMap* map,
- MgReadOnlyLayerCollection* layers,
- Stylizer* ds,
- Renderer* dr,
- MgCoordinateSystem* dstCs,
- bool expandExtents,
- double scale,
- CREFSTRING format,
- ProfileRenderMapResult* pPRMResult)
+ MgReadOnlyLayerCollection* layers,
+ Stylizer* ds,
+ Renderer* dr,
+ MgCoordinateSystem* dstCs,
+ bool expandExtents,
+ double scale,
+ CREFSTRING format,
+ ProfileRenderMapResult* pPRMResult)
{
ProfileRenderLayersResult* pPRLsResult = NULL; // pointer points to Profile Render Layers Result
@@ -1565,15 +1546,15 @@
///////////////////////////////////////////////////////////////////////////////
inline void MgdRenderingService::RenderSelection(MgdMap* map,
- MgdSelection* selection,
- MgReadOnlyLayerCollection* layers,
- MgdRenderingOptions* options,
- Stylizer* ds,
- Renderer* dr,
- MgCoordinateSystem* dstCs,
- double scale,
- INT32 behavior,
- ProfileRenderMapResult* pPRMResult)
+ MgdSelection* selection,
+ MgReadOnlyLayerCollection* layers,
+ MgdRenderingOptions* options,
+ Stylizer* ds,
+ Renderer* dr,
+ MgCoordinateSystem* dstCs,
+ double scale,
+ INT32 behavior,
+ ProfileRenderMapResult* pPRMResult)
{
SE_Renderer* renderer = dynamic_cast<SE_Renderer*>(dr);
@@ -1667,13 +1648,13 @@
// 3. Map's watermark usage is not 0, which means watermark usage is WMS and / or Viewer.
WatermarkInstanceCollection watermarkInstances; //Watermark list to render
WatermarkInstanceCollection tempWatermarkInstances; //Used to reverse list
- auto_ptr<WatermarkInstance> tempInstance;
+ std::unique_ptr<WatermarkInstance> tempInstance;
// Get watermark instance in map
Ptr<MgResourceIdentifier> mapId = map->GetMapDefinition();
if (mapId.p)
{
- auto_ptr<MapDefinition> mdef(MgMapBase::GetMapDefinition(m_svcResource, mapId));
+ std::unique_ptr<MapDefinition> mdef(MgMapBase::GetMapDefinition(m_svcResource, mapId));
WatermarkInstanceCollection* mapWatermarks = mdef->GetWatermarks();
for (int i=mapWatermarks->GetCount()-1; i>=0; i--)
tempWatermarkInstances.Adopt(mapWatermarks->OrphanAt(i));
@@ -1706,7 +1687,7 @@
// Get watermark instance in layer
const int layerCount = layers->GetCount();
- auto_ptr<LayerDefinition> ldf;
+ std::unique_ptr<LayerDefinition> ldf;
for (int i=0; i<layerCount; ++i)
{
Ptr<MgLayerBase> mapLayer(layers->GetItem(i));
@@ -1904,11 +1885,11 @@
////////////////////////////////////////////////////////////////////////////////
inline MgByteReader* MgdRenderingService::CreateImage(MgdMap* map,
- Renderer* dr,
- INT32 saveWidth,
- INT32 saveHeight,
- CREFSTRING format,
- ProfileRenderMapResult* pPRMResult)
+ AGGRenderer* dr,
+ INT32 saveWidth,
+ INT32 saveHeight,
+ CREFSTRING format,
+ ProfileRenderMapResult* pPRMResult)
{
if(NULL != pPRMResult)
{
@@ -1939,35 +1920,30 @@
*/
// get a byte representation of the image
- auto_ptr<RS_ByteData> data;
+ std::unique_ptr<RS_ByteData> data;
Ptr<MgByteSource> bs;
try
{
// call the image renderer to create the image
- if (wcscmp(m_rendererName.c_str(), L"AGG") == 0)
+ //-------------------------------------------------------
+ /// RFC60 code to correct colormaps by UV
+ //-------------------------------------------------------
+ // We examine the expressions collected from xml definitions of all layers.
+ // The map object has a list from all color entries found in the most recent
+ // layer stylization.
+ // * TODO - currently they are interpreted as ffffffff 32-bit RGBA string values
+ // * adding expresssions and other interpretations should be done in ParseColorStrings
+ // * the color Palette for the renderer is a vector<RS_Color>
+ if (hasColorMap(format))
{
- //-------------------------------------------------------
- /// RFC60 code to correct colormaps by UV
- //-------------------------------------------------------
- // We examine the expressions collected from xml definitions of all layers.
- // The map object has a list from all color entries found in the most recent
- // layer stylization.
- // * TODO - currently they are interpreted as ffffffff 32-bit RGBA string values
- // * adding expresssions and other interpretations should be done in ParseColorStrings
- // * the color Palette for the renderer is a vector<RS_Color>
- if (hasColorMap(format))
- {
- RS_ColorVector tileColorPalette;
- MgdMappingUtil::ParseColorStrings(&tileColorPalette, map);
-// printf("<<<<<<<<<<<<<<<<<<<<< MgdRenderingService::ColorPalette->size(): %d\n", tileColorPalette.size());
- data.reset(((AGGRenderer*)dr)->Save(format, saveWidth, saveHeight, &tileColorPalette));
- }
- else
- data.reset(((AGGRenderer*)dr)->Save(format, saveWidth, saveHeight, NULL));
+ RS_ColorVector tileColorPalette;
+ MgdMappingUtil::ParseColorStrings(&tileColorPalette, map);
+ // printf("<<<<<<<<<<<<<<<<<<<<< MgdRenderingService::ColorPalette->size(): %d\n", tileColorPalette.size());
+ data.reset(((AGGRenderer*)dr)->Save(format, saveWidth, saveHeight, &tileColorPalette));
}
else
- data.reset(((GDRenderer*)dr)->Save(format, saveWidth, saveHeight));
+ data.reset(((AGGRenderer*)dr)->Save(format, saveWidth, saveHeight, NULL));
}
catch (exception e)
{
@@ -1999,7 +1975,7 @@
pPRMResult->SetCreateImageTime(createImageTime);
pPRMResult->SetImageFormat(format);
- pPRMResult->SetRendererType(m_rendererName);
+ pPRMResult->SetRendererType(L"AGG");
}
return bs->GetReader();
@@ -2141,7 +2117,7 @@
//get the MDF layer definition
Ptr<MgResourceIdentifier> layerResId = layer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerResId));
+ std::unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerResId));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
//we can only do geometric query selection for vector layers
@@ -2198,7 +2174,7 @@
}
// Initialize the reader
- auto_ptr<RSMgdFeatureReader> rsrdr;
+ std::unique_ptr<RSMgdFeatureReader> rsrdr;
try
{
Modified: trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.h 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/RenderingService.h 2019-07-10 13:25:26 UTC (rev 9567)
@@ -3,7 +3,6 @@
class MgdMap;
class MgdFeatureInformation;
-class SE_Renderer;
class MgdRenderingOptions;
class MgdFeatureInfoRenderer;
class MgdDrawingService;
@@ -11,6 +10,7 @@
class RS_Color;
class Stylizer;
class Renderer;
+class AGGRenderer;
namespace MdfModel
{
@@ -431,7 +431,7 @@
MgByteReader* RenderMapInternal(MgdMap* map,
MgdSelection* selection,
MgReadOnlyLayerCollection* roLayers,
- SE_Renderer* dr,
+ AGGRenderer* dr,
INT32 drawWidth,
INT32 drawHeight,
INT32 saveWidth,
@@ -447,7 +447,7 @@
MgByteReader* RenderMapInternal(MgdMap* map,
MgdSelection* selection,
MgReadOnlyLayerCollection* roLayers,
- SE_Renderer* dr,
+ AGGRenderer* dr,
INT32 drawWidth,
INT32 drawHeight,
INT32 saveWidth,
@@ -468,7 +468,7 @@
INT32 layerAttributeFilter,
MgdFeatureInfoRenderer* selRenderer);
- SE_Renderer* CreateRenderer(int width,
+ AGGRenderer* CreateRenderer(int width,
int height,
RS_Color& bgColor,
bool requiresClipping,
@@ -507,7 +507,7 @@
MdfModel::ProfileRenderMapResult* pPRMResult);
MgByteReader* CreateImage(MgdMap* map,
- Renderer* dr,
+ AGGRenderer* dr,
INT32 saveWidth,
INT32 saveHeight,
CREFSTRING format,
@@ -519,9 +519,6 @@
Ptr<MgdDrawingService> m_svcDrawing;
Ptr<MgCoordinateSystemFactory> m_pCSFactory;
- // this will eventually be removed
- STRING m_rendererName;
-
INT32 m_rasterGridSize;
INT32 m_minRasterGridSize;
double m_rasterGridSizeOverrideRatio;
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourcePackageLoader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourcePackageLoader.h 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourcePackageLoader.h 2019-07-10 13:25:26 UTC (rev 9567)
@@ -55,7 +55,7 @@
private:
- auto_ptr<MgdZipFileReader> m_zipFileReader;
+ std::unique_ptr<MgdZipFileReader> m_zipFileReader;
MgdResourcePackageManifestParser m_manifestParser;
};
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourcePackageManifestHandler.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourcePackageManifestHandler.h 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Resource/ResourcePackageManifestHandler.h 2019-07-10 13:25:26 UTC (rev 9567)
@@ -35,7 +35,7 @@
protected:
- auto_ptr<MgXmlUtil> m_xmlUtil;
+ std::unique_ptr<MgXmlUtil> m_xmlUtil;
STRING m_description;
};
Modified: trunk/MgDev/Desktop/MgDesktop/Services/Resource/ZipFileHandler.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Resource/ZipFileHandler.h 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Resource/ZipFileHandler.h 2019-07-10 13:25:26 UTC (rev 9567)
@@ -27,7 +27,7 @@
protected:
- auto_ptr<DWFZipFileDescriptor> m_zipFileDescriptor;
+ std::unique_ptr<DWFZipFileDescriptor> m_zipFileDescriptor;
};
/// Inline Methods
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp 2019-07-04 12:37:39 UTC (rev 9566)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ResourceService.cpp 2019-07-10 13:25:26 UTC (rev 9567)
@@ -272,7 +272,7 @@
void MgdResourceService::LoadResourcePackage(CREFSTRING packagePathname)
{
ACE_ASSERT(!packagePathname.empty());
- auto_ptr<MgdResourcePackageLoader> packageLoader;
+ std::unique_ptr<MgdResourcePackageLoader> packageLoader;
MG_RESOURCE_SERVICE_TRY()
More information about the mapguide-commits
mailing list