[Liblas-commits] r1224 - in trunk: include/liblas src

[liblas-commits at liblas.org]

Author: mloskot
Date: Thu Apr 16 12:48:50 2009
New Revision: 1224
URL: http://liblas.org/changeset/1224

Log:
* Renamed gtiff to pgtiff and tiff to ptiff - gtiff is used in libgeotiff as type name.
* Prevent from defining fake types of libgeotiff and libtiff if these headers are implicitly included by GDAL/OGR.

Modified:
   trunk/include/liblas/lasspatialreference.hpp
   trunk/src/lasspatialreference.cpp

Modified: trunk/include/liblas/lasspatialreference.hpp
==============================================================================
--- trunk/include/liblas/lasspatialreference.hpp	(original)
+++ trunk/include/liblas/lasspatialreference.hpp	Thu Apr 16 12:48:50 2009
@@ -51,28 +51,26 @@
 
 // GDAL OSR
 #ifdef HAVE_GDAL
-#include "ogr_srs_api.h"
-#include "cpl_port.h"
-#include "cpl_serv.h"
-#include "geo_tiffp.h"
+#include <ogr_srs_api.h>
+#include <cpl_port.h>
+#include <cpl_serv.h>
+#include <geo_tiffp.h>
 #define CPL_ERROR_H_INCLUDED
-
-#include "geo_normalize.h"
-#include "geovalues.h"
-#include "ogr_spatialref.h"
-#include "gdal.h"
-#include "xtiffio.h"
-#include "cpl_multiproc.h"
-
+#include <geo_normalize.h>
+#include <geovalues.h>
+#include <ogr_spatialref.h>
+#include <gdal.h>
+#include <xtiffio.h>
+#include <cpl_multiproc.h>
 #endif
 
 // GeoTIFF
 #ifdef HAVE_LIBGEOTIFF
-#include "geotiff.h"
-#include "geo_simpletags.h"
-#include "geo_normalize.h"
-#include "geo_simpletags.h"
-#include "geovalues.h"
+#include <geotiff.h>
+#include <geo_simpletags.h>
+#include <geo_normalize.h>
+#include <geo_simpletags.h>
+#include <geovalues.h>
 #endif // HAVE_LIBGEOTIFF
 
 // std
@@ -81,9 +79,9 @@
 #include <string>
 
 // Fake out the compiler if we don't have libgeotiff
-#ifndef HAVE_LIBGEOTIFF
-typedef struct GTIFS * GTIF;
-typedef struct ST_TIFFS * ST_TIFF;
+#if !defined(LIBGEOTIFF_VERSION) && !defined(HAVE_LIBGEOTIFF)
+typedef struct GTIFS *GTIF;
+typedef struct ST_TIFFS *ST_TIFF;
 #endif
 
 namespace liblas {
@@ -112,8 +110,8 @@
     /// Returns a pointer to the internal GTIF*.  Only available if 
     /// you have libgeotiff linked in.
     const GTIF* GetGTIF();
-    
-    void SetGTIF(const GTIF* gtiff, const ST_TIFF* tiff);
+
+    void SetGTIF(const GTIF* pgtiff, const ST_TIFF* ptiff);
 
     /// Returns the OGC WKT describing Spatial Reference System.
     /// If GDAL is linked, it uses GDAL's operations and methods to determine 

Modified: trunk/src/lasspatialreference.cpp
==============================================================================
--- trunk/src/lasspatialreference.cpp	(original)
+++ trunk/src/lasspatialreference.cpp	Thu Apr 16 12:48:50 2009
@@ -290,10 +290,10 @@
 #endif // ndef HAVE_LIBGEOTIFF
 }
 
-void LASSpatialReference::SetGTIF(const GTIF* gtiff, const ST_TIFF* tiff) 
+void LASSpatialReference::SetGTIF(const GTIF* pgtiff, const ST_TIFF* ptiff) 
 {
-    m_gtiff = (GTIF*)gtiff;
-    m_tiff = (ST_TIFF*)tiff;
+    m_gtiff = (GTIF*)pgtiff;
+    m_tiff = (ST_TIFF*)ptiff;
     ResetVLRs();
     m_gtiff = NULL;
     m_tiff = NULL;