Skip to content

Commit

Permalink
Replace uses of cpl::make_unique<> with std::make_unique<>
Browse files Browse the repository at this point in the history
  • Loading branch information
@rouault
rouault committed Nov 14, 2023
1 parent 1cfd678 commit dd3a3c0
Show file tree
Hide file tree
Showing 176 changed files with 542 additions and 542 deletions.
4 changes: 2 additions & 2 deletions alg/gdalgeoloc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ void GDALGeoLoc<Accessors>::LoadGeolocFinish(
poRing->addPoint(x1 > 0 ? x1 : x1 + 360, y1);
poRing->addPoint(x0 > 0 ? x0 : x0 + 360, y0);
poPoly->addRingDirectly(poRing);
auto poFeature = cpl::make_unique<OGRFeature>(poLayerDefn);
auto poFeature = std::make_unique<OGRFeature>(poLayerDefn);
poFeature->SetField(0, static_cast<int>(iX));
poFeature->SetField(1, static_cast<int>(iY));
poFeature->SetGeometryDirectly(poPoly);
Expand All @@ -283,7 +283,7 @@ void GDALGeoLoc<Accessors>::LoadGeolocFinish(
poRing->addPoint(x1, y1);
poRing->addPoint(x0, y0);
poPoly->addRingDirectly(poRing);
auto poFeature = cpl::make_unique<OGRFeature>(poLayerDefn);
auto poFeature = std::make_unique<OGRFeature>(poLayerDefn);
poFeature->SetField(0, static_cast<int>(iX));
poFeature->SetField(1, static_cast<int>(iY));
poFeature->SetGeometryDirectly(poPoly);
Expand Down
2 changes: 1 addition & 1 deletion alg/gdaltransformer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ CPLErr CPL_STDCALL GDALSuggestedWarpOutput2(GDALDatasetH hSrcDS,
{
// CHECK_WITH_INVERT_PROJ=YES prevent reliable
// transformation of poles.
poSetter = cpl::make_unique<CPLConfigOptionSetter>(
poSetter = std::make_unique<CPLConfigOptionSetter>(
"CHECK_WITH_INVERT_PROJ", "NO", false);
GDALRefreshGenImgProjTransformer(pTransformArg);
// GDALRefreshGenImgProjTransformer() has invalidated psRTI
Expand Down
28 changes: 14 additions & 14 deletions apps/gdal_footprint_lib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ static bool GDALFootprintProcess(GDALDataset *poSrcDS, OGRLayer *poDstLayer,
{
bGlobalMask = false;
apoTmpNoDataMaskBands.emplace_back(
cpl::make_unique<GDALNoDataMaskBand>(
std::make_unique<GDALNoDataMaskBand>(
poBand, adfSrcNoData.size() == 1 ? adfSrcNoData[0]
: adfSrcNoData[i]));
apoSrcMaskBands.push_back(apoTmpNoDataMaskBands.back().get());
Expand Down Expand Up @@ -798,7 +798,7 @@ static bool GDALFootprintProcess(GDALDataset *poSrcDS, OGRLayer *poDstLayer,
double(poSrcDS->GetRasterXSize()) / poMaskBand->GetXSize();
adfGeoTransform[5] *=
double(poSrcDS->GetRasterYSize()) / poMaskBand->GetYSize();
poCT_GT = cpl::make_unique<GeoTransformCoordinateTransformation>(
poCT_GT = std::make_unique<GeoTransformCoordinateTransformation>(
adfGeoTransform);
}
else if (psOptions->bOutCSGeorefRequested)
Expand All @@ -819,24 +819,24 @@ static bool GDALFootprintProcess(GDALDataset *poSrcDS, OGRLayer *poDstLayer,
adfGeoTransform[4] = 0;
adfGeoTransform[5] =
double(poSrcDS->GetRasterYSize()) / poMaskBand->GetYSize();
poCT_GT = cpl::make_unique<GeoTransformCoordinateTransformation>(
poCT_GT = std::make_unique<GeoTransformCoordinateTransformation>(
adfGeoTransform);
}

std::unique_ptr<GDALRasterBand> poMaskForRasterize;
if (bGlobalMask || anBands.size() == 1)
{
poMaskForRasterize =
cpl::make_unique<GDALFootprintMaskBand>(apoSrcMaskBands[0]);
std::make_unique<GDALFootprintMaskBand>(apoSrcMaskBands[0]);
}
else
{
poMaskForRasterize = cpl::make_unique<GDALFootprintCombinedMaskBand>(
poMaskForRasterize = std::make_unique<GDALFootprintCombinedMaskBand>(
apoSrcMaskBands, psOptions->bCombineBandsUnion);
}

auto hBand = GDALRasterBand::ToHandle(poMaskForRasterize.get());
auto poMemLayer = cpl::make_unique<OGRMemLayer>("", nullptr, wkbUnknown);
auto poMemLayer = std::make_unique<OGRMemLayer>("", nullptr, wkbUnknown);
const CPLErr eErr =
GDALPolygonize(hBand, hBand, OGRLayer::ToHandle(poMemLayer.get()),
/* iPixValField = */ -1,
Expand All @@ -849,7 +849,7 @@ static bool GDALFootprintProcess(GDALDataset *poSrcDS, OGRLayer *poDstLayer,

if (!psOptions->bSplitPolys)
{
auto poMP = cpl::make_unique<OGRMultiPolygon>();
auto poMP = std::make_unique<OGRMultiPolygon>();
for (auto &&poFeature : poMemLayer.get())
{
auto poGeom =
Expand All @@ -860,9 +860,9 @@ static bool GDALFootprintProcess(GDALDataset *poSrcDS, OGRLayer *poDstLayer,
poMP->addGeometryDirectly(poGeom.release());
}
}
poMemLayer = cpl::make_unique<OGRMemLayer>("", nullptr, wkbUnknown);
poMemLayer = std::make_unique<OGRMemLayer>("", nullptr, wkbUnknown);
auto poFeature =
cpl::make_unique<OGRFeature>(poMemLayer->GetLayerDefn());
std::make_unique<OGRFeature>(poMemLayer->GetLayerDefn());
poFeature->SetGeometryDirectly(poMP.release());
CPL_IGNORE_RET_VAL(poMemLayer->CreateFeature(poFeature.get()));
}
Expand All @@ -875,7 +875,7 @@ static bool GDALFootprintProcess(GDALDataset *poSrcDS, OGRLayer *poDstLayer,
continue;

auto poDstFeature =
cpl::make_unique<OGRFeature>(poDstLayer->GetLayerDefn());
std::make_unique<OGRFeature>(poDstLayer->GetLayerDefn());
poDstFeature->SetFrom(poFeature.get());

if (poCT_GT)
Expand Down Expand Up @@ -912,10 +912,10 @@ static bool GDALFootprintProcess(GDALDataset *poSrcDS, OGRLayer *poDstLayer,
{
if (poGeom->getGeometryType() == wkbMultiPolygon)
{
auto poMP = cpl::make_unique<OGRMultiPolygon>();
auto poMP = std::make_unique<OGRMultiPolygon>();
for (auto *poPoly : poGeom->toMultiPolygon())
{
auto poNewPoly = cpl::make_unique<OGRPolygon>();
auto poNewPoly = std::make_unique<OGRPolygon>();
for (auto *poRing : poPoly)
{
if (poRing->get_Area() >= psOptions->dfMinRingArea)
Expand All @@ -930,7 +930,7 @@ static bool GDALFootprintProcess(GDALDataset *poSrcDS, OGRLayer *poDstLayer,
}
else if (poGeom->getGeometryType() == wkbPolygon)
{
auto poNewPoly = cpl::make_unique<OGRPolygon>();
auto poNewPoly = std::make_unique<OGRPolygon>();
for (auto *poRing : poGeom->toPolygon())
{
if (poRing->get_Area() >= psOptions->dfMinRingArea)
Expand Down Expand Up @@ -1145,7 +1145,7 @@ GDALFootprintOptions *
GDALFootprintOptionsNew(char **papszArgv,
GDALFootprintOptionsForBinary *psOptionsForBinary)
{
auto psOptions = cpl::make_unique<GDALFootprintOptions>();
auto psOptions = std::make_unique<GDALFootprintOptions>();

bool bGotSourceFilename = false;
bool bGotDestFilename = false;
Expand Down
2 changes: 1 addition & 1 deletion apps/gdalmdimtranslate_lib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ static bool TranslateArray(
if (!bSrcArrayAccessibleThroughSrcGroup &&
tmpArray->IsRegularlySpaced(dfStart, dfIncrement))
{
auto poSource = cpl::make_unique<VRTMDArraySourceRegularlySpaced>(
auto poSource = std::make_unique<VRTMDArraySourceRegularlySpaced>(
dfStart, dfIncrement);
dstArrayVRT->AddSource(std::move(poSource));
}
Expand Down
12 changes: 6 additions & 6 deletions apps/gdalwarp_lib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ static CPLErr CropToCutline(const OGRGeometry *poCutline, CSLConstList papszTO,
GetSrcDSProjection(nSrcCount > 0 ? pahSrcDS[0] : nullptr, papszTO);
if (!osThisSourceSRS.empty())
{
poSrcSRS = cpl::make_unique<OGRSpatialReference>();
poSrcSRS = std::make_unique<OGRSpatialReference>();
poSrcSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
if (poSrcSRS->SetFromUserInput(osThisSourceSRS) != OGRERR_NONE)
{
Expand Down Expand Up @@ -492,7 +492,7 @@ static CPLErr CropToCutline(const OGRGeometry *poCutline, CSLConstList papszTO,

if (pszThisTargetSRS)
{
poDstSRS = cpl::make_unique<OGRSpatialReference>();
poDstSRS = std::make_unique<OGRSpatialReference>();
poDstSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
if (poDstSRS->SetFromUserInput(pszThisTargetSRS) != OGRERR_NONE)
{
Expand Down Expand Up @@ -3336,7 +3336,7 @@ static CPLErr LoadCutline(const std::string &osCutlineDSName,
/* Collect the geometries from this layer, and build list of */
/* burn values. */
/* -------------------------------------------------------------------- */
auto poMultiPolygon = cpl::make_unique<OGRMultiPolygon>();
auto poMultiPolygon = std::make_unique<OGRMultiPolygon>();

for (auto &&poFeature : poLayer)
{
Expand Down Expand Up @@ -4776,7 +4776,7 @@ static CPLErr TransformCutlineToSource(GDALDataset *poSrcDS,
GetSrcDSProjection(GDALDataset::ToHandle(poSrcDS), papszTO_In);
if (!osProjection.empty())
{
poRasterSRS = cpl::make_unique<OGRSpatialReference>();
poRasterSRS = std::make_unique<OGRSpatialReference>();
poRasterSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
if (poRasterSRS->SetFromUserInput(osProjection) != OGRERR_NONE)
{
Expand All @@ -4788,7 +4788,7 @@ static CPLErr TransformCutlineToSource(GDALDataset *poSrcDS,
const char *pszThisTargetSRS = CSLFetchNameValue(papszTO_In, "DST_SRS");
if (pszThisTargetSRS)
{
poDstSRS = cpl::make_unique<OGRSpatialReference>();
poDstSRS = std::make_unique<OGRSpatialReference>();
poDstSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
if (poDstSRS->SetFromUserInput(pszThisTargetSRS) != OGRERR_NONE)
{
Expand Down Expand Up @@ -5204,7 +5204,7 @@ GDALWarpAppOptions *
GDALWarpAppOptionsNew(char **papszArgv,
GDALWarpAppOptionsForBinary *psOptionsForBinary)
{
auto psOptions = cpl::make_unique<GDALWarpAppOptions>();
auto psOptions = std::make_unique<GDALWarpAppOptions>();

/* -------------------------------------------------------------------- */
/* Parse arguments. */
Expand Down
4 changes: 2 additions & 2 deletions apps/nearblack_lib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ GDALDatasetH CPL_DLL GDALNearblack(const char *pszDest, GDALDatasetH hDstDS,
const GDALNearblackOptions *psOptions = psOptionsIn;
if (!psOptionsIn)
{
psTmpOptions = cpl::make_unique<GDALNearblackOptions>();
psTmpOptions = std::make_unique<GDALNearblackOptions>();
psOptions = psTmpOptions.get();
}

Expand Down Expand Up @@ -769,7 +769,7 @@ GDALNearblackOptions *
GDALNearblackOptionsNew(char **papszArgv,
GDALNearblackOptionsForBinary *psOptionsForBinary)
{
auto psOptions = cpl::make_unique<GDALNearblackOptions>();
auto psOptions = std::make_unique<GDALNearblackOptions>();

/* -------------------------------------------------------------------- */
/* Handle command line arguments. */
Expand Down
6 changes: 3 additions & 3 deletions apps/ogr2ogr_lib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2166,8 +2166,8 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
}

auto psOptions =
psOptionsIn ? cpl::make_unique<GDALVectorTranslateOptions>(*psOptionsIn)
: cpl::make_unique<GDALVectorTranslateOptions>();
psOptionsIn ? std::make_unique<GDALVectorTranslateOptions>(*psOptionsIn)
: std::make_unique<GDALVectorTranslateOptions>();

bool bAppend = false;
bool bUpdate = false;
Expand Down Expand Up @@ -6466,7 +6466,7 @@ static bool CheckHasEnoughAdditionalArgs(CSLConstList papszArgv, int i,
GDALVectorTranslateOptions *GDALVectorTranslateOptionsNew(
char **papszArgv, GDALVectorTranslateOptionsForBinary *psOptionsForBinary)
{
auto psOptions = cpl::make_unique<GDALVectorTranslateOptions>();
auto psOptions = std::make_unique<GDALVectorTranslateOptions>();

int nArgc = CSLCount(papszArgv);
for (int i = 0; papszArgv != nullptr && i < nArgc; i++)
Expand Down
2 changes: 1 addition & 1 deletion apps/ogrinfo_bin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ MAIN_START(argc, argv)
argv = CSLAddString(argv, "-stdout");

auto psOptionsForBinary =
cpl::make_unique<GDALVectorInfoOptionsForBinary>();
std::make_unique<GDALVectorInfoOptionsForBinary>();

GDALVectorInfoOptions *psOptions =
GDALVectorInfoOptionsNew(argv + 1, psOptionsForBinary.get());
Expand Down
4 changes: 2 additions & 2 deletions apps/ogrinfo_lib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2030,7 +2030,7 @@ GDALVectorInfoOptions *
GDALVectorInfoOptionsNew(char **papszArgv,
GDALVectorInfoOptionsForBinary *psOptionsForBinary)
{
auto psOptions = cpl::make_unique<GDALVectorInfoOptions>();
auto psOptions = std::make_unique<GDALVectorInfoOptions>();
bool bGotFilename = false;
bool bFeatures = false;
bool bSummary = false;
Expand Down Expand Up @@ -2095,7 +2095,7 @@ GDALVectorInfoOptionsNew(char **papszArgv,
oRing.addPoint(CPLAtof(papszArgv[iArg + 1]),
CPLAtof(papszArgv[iArg + 2]));

auto poPolygon = cpl::make_unique<OGRPolygon>();
auto poPolygon = std::make_unique<OGRPolygon>();
poPolygon->addRing(&oRing);
psOptions->poSpatialFilter.reset(poPolygon.release());
iArg += 4;
Expand Down
4 changes: 2 additions & 2 deletions autotest/cpp/test_ogr_swq.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ TEST_F(test_ogr_swq, basic)
swq_expr_node(SWQ_OR),
swq_expr_node(SWQ_NOT),
swq_expr_node(static_cast<OGRGeometry *>(nullptr)),
swq_expr_node(cpl::make_unique<OGRPoint>(1, 2).get()),
swq_expr_node(cpl::make_unique<OGRPoint>(1, 3).get()),
swq_expr_node(std::make_unique<OGRPoint>(1, 2).get()),
swq_expr_node(std::make_unique<OGRPoint>(1, 3).get()),
};
{
auto node = swq_expr_node(SWQ_NOT);
Expand Down
2 changes: 1 addition & 1 deletion frmts/arg/argdataset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ GDALDataset *ARGDataset::Open(GDALOpenInfo *poOpenInfo)
/* -------------------------------------------------------------------- */
/* Create a corresponding GDALDataset. */
/* -------------------------------------------------------------------- */
auto poDS = cpl::make_unique<ARGDataset>();
auto poDS = std::make_unique<ARGDataset>();

poDS->pszFilename = CPLStrdup(poOpenInfo->pszFilename);
poDS->SetMetadataItem("LAYER", pszLayer, nullptr);
Expand Down
4 changes: 2 additions & 2 deletions frmts/basisu_ktx2/basisudataset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ GDALDataset *BASISUDataset::Open(GDALOpenInfo *poOpenInfo)
}
const uint32_t nSize = static_cast<uint32_t>(nSizeLarge);

auto poDS = cpl::make_unique<BASISUDataset>(
auto poDS = std::make_unique<BASISUDataset>(
nImageIdx != static_cast<uint32_t>(-1) ? nImageIdx : 0, pabyRet, nSize);
auto &transcoder = poDS->m_transcoder;
basist::basisu_file_info file_info;
Expand Down Expand Up @@ -376,7 +376,7 @@ GDALDataset *BASISUDataset::Open(GDALOpenInfo *poOpenInfo)
poDS->m_iImageIdx, level_index))
{
auto poOverviewDS =
cpl::make_unique<BASISUDataset>(poDS.get(), level_index);
std::make_unique<BASISUDataset>(poDS.get(), level_index);
for (int i = 1; i <= l_nBands; ++i)
{
poOverviewDS->SetBand(
Expand Down
4 changes: 2 additions & 2 deletions frmts/basisu_ktx2/ktx2dataset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ GDALDataset *KTX2Dataset::Open(GDALOpenInfo *poOpenInfo)
}
const uint32_t nSize = static_cast<uint32_t>(nSizeLarge);

auto poDS = cpl::make_unique<KTX2Dataset>(
auto poDS = std::make_unique<KTX2Dataset>(
nLayer != static_cast<uint32_t>(-1) ? nLayer : 0,
nFace != static_cast<uint32_t>(-1) ? nFace : 0, pabyRet);
auto &transcoder = poDS->m_transcoder;
Expand Down Expand Up @@ -409,7 +409,7 @@ GDALDataset *KTX2Dataset::Open(GDALOpenInfo *poOpenInfo)
if (level_index > 0)
{
auto poOverviewDS =
cpl::make_unique<KTX2Dataset>(poDS.get(), level_index);
std::make_unique<KTX2Dataset>(poDS.get(), level_index);
for (int i = 1; i <= l_nBands; ++i)
{
poOverviewDS->SetBand(
Expand Down
2 changes: 1 addition & 1 deletion frmts/blx/blxdataset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ GDALDataset *BLXDataset::Open(GDALOpenInfo *poOpenInfo)
// Create overview bands
for (int i = 0; i < BLX_OVERVIEWLEVELS; i++)
{
poDS->apoOverviewDS.emplace_back(cpl::make_unique<BLXDataset>());
poDS->apoOverviewDS.emplace_back(std::make_unique<BLXDataset>());
poDS->apoOverviewDS[i]->blxcontext = poDS->blxcontext;
poDS->apoOverviewDS[i]->bIsOverview = true;
poDS->apoOverviewDS[i]->nRasterXSize = poDS->nRasterXSize >> (i + 1);
Expand Down
2 changes: 1 addition & 1 deletion frmts/ceos2/sar_ceosdataset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1813,7 +1813,7 @@ GDALDataset *SAR_CEOSDataset::Open(GDALOpenInfo *poOpenInfo)
/* Create a corresponding GDALDataset. */
/* -------------------------------------------------------------------- */

auto poDS = cpl::make_unique<SAR_CEOSDataset>();
auto poDS = std::make_unique<SAR_CEOSDataset>();
std::swap(poDS->fpImage, poOpenInfo->fpL);

CeosSARVolume_t *psVolume = &(poDS->sVolume);
Expand Down
4 changes: 2 additions & 2 deletions frmts/daas/daasdataset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,7 @@ bool GDALDAASDataset::Open(GDALOpenInfo *poOpenInfo)
break;
}
m_apoOverviewDS.push_back(
cpl::make_unique<GDALDAASDataset>(this, iOvr));
std::make_unique<GDALDAASDataset>(this, iOvr));
}

return true;
Expand All @@ -1334,7 +1334,7 @@ GDALDataset *GDALDAASDataset::OpenStatic(GDALOpenInfo *poOpenInfo)
if (!Identify(poOpenInfo))
return nullptr;

auto poDS = cpl::make_unique<GDALDAASDataset>();
auto poDS = std::make_unique<GDALDAASDataset>();
if (!poDS->Open(poOpenInfo))
return nullptr;
return poDS.release();
Expand Down
2 changes: 1 addition & 1 deletion frmts/envisat/envisatdataset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ GDALDataset *EnvisatDataset::Open(GDALOpenInfo *poOpenInfo)
/* -------------------------------------------------------------------- */
/* Create a corresponding GDALDataset. */
/* -------------------------------------------------------------------- */
auto poDS = cpl::make_unique<EnvisatDataset>();
auto poDS = std::make_unique<EnvisatDataset>();

poDS->hEnvisatFile = hEnvisatFile;

Expand Down
4 changes: 2 additions & 2 deletions frmts/ers/ersdataset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ GDALDataset *ERSDataset::Open(GDALOpenInfo *poOpenInfo)
/* -------------------------------------------------------------------- */
/* Create a corresponding GDALDataset. */
/* -------------------------------------------------------------------- */
auto poDS = cpl::make_unique<ERSDataset>();
auto poDS = std::make_unique<ERSDataset>();
poDS->poHeader = poHeader;
poDS->eAccess = poOpenInfo->eAccess;

Expand Down Expand Up @@ -1092,7 +1092,7 @@ GDALDataset *ERSDataset::Open(GDALOpenInfo *poOpenInfo)
for (int iBand = 0; iBand < nBands; iBand++)
{
// Assume pixel interleaved.
auto poBand = cpl::make_unique<ERSRasterBand>(
auto poBand = std::make_unique<ERSRasterBand>(
poDS.get(), iBand + 1, poDS->fpImage,
nHeaderOffset + iWordSize * iBand * poDS->nRasterXSize,
iWordSize, iWordSize * nBands * poDS->nRasterXSize, eType,
Expand Down
4 changes: 2 additions & 2 deletions frmts/exr/exrdataset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ GDALDataset *GDALEXRDataset::Open(GDALOpenInfo *poOpenInfo)

try
{
auto poDS = cpl::make_unique<GDALEXRDataset>();
auto poDS = std::make_unique<GDALEXRDataset>();
poDS->m_pIStream.reset(new GDALEXRIOStream(fp, osFilename));
poDS->m_pMPIF.reset(new MultiPartInputFile(*poDS->m_pIStream));
if (iPart > 0 && iPart > poDS->m_pMPIF->parts())
Expand Down Expand Up @@ -742,7 +742,7 @@ GDALDataset *GDALEXRDataset::Open(GDALOpenInfo *poOpenInfo)
{
break;
}
auto poOvrDS = cpl::make_unique<GDALEXRDataset>();
auto poOvrDS = std::make_unique<GDALEXRDataset>();
// coverity[escape]
poOvrDS->m_poParent = poDS.get();
poOvrDS->m_iLevel = iLevel;
Expand Down
Loading

0 comments on commit dd3a3c0

Please sign in to comment.