blob: 047fa463a5c7586105590fa0ac97a6cbbe3b2083 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
diff --git a/src/osgEarth/GDAL.cpp b/src/osgEarth/GDAL.cpp
index 9f1e7b67b..a9590a6be 100644
--- a/src/osgEarth/GDAL.cpp
+++ b/src/osgEarth/GDAL.cpp
@@ -49,8 +49,6 @@
#include <cpl_string.h>
#include <gdal_alg_priv.h>
-using namespace osgEarth;
-using namespace osgEarth::GDAL;
#undef LC
#define LC "[GDAL] "
@@ -59,7 +57,7 @@ using namespace osgEarth::GDAL;
namespace osgEarth
{
- namespace GDAL
+ namespace
{
// From easyrgb.com
inline float Hue_2_RGB(float v1, float v2, float vH)
@@ -417,7 +415,6 @@ namespace osgEarth
return (err == CE_None);
}
}
-} // namespace osgEarth::GDAL
//...................................................................
@@ -2244,6 +2241,8 @@ GDALElevationLayer::createHeightFieldImplementation(const TileKey& key, Progress
return GeoHeightField::INVALID;
}
+} // namespace osgearth
+
//...................................................................
|
