[mapguide-commits] r9517 - in sandbox/jng/v4: Common/Geometry Common/MapGuideCommon/Controller Common/MapGuideCommon/MapLayer Common/MdfParser Common/PlatformBase/Services/PrintLayoutService Common/Renderers Common/Stylization Server/src/Core Server/src/Services/Rendering
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed May 29 05:02:22 PDT 2019
Author: jng
Date: 2019-05-29 05:02:22 -0700 (Wed, 29 May 2019)
New Revision: 9517
Modified:
sandbox/jng/v4/Common/Geometry/GeometrySimplifier.cpp
sandbox/jng/v4/Common/Geometry/GeosUtil.cpp
sandbox/jng/v4/Common/Geometry/PreparedGeometry.cpp
sandbox/jng/v4/Common/Geometry/PreparedGeometry.h
sandbox/jng/v4/Common/MapGuideCommon/Controller/HtmlController.cpp
sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Layer.cpp
sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Map.cpp
sandbox/jng/v4/Common/MdfParser/IOElevationSettings.cpp
sandbox/jng/v4/Common/MdfParser/IOStroke.cpp
sandbox/jng/v4/Common/MdfParser/IOSymbol.cpp
sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.cpp
sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.cpp
sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.cpp
sandbox/jng/v4/Common/Renderers/AGGImageIO.cpp
sandbox/jng/v4/Common/Renderers/AGGRenderer.cpp
sandbox/jng/v4/Common/Renderers/AGGW2DRewriter.cpp
sandbox/jng/v4/Common/Renderers/DWFRenderer.cpp
sandbox/jng/v4/Common/Renderers/GDRenderer.cpp
sandbox/jng/v4/Common/Renderers/GDW2DRewriter.cpp
sandbox/jng/v4/Common/Renderers/UTFGridRenderer.cpp
sandbox/jng/v4/Common/Stylization/Band.h
sandbox/jng/v4/Common/Stylization/DefaultStylizer.cpp
sandbox/jng/v4/Common/Stylization/GridColorHandler.cpp
sandbox/jng/v4/Common/Stylization/GridColorThemeHandler.h
sandbox/jng/v4/Common/Stylization/GridData.h
sandbox/jng/v4/Common/Stylization/GridStyleColorHandler.h
sandbox/jng/v4/Common/Stylization/GridStylizer.cpp
sandbox/jng/v4/Common/Stylization/GridStylizer.h
sandbox/jng/v4/Common/Stylization/GridThemeParser.cpp
sandbox/jng/v4/Common/Stylization/LineBuffer.cpp
sandbox/jng/v4/Common/Stylization/PointAdapter.cpp
sandbox/jng/v4/Common/Stylization/PolygonAdapter.cpp
sandbox/jng/v4/Common/Stylization/PolylineAdapter.cpp
sandbox/jng/v4/Common/Stylization/SE_LineRenderer.cpp
sandbox/jng/v4/Common/Stylization/SE_Renderer.cpp
sandbox/jng/v4/Common/Stylization/StylizationEngine.cpp
sandbox/jng/v4/Server/src/Core/Server.h
sandbox/jng/v4/Server/src/Services/Rendering/ServerRenderingService.cpp
Log:
RFC 172: Migrate std::auto_ptr to std::unique_ptr and use nullptr instead of NULL where we have to as a result
Modified: sandbox/jng/v4/Common/Geometry/GeometrySimplifier.cpp
===================================================================
--- sandbox/jng/v4/Common/Geometry/GeometrySimplifier.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Geometry/GeometrySimplifier.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -33,8 +33,8 @@
MgGeometry* MgGeometrySimplifier::Simplify(MgGeometry* geom, double tolerance, INT32 algorithm)
{
Ptr<MgGeometry> simplified;
- std::auto_ptr<Geometry> gInput;
- std::auto_ptr<Geometry> gOutput;
+ std::unique_ptr<Geometry> gInput;
+ std::unique_ptr<Geometry> gOutput;
MG_GEOMETRY_TRY()
CHECKARGUMENTNULL(geom, L"MgGeometrySimplifier.Simplify");
Modified: sandbox/jng/v4/Common/Geometry/GeosUtil.cpp
===================================================================
--- sandbox/jng/v4/Common/Geometry/GeosUtil.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Geometry/GeosUtil.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -107,8 +107,8 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
contains = g1->contains(g2.get());
@@ -131,8 +131,8 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
intersects = g1->intersects(g2.get());
@@ -155,8 +155,8 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
crosses = g1->crosses(g2.get());
@@ -179,8 +179,8 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
disjoint = g1->disjoint(g2.get());
@@ -203,8 +203,8 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
equals = g1->equals(g2.get());
@@ -227,8 +227,8 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
overlaps = g1->overlaps(g2.get());
@@ -251,8 +251,8 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
touches = g1->touches(g2.get());
@@ -275,8 +275,8 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
within = g1->within(g2.get());
@@ -296,8 +296,8 @@
Ptr<MgGeometry> tGeom1 = MgSpatialUtility::TesselateCurve(geom1);
STRING wktGeom1 = tGeom1->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g3(g1->getBoundary());
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g3(g1->getBoundary());
WKTWriter writer;
string bndWkt = writer.write(g3.get());
@@ -324,8 +324,8 @@
Ptr<MgGeometry> tGeom1 = MgSpatialUtility::TesselateCurve(geom1);
STRING wktGeom1 = tGeom1->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g3(g1->convexHull());
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g3(g1->convexHull());
WKTWriter writer;
string convexHullWkt = writer.write(g3.get());
@@ -355,9 +355,9 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
- std::auto_ptr<Geometry> g3(g1->difference(g2.get()));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g3(g1->difference(g2.get()));
WKTWriter writer;
string differenceWkt = writer.write(g3.get());
@@ -388,8 +388,8 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
distance = g1->distance(g2.get());
@@ -412,9 +412,9 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
- std::auto_ptr<Geometry> g3(g1->intersection(g2.get()));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g3(g1->intersection(g2.get()));
WKTWriter writer;
string intersectionWkt = writer.write(g3.get());
@@ -444,9 +444,9 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
- std::auto_ptr<Geometry> g3(g1->symDifference(g2.get()));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g3(g1->symDifference(g2.get()));
WKTWriter writer;
string symetricDifferenceWkt = writer.write(g3.get());
@@ -476,9 +476,9 @@
STRING wktGeom1 = tGeom1->ToAwkt(true);
STRING wktGeom2 = tGeom2->ToAwkt(true);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Geometry> g2(r.Read(wktGeom2));
- std::auto_ptr<Geometry> g3(g1->Union(g2.get()));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g2(r.Read(wktGeom2));
+ std::unique_ptr<Geometry> g3(g1->Union(g2.get()));
WKTWriter writer;
string unionGeomWkt = writer.write(g3.get());
@@ -504,7 +504,7 @@
STRING wktGeom1 = ToAwkt(geom1);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
isValid = g1->isValid();
MG_GEOMETRY_CATCH_AND_THROW(L"MgGeosUtil.IsValid")
@@ -522,7 +522,7 @@
STRING wktGeom1 = ToAwkt(geom1);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
isSimple = g1->isSimple();
MG_GEOMETRY_CATCH_AND_THROW(L"MgGeosUtil.IsSimple")
@@ -540,7 +540,7 @@
STRING wktGeom1 = ToAwkt(geom1);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
isEmpty = g1->isEmpty();
MG_GEOMETRY_CATCH_AND_THROW(L"MgGeosUtil.IsEmpty")
@@ -558,7 +558,7 @@
STRING wktGeom1 = ToAwkt(geom1);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
//isClosed = g1->isClosed();
MG_GEOMETRY_CATCH_AND_THROW(L"MgGeosUtil.IsClosed")
@@ -576,7 +576,7 @@
STRING wktGeom1 = ToAwkt(geom1);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
area = g1->getArea();
MG_GEOMETRY_CATCH_AND_THROW(L"MgGeosUtil.Area")
@@ -594,7 +594,7 @@
STRING wktGeom1 = ToAwkt(geom1);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
length = g1->getLength();
MG_GEOMETRY_CATCH_AND_THROW(L"MgGeosUtil.Length")
@@ -612,8 +612,8 @@
STRING wktGeom1 = ToAwkt(geom1);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Point> g2(g1->getCentroid());
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Point> g2(g1->getCentroid());
double x = g2->getX();
double y = g2->getY();
@@ -637,8 +637,8 @@
STRING wktGeom1 = ToAwkt(geom1);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Point> g2(g1->getInteriorPoint());
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Point> g2(g1->getInteriorPoint());
double x = g2->getX();
double y = g2->getY();
@@ -662,8 +662,8 @@
STRING wktGeom1 = ToAwkt(geom1);
- std::auto_ptr<Geometry> g1(r.Read(wktGeom1));
- std::auto_ptr<Point> g2(g1->getInteriorPoint());
+ std::unique_ptr<Geometry> g1(r.Read(wktGeom1));
+ std::unique_ptr<Point> g2(g1->getInteriorPoint());
double x = g2->getX();
double y = g2->getY();
Modified: sandbox/jng/v4/Common/Geometry/PreparedGeometry.cpp
===================================================================
--- sandbox/jng/v4/Common/Geometry/PreparedGeometry.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Geometry/PreparedGeometry.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -30,7 +30,7 @@
PreparedGeometryImpl()
: m_pg(NULL),
m_pm(new PrecisionModel()),
- m_geom(NULL)
+ m_geom(nullptr)
{
m_gf = GeometryFactory::create(m_pm.get(), 10);
}
@@ -38,8 +38,8 @@
PreparedGeometryImpl()
: m_pg(NULL),
m_pm(new PrecisionModel()),
- m_gf(NULL),
- m_geom(NULL)
+ m_gf(nullptr),
+ m_geom(nullptr)
{
m_gf.reset(new GeometryFactory(m_pm.get(), 10));
}
@@ -69,13 +69,13 @@
const PreparedGeometry* m_pg;
private:
- std::auto_ptr<Geometry> m_geom;
- std::auto_ptr<PrecisionModel> m_pm;
+ std::unique_ptr<Geometry> m_geom;
+ std::unique_ptr<PrecisionModel> m_pm;
// GEOS 3.6.0 onwards changes the C++ API around GeometryFactory
#if (GEOS_VERSION_MAJOR == 3) && (GEOS_VERSION_MINOR >= 6)
GeometryFactory::unique_ptr m_gf;
#else
- std::auto_ptr<GeometryFactory> m_gf;
+ std::unique_ptr<GeometryFactory> m_gf;
#endif
};
@@ -108,43 +108,43 @@
bool MgPreparedGeometry::Contains(MgGeometry * other)
{
- std::auto_ptr<Geometry> gOther(d_ptr->Convert(other));
+ std::unique_ptr<Geometry> gOther(d_ptr->Convert(other));
return d_ptr->m_pg->contains(gOther.get());
}
bool MgPreparedGeometry::Crosses(MgGeometry * other)
{
- std::auto_ptr<Geometry> gOther(d_ptr->Convert(other));
+ std::unique_ptr<Geometry> gOther(d_ptr->Convert(other));
return d_ptr->m_pg->crosses(gOther.get());
}
bool MgPreparedGeometry::Disjoint(MgGeometry * other)
{
- std::auto_ptr<Geometry> gOther(d_ptr->Convert(other));
+ std::unique_ptr<Geometry> gOther(d_ptr->Convert(other));
return d_ptr->m_pg->disjoint(gOther.get());
}
bool MgPreparedGeometry::Intersects(MgGeometry * other)
{
- std::auto_ptr<Geometry> gOther(d_ptr->Convert(other));
+ std::unique_ptr<Geometry> gOther(d_ptr->Convert(other));
return d_ptr->m_pg->intersects(gOther.get());
}
bool MgPreparedGeometry::Overlaps(MgGeometry * other)
{
- std::auto_ptr<Geometry> gOther(d_ptr->Convert(other));
+ std::unique_ptr<Geometry> gOther(d_ptr->Convert(other));
return d_ptr->m_pg->overlaps(gOther.get());
}
bool MgPreparedGeometry::Touches(MgGeometry * other)
{
- std::auto_ptr<Geometry> gOther(d_ptr->Convert(other));
+ std::unique_ptr<Geometry> gOther(d_ptr->Convert(other));
return d_ptr->m_pg->touches(gOther.get());
}
bool MgPreparedGeometry::Within(MgGeometry * other)
{
- std::auto_ptr<Geometry> gOther(d_ptr->Convert(other));
+ std::unique_ptr<Geometry> gOther(d_ptr->Convert(other));
return d_ptr->m_pg->within(gOther.get());
}
Modified: sandbox/jng/v4/Common/Geometry/PreparedGeometry.h
===================================================================
--- sandbox/jng/v4/Common/Geometry/PreparedGeometry.h 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Geometry/PreparedGeometry.h 2019-05-29 12:02:22 UTC (rev 9517)
@@ -284,7 +284,7 @@
private:
class PreparedGeometryImpl;
- std::auto_ptr<PreparedGeometryImpl> d_ptr;
+ std::unique_ptr<PreparedGeometryImpl> d_ptr;
MgPreparedGeometry(PreparedGeometryImpl* impl);
protected:
Modified: sandbox/jng/v4/Common/MapGuideCommon/Controller/HtmlController.cpp
===================================================================
--- sandbox/jng/v4/Common/MapGuideCommon/Controller/HtmlController.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/MapGuideCommon/Controller/HtmlController.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -486,7 +486,7 @@
Ptr<MgStringCollection> propNames = new MgStringCollection();
DisplayNameMap displayNameMap;
//We need the property mappings of the source layer definition to compile our layer metadata
- std::auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resourceService, layerId));
+ std::unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resourceService, layerId));
if (ldf.get() != NULL)
{
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
Modified: sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Layer.cpp
===================================================================
--- sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Layer.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Layer.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -590,7 +590,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());
@@ -651,7 +651,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());
@@ -713,7 +713,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: sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Map.cpp
===================================================================
--- sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Map.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/MapGuideCommon/MapLayer/Map.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -183,8 +183,8 @@
}
// build the runtime map object from the parsed definition
- std::auto_ptr<MdfModel::TileSetDefinition> tdef;
- std::auto_ptr<MdfModel::MapDefinition> mdef(parser.DetachMapDefinition());
+ std::unique_ptr<MdfModel::TileSetDefinition> tdef;
+ std::unique_ptr<MdfModel::MapDefinition> mdef(parser.DetachMapDefinition());
assert(mdef.get() != NULL);
MgGeometryFactory gf;
@@ -619,7 +619,7 @@
}
// build the runtime map object from the parsed definition
- std::auto_ptr<MdfModel::TileSetDefinition> tdef(parser.DetachTileSetDefinition());
+ std::unique_ptr<MdfModel::TileSetDefinition> tdef(parser.DetachTileSetDefinition());
assert(tdef.get() != NULL);
MgGeometryFactory gf;
Modified: sandbox/jng/v4/Common/MdfParser/IOElevationSettings.cpp
===================================================================
--- sandbox/jng/v4/Common/MdfParser/IOElevationSettings.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/MdfParser/IOElevationSettings.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -146,7 +146,7 @@
// Property: Unit
fd << tab.tab() << startStr(sUnit);
- std::auto_ptr<MdfString> str(LengthConverter::UnitToEnglish(elevationSettings->GetUnit()));
+ std::unique_ptr<MdfString> str(LengthConverter::UnitToEnglish(elevationSettings->GetUnit()));
fd << EncodeString(*str);
fd << endStr(sUnit) << std::endl;
Modified: sandbox/jng/v4/Common/MdfParser/IOStroke.cpp
===================================================================
--- sandbox/jng/v4/Common/MdfParser/IOStroke.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/MdfParser/IOStroke.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -155,7 +155,7 @@
// Property: Unit
fd << tab.tab() << startStr(sUnit);
- std::auto_ptr<MdfString> str(LengthConverter::UnitToEnglish(stroke->GetUnit()));
+ std::unique_ptr<MdfString> str(LengthConverter::UnitToEnglish(stroke->GetUnit()));
fd << EncodeString(*str);
fd << endStr(sUnit) << std::endl;
Modified: sandbox/jng/v4/Common/MdfParser/IOSymbol.cpp
===================================================================
--- sandbox/jng/v4/Common/MdfParser/IOSymbol.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/MdfParser/IOSymbol.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -68,7 +68,7 @@
{
// Property: Unit
fd << tab.tab() << "<Unit>"; // NOXLATE
- std::auto_ptr<MdfString> str(LengthConverter::UnitToEnglish(symbol->GetUnit()));
+ std::unique_ptr<MdfString> str(LengthConverter::UnitToEnglish(symbol->GetUnit()));
fd << EncodeString(*str);
fd << "</Unit>" << std::endl; // NOXLATE
Modified: sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.cpp
===================================================================
--- sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -255,7 +255,7 @@
}
// Populate the data.
- std::auto_ptr<MdfModel::PrintLayoutDefinition> layoutDef(parser.DetachPrintLayoutDefinition());
+ std::unique_ptr<MdfModel::PrintLayoutDefinition> layoutDef(parser.DetachPrintLayoutDefinition());
PopulateFromResource(printLayoutService, resourceService, layoutDef.get());
}
Modified: sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.cpp
===================================================================
--- sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -443,7 +443,7 @@
}
// Populate the data.
- std::auto_ptr<MdfModel::PrintLayoutElementDefinition> elementDef(parser.DetachPrintLayoutElementDefinition());
+ std::unique_ptr<MdfModel::PrintLayoutElementDefinition> elementDef(parser.DetachPrintLayoutElementDefinition());
PopulateFromResource(elementDef.get());
}
Modified: sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.cpp
===================================================================
--- sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -76,7 +76,7 @@
if (parser.GetSucceeded())
{
// Attempt to get a pointer to the print layout element definition
- std::auto_ptr<PrintLayoutElementDefinition> elementDef(parser.DetachPrintLayoutElementDefinition());
+ std::unique_ptr<PrintLayoutElementDefinition> elementDef(parser.DetachPrintLayoutElementDefinition());
if (elementDef.get() != NULL)
{
STRING defType = elementDef->GetType();
Modified: sandbox/jng/v4/Common/Renderers/AGGImageIO.cpp
===================================================================
--- sandbox/jng/v4/Common/Renderers/AGGImageIO.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Renderers/AGGImageIO.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -1258,7 +1258,7 @@
else if (format == L"JPG") // MgImageFormats::Jpeg
data = (unsigned char*)gdImageJpegPtr(gdimg24, &size, 75);
- std::auto_ptr<RS_ByteData> byteData;
+ std::unique_ptr<RS_ByteData> byteData;
byteData.reset((NULL == data)? NULL : new RS_ByteData(data, size));
gdFree(data);
Modified: sandbox/jng/v4/Common/Renderers/AGGRenderer.cpp
===================================================================
--- sandbox/jng/v4/Common/Renderers/AGGRenderer.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Renderers/AGGRenderer.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -454,7 +454,7 @@
return;
LineBuffer* workbuffer = lb;
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
if (s_bGeneralizeData)
{
@@ -561,7 +561,7 @@
return;
LineBuffer* workbuffer = lb;
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
if (s_bGeneralizeData)
{
@@ -967,7 +967,7 @@
// transform to coordinates of temporary image where we
// draw symbol before transfering to the map
LineBuffer* lb = LineBufferPool::NewLineBuffer(m_pPool, 8);
- std::auto_ptr<LineBuffer> spLB(lb);
+ std::unique_ptr<LineBuffer> spLB(lb);
double tempx, tempy;
for (int i=0; i<npts; ++i)
@@ -1239,7 +1239,7 @@
// create the destination line buffer
LineBuffer* destLB = LineBufferPool::NewLineBuffer(m_pPool, 8);
- std::auto_ptr<LineBuffer> spDestLB(destLB);
+ std::unique_ptr<LineBuffer> spDestLB(destLB);
// special code for Fenceline1 style
int numCapSegs = 0;
@@ -1894,7 +1894,7 @@
void AGGRenderer::ProcessLine(SE_ApplyContext* ctx, SE_RenderLineStyle* style)
{
LineBuffer* featGeom = ctx->geometry;
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
if (s_bGeneralizeData)
{
@@ -1927,7 +1927,7 @@
void AGGRenderer::ProcessArea(SE_ApplyContext* ctx, SE_RenderAreaStyle* style)
{
LineBuffer* featGeom = ctx->geometry;
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
// can't apply an area style to point and linestring geometry types
switch (featGeom->geom_type())
@@ -3064,7 +3064,7 @@
WT_Matrix xform = file.desired_rendition().drawing_info().units().dwf_to_application_adjoint_transform();
LineBuffer* lb = LineBufferPool::NewLineBuffer(m_pPool, numpts);
- std::auto_ptr<LineBuffer> spLB(lb);
+ std::unique_ptr<LineBuffer> spLB(lb);
lb->Reset();
//
Modified: sandbox/jng/v4/Common/Renderers/AGGW2DRewriter.cpp
===================================================================
--- sandbox/jng/v4/Common/Renderers/AGGW2DRewriter.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Renderers/AGGW2DRewriter.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -167,7 +167,7 @@
int totalPts = contourSet.total_points();
LineBuffer* dst_cntr = rewriter->ProcessW2DPoints(file, (WT_Logical_Point*)contourSet.points(), totalPts, true);
- std::auto_ptr<LineBuffer> spDstLB(dst_cntr);
+ std::unique_ptr<LineBuffer> spDstLB(dst_cntr);
if (dst_cntr)
{
@@ -174,7 +174,7 @@
//construct a line buffer with the transformed points and the original
//contour information
LineBuffer* lb = LineBufferPool::NewLineBuffer(rewriter->GetBufferPool(), totalPts);
- std::auto_ptr<LineBuffer> spLB(lb);
+ std::unique_ptr<LineBuffer> spLB(lb);
int index = 0;
for (int i=0; i<numcntrs; i++)
{
@@ -262,7 +262,7 @@
endpts[3].m_y = bounds.m_max.m_y;
LineBuffer* dstpts = rewriter->ProcessW2DPoints(file, endpts, 4, false);
- std::auto_ptr<LineBuffer> spDstLB(dstpts);
+ std::unique_ptr<LineBuffer> spDstLB(dstpts);
unsigned int* src = NULL;
@@ -373,7 +373,7 @@
WT_Logical_Point center = filledEllipse.position();
LineBuffer* dstpts = rewriter->ProcessW2DPoints(file, (WT_Logical_Point*)¢er, 1, false);
- std::auto_ptr<LineBuffer> spDstLB(dstpts);
+ std::unique_ptr<LineBuffer> spDstLB(dstpts);
if (!dstpts)
return WT_Result::Success;
@@ -394,7 +394,7 @@
double startY = dstpts->y_coord(0) + ty*rcos + tx*rsin;
LineBuffer* ell = LineBufferPool::NewLineBuffer(rewriter->GetBufferPool(), 20);
- std::auto_ptr<LineBuffer> spEllLB(ell);
+ std::unique_ptr<LineBuffer> spEllLB(ell);
ell->SetDrawingScale(1.0);
ell->MoveTo(startX, startY);
@@ -434,7 +434,7 @@
WT_Logical_Point center = outlineEllipse.position();
LineBuffer* dstpts = rewriter->ProcessW2DPoints(file, (WT_Logical_Point*)¢er, 1, false);
- std::auto_ptr<LineBuffer> spDstLB(dstpts);
+ std::unique_ptr<LineBuffer> spDstLB(dstpts);
if (!dstpts)
return WT_Result::Success;
@@ -455,7 +455,7 @@
double startY = dstpts->y_coord(0) + ty*rcos + tx*rsin;
LineBuffer* ell = LineBufferPool::NewLineBuffer(rewriter->GetBufferPool(), 20);
- std::auto_ptr<LineBuffer> spEllLB(ell);
+ std::unique_ptr<LineBuffer> spEllLB(ell);
ell->SetDrawingScale(1.0);
ell->MoveTo(startX, startY);
@@ -499,7 +499,7 @@
//do all necessary transformations
LineBuffer* dstpts = rewriter->ProcessW2DPoints(file, polygon.points(), polygon.count(), true);
- std::auto_ptr<LineBuffer> spDstLB(dstpts);
+ std::unique_ptr<LineBuffer> spDstLB(dstpts);
if (dstpts)
{
@@ -540,7 +540,7 @@
return WT_Result::Success;
LineBuffer* dstpts = rewriter->ProcessW2DPoints(file, srcpts, numPoints, true);
- std::auto_ptr<LineBuffer> spDstLB(dstpts);
+ std::unique_ptr<LineBuffer> spDstLB(dstpts);
if (dstpts)
{
@@ -609,7 +609,7 @@
endpts[3].m_y = bounds.m_max.m_y;
LineBuffer* dstpts = rewriter->ProcessW2DPoints(file, endpts, 4, false);
- std::auto_ptr<LineBuffer> spDstLB(dstpts);
+ std::unique_ptr<LineBuffer> spDstLB(dstpts);
int width;
int height;
@@ -678,7 +678,7 @@
//do all necessary transformations and clipping
LineBuffer* dstpts = rewriter->ProcessW2DPoints(file, polyline.points(), polyline.count(), true);
- std::auto_ptr<LineBuffer> spDstLB(dstpts);
+ std::unique_ptr<LineBuffer> spDstLB(dstpts);
if (dstpts)
{
@@ -720,7 +720,7 @@
WT_Logical_Point pt = text.position();
LineBuffer* dstpts = rewriter->ProcessW2DPoints(file, &pt, 1, true);
- std::auto_ptr<LineBuffer> spDstLB(dstpts);
+ std::unique_ptr<LineBuffer> spDstLB(dstpts);
if (dstpts)
{
Modified: sandbox/jng/v4/Common/Renderers/DWFRenderer.cpp
===================================================================
--- sandbox/jng/v4/Common/Renderers/DWFRenderer.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Renderers/DWFRenderer.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -559,7 +559,7 @@
void DWFRenderer::ProcessPolygon(LineBuffer* srclb, RS_FillStyle& fill)
{
LineBuffer* workbuffer = srclb->Optimize(m_drawingScale, m_pPool);
- std::auto_ptr<LineBuffer> spLB(workbuffer);
+ std::unique_ptr<LineBuffer> spLB(workbuffer);
if (workbuffer->point_count() == 0)
{
@@ -714,7 +714,7 @@
}
LineBuffer* workbuffer = srclb->Optimize(m_drawingScale, m_pPool);
- std::auto_ptr<LineBuffer> spLB(workbuffer);
+ std::unique_ptr<LineBuffer> spLB(workbuffer);
WritePolylines(workbuffer);
@@ -3458,7 +3458,7 @@
WT_Matrix xform = file.desired_rendition().drawing_info().units().dwf_to_application_adjoint_transform();
LineBuffer* lb = LineBufferPool::NewLineBuffer(m_pPool, numpts);
- std::auto_ptr<LineBuffer> spLB(lb);
+ std::unique_ptr<LineBuffer> spLB(lb);
lb->Reset();
//
Modified: sandbox/jng/v4/Common/Renderers/GDRenderer.cpp
===================================================================
--- sandbox/jng/v4/Common/Renderers/GDRenderer.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Renderers/GDRenderer.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -445,7 +445,7 @@
return;
LineBuffer* workbuffer = lb;
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
if (s_bGeneralizeData)
{
@@ -506,7 +506,7 @@
return;
LineBuffer* workbuffer = lb;
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
if (s_bGeneralizeData)
{
@@ -1340,7 +1340,7 @@
// create the destination line buffer
LineBuffer* destLB = LineBufferPool::NewLineBuffer(m_pPool, 8);
- std::auto_ptr<LineBuffer> spDestLB(destLB);
+ std::unique_ptr<LineBuffer> spDestLB(destLB);
// special code for Fenceline1 style
int numCapSegs = 0;
@@ -1717,7 +1717,7 @@
void GDRenderer::ProcessLine(SE_ApplyContext* ctx, SE_RenderLineStyle* style)
{
LineBuffer* featGeom = ctx->geometry;
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
if (s_bGeneralizeData)
{
@@ -1749,7 +1749,7 @@
void GDRenderer::ProcessArea(SE_ApplyContext* ctx, SE_RenderAreaStyle* style)
{
LineBuffer* featGeom = ctx->geometry;
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
// can't apply an area style to point and linestring geometry types
switch (featGeom->geom_type())
@@ -2082,7 +2082,7 @@
WT_Matrix xform = file.desired_rendition().drawing_info().units().dwf_to_application_adjoint_transform();
LineBuffer* lb = LineBufferPool::NewLineBuffer(m_pPool, numpts);
- std::auto_ptr<LineBuffer> spLB(lb);
+ std::unique_ptr<LineBuffer> spLB(lb);
lb->Reset();
//
Modified: sandbox/jng/v4/Common/Renderers/GDW2DRewriter.cpp
===================================================================
--- sandbox/jng/v4/Common/Renderers/GDW2DRewriter.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Renderers/GDW2DRewriter.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -480,7 +480,7 @@
// use a line buffer to tessellate the arc
LineBuffer* ell = LineBufferPool::NewLineBuffer(rewriter->GetBufferPool(), 20);
- std::auto_ptr<LineBuffer> spEllLB(ell);
+ std::unique_ptr<LineBuffer> spEllLB(ell);
ell->SetDrawingScale(1.0);
ell->MoveTo(startX, startY);
@@ -614,7 +614,7 @@
// use a line buffer to tessellate the arc
LineBuffer* ell = LineBufferPool::NewLineBuffer(rewriter->GetBufferPool(), 20);
- std::auto_ptr<LineBuffer> spEllLB(ell);
+ std::unique_ptr<LineBuffer> spEllLB(ell);
ell->SetDrawingScale(1.0);
ell->MoveTo(startX, startY);
Modified: sandbox/jng/v4/Common/Renderers/UTFGridRenderer.cpp
===================================================================
--- sandbox/jng/v4/Common/Renderers/UTFGridRenderer.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Renderers/UTFGridRenderer.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -326,7 +326,7 @@
// transform to coordinates of temporary image where we
// draw symbol before transfering to the map
LineBuffer* lb = LineBufferPool::NewLineBuffer(m_pPool, 8);
- std::auto_ptr<LineBuffer> spLB(lb);
+ std::unique_ptr<LineBuffer> spLB(lb);
double tempx, tempy;
for (int i = 0; i<npts; ++i)
Modified: sandbox/jng/v4/Common/Stylization/Band.h
===================================================================
--- sandbox/jng/v4/Common/Stylization/Band.h 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/Band.h 2019-05-29 12:02:22 UTC (rev 9517)
@@ -345,10 +345,10 @@
Point2D m_westSourthPoint;
// Cache for Aspect values of this band.
- mutable std::auto_ptr<Band> m_spAspectBand;
+ mutable std::unique_ptr<Band> m_spAspectBand;
// Cache for Slope values of this band.
- mutable std::auto_ptr<Band> m_spSlopeBand;
+ mutable std::unique_ptr<Band> m_spSlopeBand;
};
/////////////////////////////////////////////////////////////////////////////////////////////
Modified: sandbox/jng/v4/Common/Stylization/DefaultStylizer.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/DefaultStylizer.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/DefaultStylizer.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -286,7 +286,7 @@
}
// elevation settings - also invariant
- std::auto_ptr<RS_ElevationSettings> spElevSettings;
+ std::unique_ptr<RS_ElevationSettings> spElevSettings;
MdfModel::ElevationSettings* modelElevSettings = scaleRange->GetElevationSettings();
if (modelElevSettings != NULL)
{
@@ -330,7 +330,7 @@
if (!lb)
continue;
- std::auto_ptr<LineBuffer> spLB(lb);
+ std::unique_ptr<LineBuffer> spLB(lb);
// tell line buffer the current drawing scale (used for arc tessellation)
lb->SetDrawingScale(drawingScale);
Modified: sandbox/jng/v4/Common/Stylization/GridColorHandler.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/GridColorHandler.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/GridColorHandler.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -52,7 +52,7 @@
GridColorBandHandler* GridColorHandler::CreateBandHandler(const MdfModel::RuleCollection *pRules, const GridData *pGrid)
{
- std::auto_ptr<GridColorBandHandler> spHandler(new GridColorBandHandler());
+ std::unique_ptr<GridColorBandHandler> spHandler(new GridColorBandHandler());
if (!spHandler->Initialize(pRules, pGrid))
spHandler.reset();
return spHandler.release();
@@ -60,7 +60,7 @@
GridColorBandsHandler* GridColorHandler::CreateBandsHandler(const MdfModel::RuleCollection *pRules, const GridData *pGrid)
{
- std::auto_ptr<GridColorBandsHandler> spHandler(new GridColorBandsHandler());
+ std::unique_ptr<GridColorBandsHandler> spHandler(new GridColorBandsHandler());
if (!spHandler->Initialize(pRules, pGrid))
spHandler.reset();
return spHandler.release();
@@ -68,7 +68,7 @@
GridColorThemeHandler* GridColorHandler::CreateThemeHandler(const MdfModel::RuleCollection *pRules, const GridData *pGrid)
{
- std::auto_ptr<GridColorThemeHandler> spHandler(new GridColorThemeHandler());
+ std::unique_ptr<GridColorThemeHandler> spHandler(new GridColorThemeHandler());
if (!spHandler->Initialize(pRules, pGrid))
spHandler.reset();
return spHandler.release();
@@ -76,7 +76,7 @@
GridColorNullHandler* GridColorHandler::CreateNullHandler(const MdfModel::RuleCollection *pRules, const GridData *pGrid)
{
- std::auto_ptr<GridColorNullHandler> spHandler(new GridColorNullHandler);
+ std::unique_ptr<GridColorNullHandler> spHandler(new GridColorNullHandler);
if (!spHandler->Initialize(pRules, pGrid))
spHandler.reset();
return spHandler.release();
Modified: sandbox/jng/v4/Common/Stylization/GridColorThemeHandler.h
===================================================================
--- sandbox/jng/v4/Common/Stylization/GridColorThemeHandler.h 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/GridColorThemeHandler.h 2019-05-29 12:02:22 UTC (rev 9517)
@@ -87,10 +87,10 @@
private:
// Theme information extracted from the rules.
- std::auto_ptr<GridTheme> m_spTheme;
+ std::unique_ptr<GridTheme> m_spTheme;
// Hash table generated from the theme info.
- std::auto_ptr<GridThemeHashTable> m_spHashTable;
+ std::unique_ptr<GridThemeHashTable> m_spHashTable;
// Then band to be themed.
const Band *m_pThemeBand;
Modified: sandbox/jng/v4/Common/Stylization/GridData.h
===================================================================
--- sandbox/jng/v4/Common/Stylization/GridData.h 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/GridData.h 2019-05-29 12:02:22 UTC (rev 9517)
@@ -225,11 +225,11 @@
double m_dCoordSysUnitLength;
// Cache for hillshade values for this band
- mutable std::auto_ptr<Band> m_spHillShadeBand;
- mutable std::auto_ptr<MdfModel::HillShade> m_spMdfHillShade;
+ mutable std::unique_ptr<Band> m_spHillShadeBand;
+ mutable std::unique_ptr<MdfModel::HillShade> m_spMdfHillShade;
// Store the raw color band without hillshade effect if the color band includes effect.
- std::auto_ptr<Band> m_spNoHillShadeColorBand;
+ std::unique_ptr<Band> m_spNoHillShadeColorBand;
};
/////////////////////////////////////////////////////////////////////////////////////////////
Modified: sandbox/jng/v4/Common/Stylization/GridStyleColorHandler.h
===================================================================
--- sandbox/jng/v4/Common/Stylization/GridStyleColorHandler.h 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/GridStyleColorHandler.h 2019-05-29 12:02:22 UTC (rev 9517)
@@ -138,7 +138,7 @@
private:
// Handler for the GridColor
- std::auto_ptr<GridColorHandler> m_spColorHandler;
+ std::unique_ptr<GridColorHandler> m_spColorHandler;
// Sun vector
Vector3D m_sun;
@@ -158,7 +158,7 @@
// Whether to apply hillshade.
bool m_bDoHillShade;
bool m_bCalcHillShade; // Calculate hillshade for later usage.
- std::auto_ptr<Band> m_spCacheHillShade;
+ std::unique_ptr<Band> m_spCacheHillShade;
const MdfModel::HillShade *m_pCalcMdfHillShade;
// NoHillShade color band, means that color band
Modified: sandbox/jng/v4/Common/Stylization/GridStylizer.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/GridStylizer.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/GridStylizer.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -66,7 +66,7 @@
if (NULL != pColorStyle)
{
// Add handler to deal with color style.
- std::auto_ptr<GridStyleColorHandler> spHandler(new GridStyleColorHandler(fOpacity));
+ std::unique_ptr<GridStyleColorHandler> spHandler(new GridStyleColorHandler(fOpacity));
if (spHandler->Initialize(pGrid, pColorStyle))
styleHandlers.Adopt(spHandler.release());
}
@@ -73,11 +73,11 @@
if (NULL != pSurfaceStyle)
{
// Add handler to deal with surface style
- std::auto_ptr<GridStyleSurfaceHandler> spHandler(new GridStyleSurfaceHandler());
+ std::unique_ptr<GridStyleSurfaceHandler> spHandler(new GridStyleSurfaceHandler());
if (spHandler->Initialize(pGrid, pSurfaceStyle))
styleHandlers.Adopt(spHandler.release());
// Add handler to deal with the color on null pixels.
- std::auto_ptr<GridStyleSurfaceColorHandler> spSurfaceColorHandler(new GridStyleSurfaceColorHandler());
+ std::unique_ptr<GridStyleSurfaceColorHandler> spSurfaceColorHandler(new GridStyleSurfaceColorHandler());
if (spSurfaceColorHandler->Initialize(pGrid, pSurfaceStyle->GetDefaultColor()))
styleHandlers.Adopt(spSurfaceColorHandler.release());
}
@@ -101,11 +101,11 @@
// default color.
MdfModel::MdfOwnerCollection<GridStyleHandler> styleHandlers;
// Add handler to deal with the color style.
- std::auto_ptr<GridStyleColorHandler> spHandler(new GridStyleColorHandler());
+ std::unique_ptr<GridStyleColorHandler> spHandler(new GridStyleColorHandler());
if (spHandler->Initialize(pGrid, pStyle))
styleHandlers.Adopt(spHandler.release());
// Add handler to deal with the color on null pixels.
- std::auto_ptr<GridStyleSurfaceColorHandler> spSurfaceColorHandler(new GridStyleSurfaceColorHandler());
+ std::unique_ptr<GridStyleSurfaceColorHandler> spSurfaceColorHandler(new GridStyleSurfaceColorHandler());
if (spSurfaceColorHandler->Initialize(pGrid, sDefaultColor))
styleHandlers.Adopt(spSurfaceColorHandler.release());
return VisitStyleHandlers(styleHandlers, pGrid->GetXCount(), pGrid->GetYCount());
@@ -120,11 +120,11 @@
// default color.
MdfModel::MdfOwnerCollection<GridStyleHandler> styleHandlers;
// Add handler to deal with surface style
- std::auto_ptr<GridStyleSurfaceHandler> spHandler(new GridStyleSurfaceHandler());
+ std::unique_ptr<GridStyleSurfaceHandler> spHandler(new GridStyleSurfaceHandler());
if (spHandler->Initialize(pGrid, pStyle))
styleHandlers.Adopt(spHandler.release());
// Add handler to deal with the color on null pixels.
- std::auto_ptr<GridStyleSurfaceColorHandler> spSurfaceColorHandler(new GridStyleSurfaceColorHandler());
+ std::unique_ptr<GridStyleSurfaceColorHandler> spSurfaceColorHandler(new GridStyleSurfaceColorHandler());
if (spSurfaceColorHandler->Initialize(pGrid, pStyle->GetDefaultColor()))
styleHandlers.Adopt(spSurfaceColorHandler.release());
return VisitStyleHandlers(styleHandlers, pGrid->GetXCount(), pGrid->GetYCount());
@@ -147,7 +147,7 @@
{
// Not cached, then we generate one
assert(false);
- std::auto_ptr<Band> spNewHSBand(new Band(Band::Double32, pGrid));
+ std::unique_ptr<Band> spNewHSBand(new Band(Band::Double32, pGrid));
Band* pHillShadeBand = pGrid->GetBand(pHS->GetBand());
if (NULL == pHillShadeBand)
return false;
Modified: sandbox/jng/v4/Common/Stylization/GridStylizer.h
===================================================================
--- sandbox/jng/v4/Common/Stylization/GridStylizer.h 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/GridStylizer.h 2019-05-29 12:02:22 UTC (rev 9517)
@@ -239,7 +239,7 @@
ReactorCollection m_reactors;
// Status reporter
- std::auto_ptr<GridApplyStatusReporter> m_spReporter;
+ std::unique_ptr<GridApplyStatusReporter> m_spReporter;
// Prevent coping and assigning.
GridStylizer(const GridStylizer &);
Modified: sandbox/jng/v4/Common/Stylization/GridThemeParser.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/GridThemeParser.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/GridThemeParser.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -57,7 +57,7 @@
}
for (++i; i < nCount; ++i)
{
- std::auto_ptr<GridTheme> pSingleTheme(ParseThemeColorRule(dynamic_cast<MdfModel::GridColorRule*>(pRules->GetAt(i))));
+ std::unique_ptr<GridTheme> pSingleTheme(ParseThemeColorRule(dynamic_cast<MdfModel::GridColorRule*>(pRules->GetAt(i))));
if (pSingleTheme.get() == NULL)
{
// Wrong filter string, continue to next filter.
Modified: sandbox/jng/v4/Common/Stylization/LineBuffer.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/LineBuffer.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/LineBuffer.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -1347,7 +1347,7 @@
// don't set any offset for new linebuffer, because it is already applied,
// and MoveTo and LineTo would apply it again. Instead, set at end
LineBuffer* ret = LineBufferPool::NewLineBuffer(lbp, m_cur_types, m_dimensionality, m_bIgnoreZ);
- std::auto_ptr<LineBuffer> spLB(ret);
+ std::unique_ptr<LineBuffer> spLB(ret);
ret->SetGeometryType(geom_type());
// optimization
@@ -1467,7 +1467,7 @@
|| m_bounds.maxy < b.miny)
return NULL;
- std::auto_ptr<LineBuffer> spLB(LineBufferPool::NewLineBuffer(lbp, m_cur_types, m_dimensionality, m_bIgnoreZ));
+ std::unique_ptr<LineBuffer> spLB(LineBufferPool::NewLineBuffer(lbp, m_cur_types, m_dimensionality, m_bIgnoreZ));
if (clipType == ctArea)
{
Modified: sandbox/jng/v4/Common/Stylization/PointAdapter.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/PointAdapter.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/PointAdapter.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -99,7 +99,7 @@
// of the FDO query.
LineBuffer* lb = geometry;
- std::auto_ptr<LineBuffer> spClipLB;
+ std::unique_ptr<LineBuffer> spClipLB;
if (renderer->RequiresClipping())
{
Modified: sandbox/jng/v4/Common/Stylization/PolygonAdapter.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/PolygonAdapter.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/PolygonAdapter.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -134,7 +134,7 @@
//-------------------------------------------------------
LineBuffer* lb = geometry;
- std::auto_ptr<LineBuffer> spClipLB;
+ std::unique_ptr<LineBuffer> spClipLB;
if (bClip)
{
Modified: sandbox/jng/v4/Common/Stylization/PolylineAdapter.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/PolylineAdapter.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/PolylineAdapter.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -186,7 +186,7 @@
//-------------------------------------------------------
LineBuffer* lb = geometry;
- std::auto_ptr<LineBuffer> spClipLB;
+ std::unique_ptr<LineBuffer> spClipLB;
if (bClip)
{
Modified: sandbox/jng/v4/Common/Stylization/SE_LineRenderer.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/SE_LineRenderer.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/SE_LineRenderer.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -861,7 +861,7 @@
// use symbol bounds to quickly check whether we need to clip
// TODO: use the primitive's bounds and not the symbol bounds
LineBuffer* geomToDraw = &geom;
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
if (sym_minx < startpos || sym_maxx > endpos)
{
// check if symbol is completely outside clip region
@@ -895,7 +895,7 @@
// use symbol bounds to quickly check whether we need to clip
// TODO: use the primitive's bounds and not the symbol bounds
LineBuffer* geomToDraw = &geom;
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
if (sym_minx < startpos || sym_maxx > endpos)
{
// check if symbol is completely outside clip region
@@ -1644,7 +1644,7 @@
return NULL;
LineBuffer* ret = LineBufferPool::NewLineBuffer(lbp, geometry.point_count(), FdoDimensionality_XY, true);
- std::auto_ptr<LineBuffer> spRetLB(ret);
+ std::unique_ptr<LineBuffer> spRetLB(ret);
ret->SetGeometryType(geometry.geom_type());
// expand clip region a little so that we don't throw
@@ -1714,7 +1714,7 @@
return NULL;
LineBuffer* ret = LineBufferPool::NewLineBuffer(lbp, geometry.point_count(), FdoDimensionality_XY, true);
- std::auto_ptr<LineBuffer> spRetLB(ret);
+ std::unique_ptr<LineBuffer> spRetLB(ret);
ret->SetGeometryType(geometry.geom_type());
// expand clip region a little so that we don't throw
Modified: sandbox/jng/v4/Common/Stylization/SE_Renderer.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/SE_Renderer.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/SE_Renderer.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -374,7 +374,7 @@
// transform the feature geometry to rendering space
LineBuffer* xfgeom = LineBufferPool::NewLineBuffer(m_pPool, featGeom->point_count());
- std::auto_ptr<LineBuffer> spLB(xfgeom);
+ std::unique_ptr<LineBuffer> spLB(xfgeom);
*xfgeom = *featGeom;
int size = featGeom->point_count();
@@ -484,7 +484,7 @@
{
// if the raster symbol is selected, then draw the mask selection polygon only
LineBuffer *lb = LineBufferPool::NewLineBuffer(m_pPool, 5);
- std::auto_ptr<LineBuffer> spLB(lb);
+ std::unique_ptr<LineBuffer> spLB(lb);
lb->MoveTo(rp->bounds[3].x, rp->bounds[3].y);
for (int i = 0; i < 4; ++i)
Modified: sandbox/jng/v4/Common/Stylization/StylizationEngine.cpp
===================================================================
--- sandbox/jng/v4/Common/Stylization/StylizationEngine.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Common/Stylization/StylizationEngine.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -140,7 +140,7 @@
if (!lb)
continue;
- std::auto_ptr<LineBuffer> spLB(lb);
+ std::unique_ptr<LineBuffer> spLB(lb);
// tell line buffer the current drawing scale (used for arc tessellation)
lb->SetDrawingScale(drawingScale);
@@ -275,7 +275,7 @@
// the rendering is done.
CompositeSymbolization symbols;
- std::auto_ptr<SymbolInstance> instance(new SymbolInstance());
+ std::unique_ptr<SymbolInstance> instance(new SymbolInstance());
instance->AdoptSymbolDefinition(watermark->GetContent());
instance->SetUsageContext(SymbolInstance::ucPoint);
symbols.GetSymbolCollection()->Adopt(instance.release());
@@ -462,7 +462,7 @@
// pass.
FdoPtr<FdoExpressionEngine> exec = ExpressionHelper::GetExpressionEngine(se_renderer, NULL);
- std::auto_ptr<LineBuffer> spLB;
+ std::unique_ptr<LineBuffer> spLB;
size_t nPos = watermarkPosList.size();
for (size_t posIx=0; posIx<nPos; posIx+=2)
{
@@ -1071,7 +1071,7 @@
// prepare the geometry on which we will apply the styles
LineBuffer* lb = geometry;
- std::auto_ptr<LineBuffer> spClipLB;
+ std::unique_ptr<LineBuffer> spClipLB;
if (bClip)
{
Modified: sandbox/jng/v4/Server/src/Core/Server.h
===================================================================
--- sandbox/jng/v4/Server/src/Core/Server.h 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Server/src/Core/Server.h 2019-05-29 12:02:22 UTC (rev 9517)
@@ -122,7 +122,7 @@
///////////////////////////////////////////////////////
/// Member data
private:
- std::auto_ptr<MgServerInteractiveCommand> m_command;
+ std::unique_ptr<MgServerInteractiveCommand> m_command;
bool m_bTestMode;
bool m_bTestFdo;
Modified: sandbox/jng/v4/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- sandbox/jng/v4/Server/src/Services/Rendering/ServerRenderingService.cpp 2019-05-29 11:26:19 UTC (rev 9516)
+++ sandbox/jng/v4/Server/src/Services/Rendering/ServerRenderingService.cpp 2019-05-29 12:02:22 UTC (rev 9517)
@@ -396,7 +396,7 @@
sessionId = userInfo->GetMgSessionId();
UTFGridContent content;
- std::auto_ptr<UTFGridRenderer> dr(new UTFGridRenderer(&content));
+ std::unique_ptr<UTFGridRenderer> dr(new UTFGridRenderer(&content));
RSMgSymbolManager mgr(m_svcResource);
dr->SetSymbolManager(&mgr);
More information about the mapguide-commits
mailing list