iuse GTIFGetOGISDefn and GTIFSetFromOGISDefn from GDAL.

Don't define any TIFF/GeoTIFF objects if we don't have them because newer versions of GDAL might be totally renaming them.
PDAL · Jan 10, 2016 · 833c96e · 833c96e
1 parent 7948cab
commit 833c96e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/io/las/GeotiffSupport.cpp b/io/las/GeotiffSupport.cpp
@@ -41,12 +41,12 @@
 #include <sstream>
 
 PDAL_C_START
-#ifdef __geotiff_h_
 
-char PDAL_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*);
-int PDAL_DLL GTIFSetFromOGISDefn(GTIF*, const char*);
+// These functions are available from GDAL, but they
+// aren't exported.
+char CPL_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*);
+int CPL_DLL GTIFSetFromOGISDefn(GTIF*, const char*);
 
-#endif // defined __geotiff_h_
 PDAL_C_END
 
 
@@ -105,7 +105,7 @@ int GeotiffSupport::setKey(int tag, void *data, int size, int type)
         count = size / sizeof(double);
         break;
     default:
-        count = size; 
+        count = size;
         break;
     }
     return ST_SetKey(m_tiff, tag, count, type, data);

diff --git a/io/las/GeotiffSupport.hpp b/io/las/GeotiffSupport.hpp
@@ -45,14 +45,6 @@
 #include <cpl_conv.h>
 #endif
 
-// Fake out the compiler if we don't have libgeotiff includes already
-#if !defined(__geotiff_h_)
-typedef struct GTIFS *GTIF;
-#endif
-#if !defined(__geo_simpletags_h_)
-typedef struct ST_TIFFS *ST_TIFF;
-#endif
-
 #include <string>
 #include <stdexcept>
 
@@ -65,7 +57,7 @@ class PDAL_DLL GeotiffSupport
     GeotiffSupport() : m_gtiff(0), m_tiff(0)
     {}
     ~GeotiffSupport();
-    
+
     void resetTags();
     int setKey(int tag, void *data, int size, int type);
     size_t getKey(int tag, int *count, void **data_ptr) const;