Changeset 628:83050d993186

Timestamp:

05/09/08 14:04:07 (2 years ago)

Author:

Frank Warmerdam <warmerdam@…>

Branch:

default

Convert:

svn:1766ff46-f334-0410-ab20-d63176f87757/trunk@695

Message:

preliminary integration with libgeotiff - requires cvs head

Location:

src/detail

Files:

• Makefile.am (modified) (1 diff)
• reader10.cpp (modified) (4 diffs)

src/detail/Makefile.am

@@ -1 +1 @@
 
-INCLUDES = -I../../include -I../../include/detail
+#if LIBGEOTIFF_IS_CONFIG
+EXTRA_DEFS = -DHAVE_LIBGEOTIFF
+#endif
+
+INCLUDES = -I../../include -I../../include/detail @GEOTIFF_INC@ $(EXTRA_DEFS)
 
 noinst_LTLIBRARIES = liblasdetail.la

src/detail/reader10.cpp

@@ -45 +45 @@
 #include <liblas/lasheader.hpp>
 #include <liblas/laspoint.hpp>
+
+#ifdef HAVE_LIBGEOTIFF
+#include <geotiff.h>
+#include <geo_simpletags.h>
+#endif /* HAVE_LIBGEOTIFF */
+
 // std
 #include <fstream>
@@ -203 +209 @@
     // TODO: Under construction
     //       Testing reading of VLRecords with GeoKeys
-    //ReadGeoreference(header);
+    ReadGeoreference(header);
 
     return true;
@@ -210 +216 @@
 bool ReaderImpl::ReadGeoreference(LASHeader const& header)
 {
+#ifndef HAVE_LIBGEOTIFF
+    return false;
+#else
     // TODO: Under construction
-
     VLRHeader vlrh = { 0 };
     std::string const uid("LASF_Projection");
+    ST_TIFF *st = ST_Create();
 
     m_ifs.seekg(header.GetHeaderSize(), std::ios::beg);
@@ -223 +232 @@
         if (uid == vlrh.userId && 34735 == vlrh.recordId)
         {
-            std::cout << "GeoKeyDirectoryTag: " << vlrh.recordId << std::endl;
-
-            GeoKeysHeader gkh = { 0 };
-            read_n(gkh, m_ifs, sizeof(GeoKeysHeader));
-
-            std::cout << "--Header: " << gkh.keyDirectoryVersion << " ; " << gkh.keyRevision << " ; " << gkh.minorRevision << " ; " << gkh.numberOfKeys << std::endl;
-
-            for (uint16_t j = 0; j < gkh.numberOfKeys; ++j)
-            {
-                GeoKeyEntry gke = { 0 };
-                read_n(gke, m_ifs, sizeof(GeoKeyEntry));
-
-                std::cout << "---KeyEntry: " << gke.keyId << " ; " << gke.tiffTagLocation<< " ; " << gke.count << " ; " <<  gke.valueOffset << std::endl;
-            }
+            int count = vlrh.recordLengthAfterHeader / sizeof(short);
+            uint16_t *geokeys = new uint16_t[count];
+            read_n(geokeys, m_ifs, vlrh.recordLengthAfterHeader);
+            ST_SetKey( st, vlrh.recordId, count, STT_SHORT, geokeys );
+            delete[] geokeys;
         }
         else if (uid == vlrh.userId && 34736 == vlrh.recordId)
         {
-            std::cout << "GeoDoubleParamsTag: " << vlrh.recordId << std::endl;
-
+            int count = vlrh.recordLengthAfterHeader / sizeof(double);
+            double *values = new double[count];
+            read_n(values, m_ifs, vlrh.recordLengthAfterHeader);
+            ST_SetKey( st, vlrh.recordId, count, STT_DOUBLE, values );
+            delete[] values;
+        }
+        else if (uid == vlrh.userId && 34737 == vlrh.recordId)
+        {
+            int count = vlrh.recordLengthAfterHeader / sizeof(char);
+            char *values = new char[count];
+            read_n(values, m_ifs, vlrh.recordLengthAfterHeader);
+            ST_SetKey( st, vlrh.recordId, count, STT_ASCII, values );
+            delete[] values;
+        }
+        else
+        {
             std::istream::pos_type const pos = m_ifs.tellg();
             m_ifs.seekg(pos + std::istream::pos_type(vlrh.recordLengthAfterHeader));
         }
-        else if (uid == vlrh.userId && 34737 == vlrh.recordId)
-        {
-            std::cout << "GeoAsciiParamsTag: " << vlrh.recordId << std::endl;
-
-            std::istream::pos_type const pos = m_ifs.tellg();
-            m_ifs.seekg(pos + std::istream::pos_type(vlrh.recordLengthAfterHeader));
-        }
-        else
-        {
-            std::istream::pos_type const pos = m_ifs.tellg();
-            m_ifs.seekg(pos + std::istream::pos_type(vlrh.recordLengthAfterHeader));
-        }
-    }
-
+    }
+
+    GTIF *gtif = GTIFNewSimpleTags( st );
+    GTIFPrint(gtif,0,0);
+    GTIFFree( gtif );
+    ST_Destroy( st );
+    
     return true;
+#endif /* def HAVE_LIBGEOTIFF */
 }