File tree 1 file changed +8
-2
lines changed
1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change 34
34
35
35
#define SERIALIZER () OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock (_serializerMutex)
36
36
37
+ #if __cplusplus > 199711L
38
+ #define smart_ptr std::unique_ptr
39
+ #else
40
+ #define smart_ptr std::auto_ptr
41
+ #endif
42
+
37
43
// From easyrgb.com
38
44
float Hue_2_RGB ( float v1, float v2, float vH )
39
45
{
@@ -123,7 +129,7 @@ class ReaderWriterGDAL : public osgDB::ReaderWriter
123
129
124
130
initGDAL ();
125
131
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));
127
133
if (!dataset.get ()) return ReadResult::FILE_NOT_HANDLED;
128
134
129
135
int dataWidth = dataset->GetRasterXSize ();
@@ -577,7 +583,7 @@ class ReaderWriterGDAL : public osgDB::ReaderWriter
577
583
578
584
initGDAL ();
579
585
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));
581
587
if (!dataset.get ()) return ReadResult::FILE_NOT_HANDLED;
582
588
583
589
int dataWidth = dataset->GetRasterXSize ();
You can’t perform that action at this time.
0 commit comments