[Liblas-commits] r1226 - trunk/src

[liblas-commits at liblas.org]

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

Log:
* In C API, 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/src/las_c_api.cpp

Modified: trunk/src/las_c_api.cpp
==============================================================================
--- trunk/src/las_c_api.cpp	(original)
+++ trunk/src/las_c_api.cpp	Thu Apr 16 12:50:54 2009
@@ -1696,13 +1696,13 @@
     }
 }
 
-LAS_DLL LASErrorEnum LASSRS_SetGTIF(LASSRSH hSRS, const GTIF* gtiff, const ST_TIFF* tiff)
+LAS_DLL LASErrorEnum LASSRS_SetGTIF(LASSRSH hSRS, const GTIF* pgtiff, const ST_TIFF* ptiff)
 {
     VALIDATE_LAS_POINTER1(hSRS, "LASSRS_SetGTIF", LE_Failure);
-    VALIDATE_LAS_POINTER1(gtiff, "LASSRS_SetGTIF", LE_Failure);
-    VALIDATE_LAS_POINTER1(tiff, "LASSRS_SetGTIF", LE_Failure);
+    VALIDATE_LAS_POINTER1(pgtiff, "LASSRS_SetGTIF", LE_Failure);
+    VALIDATE_LAS_POINTER1(ptiff, "LASSRS_SetGTIF", LE_Failure);
     try {
-        ((LASSpatialReference*) hSRS)->SetGTIF(gtiff, tiff);
+        ((LASSpatialReference*) hSRS)->SetGTIF(pgtiff, ptiff);
     }
     catch (std::exception const& e) {
         LASError_PushError(LE_Failure, e.what(), "LASSRS_SetGTIF");