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

[liblas-commits at liblas.org]

Author: hobu
Date: Tue Mar 10 16:17:35 2009
New Revision: 1091
URL: http://liblas.org/changeset/1091

Log:
there is no such thing as a TIFF*, clean up cases for when we don't have libgeotiff

Modified:
   trunk/apps/lascommon.c
   trunk/include/liblas/lassrs.hpp
   trunk/src/las_c_api.cpp
   trunk/src/lassrs.cpp

Modified: trunk/apps/lascommon.c
==============================================================================
--- trunk/apps/lascommon.c	(original)
+++ trunk/apps/lascommon.c	Tue Mar 10 16:17:35 2009
@@ -505,9 +505,9 @@
     
     fprintf(file, " Spatial Reference           %s\n",
                     pszProj4);
-
+#ifdef HAVE_LIBGEOTIFF
     if (pGTIF) GTIFPrint((GTIF*)pGTIF, 0, 0);
-
+#endif
     if (nVLR && !bSkipVLR) {
         
     fprintf(file, "\n---------------------------------------------------------\n");

Modified: trunk/include/liblas/lassrs.hpp
==============================================================================
--- trunk/include/liblas/lassrs.hpp	(original)
+++ trunk/include/liblas/lassrs.hpp	Tue Mar 10 16:17:35 2009
@@ -117,7 +117,7 @@
     /// you have libgeotiff linked in.
     const GTIF* GetGTIF();
     
-    void SetGTIF(const GTIF* gtiff, const TIFF* tiff);
+    void SetGTIF(const GTIF* gtiff, const ST_TIFF* tiff);
 
     /// Returns the OGC WKT describing Spatial Reference System.
     /// If GDAL is linked, it uses GDAL's operations and methods to determine 

Modified: trunk/src/las_c_api.cpp
==============================================================================
--- trunk/src/las_c_api.cpp	(original)
+++ trunk/src/las_c_api.cpp	Tue Mar 10 16:17:35 2009
@@ -1681,7 +1681,7 @@
     }
 }
 
-LAS_DLL LASErrorEnum LASSRS_SetGTIF(LASSRSH hSRS, const GTIF* gtiff, const TIFF* tiff)
+LAS_DLL LASErrorEnum LASSRS_SetGTIF(LASSRSH hSRS, const GTIF* gtiff, const ST_TIFF* tiff)
 {
     VALIDATE_POINTER1(hSRS, "LASSRS_SetGTIF", LE_Failure);
     VALIDATE_POINTER1(gtiff, "LASSRS_SetGTIF", LE_Failure);

Modified: trunk/src/lassrs.cpp
==============================================================================
--- trunk/src/lassrs.cpp	(original)
+++ trunk/src/lassrs.cpp	Tue Mar 10 16:17:35 2009
@@ -302,7 +302,7 @@
 #endif // ndef HAVE_LIBGEOTIFF
 }
 
-void LASSRS::SetGTIF(const GTIF* gtiff, const TIFF* tiff) 
+void LASSRS::SetGTIF(const GTIF* gtiff, const ST_TIFF* tiff) 
 {
     m_gtiff = (GTIF*)gtiff;
     m_tiff = (ST_TIFF*)tiff;