[Liblas-commits] r1021 - in trunk: . apps include include/liblas

[liblas-commits at liblas.org]

Author: hobu
Date: Fri Feb 13 22:07:14 2009
New Revision: 1021
URL: http://liblas.org/changeset/1021

Log:
more LASSRS stuff

Modified:
   trunk/Makefile.am
   trunk/apps/Makefile.am
   trunk/include/Makefile.am
   trunk/include/liblas/lassrs.hpp

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Feb 13 22:07:14 2009
@@ -1 +1,11 @@
 SUBDIRS = src apps include test
+
+if GDAL_IS_CONFIG
+GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1
+endif
+
+if GEOTIFF_IS_CONFIG
+GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1
+endif
+
+AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail

Modified: trunk/apps/Makefile.am
==============================================================================
--- trunk/apps/Makefile.am	(original)
+++ trunk/apps/Makefile.am	Fri Feb 13 22:07:14 2009
@@ -2,7 +2,11 @@
 GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1
 endif
 
-AM_CPPFLAGS = $(GDAL_CPPFLAGS) -I../include/liblas/capi -I../include
+if GEOTIFF_IS_CONFIG
+GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1
+endif
+
+AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include/liblas/capi -I../include
 
 lasinfo_SOURCES = lasinfo.c lascommon.c
 las2las_SOURCES = las2las.c lascommon.c

Modified: trunk/include/Makefile.am
==============================================================================
--- trunk/include/Makefile.am	(original)
+++ trunk/include/Makefile.am	Fri Feb 13 22:07:14 2009
@@ -4,12 +4,14 @@
                     liblas/exception.hpp \
 					    liblas/guid.hpp \
 					    liblas/iterator.hpp \
+					    liblas/lascolor.hpp \
 					    liblas/laserror.hpp \
 					    liblas/lasfile.hpp \
 					    liblas/lasheader.hpp \
 					    liblas/laspoint.hpp \
 					    liblas/lasreader.hpp \
 					    liblas/lasrecordheader.hpp \
+					    liblas/lassrs.hpp \
 					    liblas/laswriter.hpp \
 					    liblas/liblas.hpp \
 					    liblas/capi/liblas.h \

Modified: trunk/include/liblas/lassrs.hpp
==============================================================================
--- trunk/include/liblas/lassrs.hpp	(original)
+++ trunk/include/liblas/lassrs.hpp	Fri Feb 13 22:07:14 2009
@@ -68,11 +68,33 @@
 // GDAL OSR
 #ifdef HAVE_GDAL
 #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"
+
 #endif
 
+// GeoTIFF
+#ifdef HAVE_LIBGEOTIFF
+#include <geotiff.h>
+#include <geo_simpletags.h>
+#include "geo_normalize.h"
+#include "geo_simpletags.h"
+#include "geovalues.h"
+#endif // HAVE_LIBGEOTIFF
+
 // std
 #include <stdexcept> // std::out_of_range
 #include <cstdlib> // std::size_t
+#include <string>
 
 namespace liblas {
 
@@ -87,14 +109,30 @@
     LASSRS(LASSRS const& other);
     LASSRS& operator=(LASSRS const& rhs);
 
+    std::string GetWKT() const;
+    void SetWKT(std::string const& v);
+    
 
 private:
 
+    std::string m_wkt;
+    std::string m_proj4;
+    GTIF* m_gtiff;
+    ST_TIFF* m_tiff;
 
+protected:
+    
 };
 
 
 
 } // namespace liblas
 
+char CPL_DLL *  GTIFGetOGISDefn( GTIF *, GTIFDefn * );
+int  CPL_DLL   GTIFSetFromOGISDefn( GTIF *, const char * );
+
+void SetLinearUnitCitation(GTIF* psGTIF, char* pszLinearUOMName);
+void SetGeogCSCitation(GTIF * psGTIF, OGRSpatialReference *poSRS, char* angUnitName, int nDatum, short nSpheroid);
+
+
 #endif // LIBLAS_LASSRS_HPP_INCLUDED