Skip to content

Commit 53e00d9

Browse files
fix
1 parent 2e4ae2e commit 53e00d9

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/osgPlugins/gdal/ReaderWriterGDAL.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434

3535
#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)
3636

37+
#if __cplusplus > 199711L
38+
#define smart_ptr std::unique_ptr
39+
#else
40+
#define smart_ptr std::auto_ptr
41+
#endif
42+
3743
// From easyrgb.com
3844
float Hue_2_RGB( float v1, float v2, float vH )
3945
{
@@ -123,7 +129,7 @@ class ReaderWriterGDAL : public osgDB::ReaderWriter
123129

124130
initGDAL();
125131

126-
std::auto_ptr<GDALDataset> dataset((GDALDataset*)GDALOpen(fileName.c_str(),GA_ReadOnly));
132+
smart_ptr<GDALDataset> dataset((GDALDataset*)GDALOpen(fileName.c_str(),GA_ReadOnly));
127133
if (!dataset.get()) return ReadResult::FILE_NOT_HANDLED;
128134

129135
int dataWidth = dataset->GetRasterXSize();
@@ -577,7 +583,7 @@ class ReaderWriterGDAL : public osgDB::ReaderWriter
577583

578584
initGDAL();
579585

580-
std::auto_ptr<GDALDataset> dataset((GDALDataset*)GDALOpen(fileName.c_str(),GA_ReadOnly));
586+
smart_ptr<GDALDataset> dataset((GDALDataset*)GDALOpen(fileName.c_str(),GA_ReadOnly));
581587
if (!dataset.get()) return ReadResult::FILE_NOT_HANDLED;
582588

583589
int dataWidth = dataset->GetRasterXSize();

0 commit comments

Comments
 (0)