Changeset 642:562c41493a79

Timestamp:

05/13/08 22:05:04 (2 years ago)

Author:

Frank Warmerdam <warmerdam@…>

Branch:

default

Convert:

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

Message:

some rework to ReadGeoreference?() ReadVLR() and SetData?() method

Location:

src

Files:

• detail/reader10.cpp (modified) (5 diffs)
• lasrecordheader.cpp (modified) (1 diff)

src/detail/reader10.cpp

@@ -225 +225 @@
         read_n(vlrh, m_ifs, sizeof(VLRHeader));
 
-        int16_t count = vlrh.recordLengthAfterHeader / sizeof(uint8_t);
-        uint8_t *rawdata = new uint8_t[count];
-         
-        read_n(rawdata, m_ifs, vlrh.recordLengthAfterHeader);
+        int16_t count = vlrh.recordLengthAfterHeader;
          
         std::vector<uint8_t> data;
-        for (int j=0; j< count; ++j) {
-            data.push_back(rawdata[j]);
-        }
+        data.resize( count );
+
+        unsigned char *ptr = &(data[0]); // we need a real variable because
+                                         // read_n() is f'ing evil magic. 
+        read_n(ptr, m_ifs, count );
          
         LASVLR vlr;
@@ -242 +241 @@
         vlr.SetRecordId(vlrh.recordId);
         vlr.SetData(data);
-        delete[] rawdata;
+
         header.AddVLR(vlr);
     }
@@ -278 +277 @@
 
             printf("count for int16_t: %d\n", count);
-            uint16_t *geokeys = new uint16_t[count];
-            for (int j = 0; j< count; ++j) {
-                geokeys[j] = (uint16_t)data[j];
-            }
-            ST_SetKey( st, record.GetRecordId(), count, STT_SHORT, geokeys );
-            delete[] geokeys;
-            
+
+            ST_SetKey( st, record.GetRecordId(), count, STT_SHORT, 
+                       &(data[0]) );
         }
 
@@ -294 +289 @@
             printf("count for int: %d\n", count);
 
-            double *geokeys = new double[count];
-            for (int j = 0; j< count; ++j) {
-                geokeys[j] = (double)data[j];
-            }
-            ST_SetKey( st, record.GetRecordId(), count, STT_DOUBLE, geokeys );
-            delete[] geokeys;
-
+            ST_SetKey( st, record.GetRecordId(), count, STT_DOUBLE, 
+                       &(data[0]) );
         }        
 
@@ -310 +300 @@
             
             printf("count for string: %d data.size(): %d", count, (int)data.size());
-
-            char *geokeys = new char[count];
-            for (int j = 0; j< count; ++j) {
-                geokeys[j] = (uint8_t)data[j];
-            }
-//            geokeys[count] = '\0';
-            printf("Geokeys: '%s'", geokeys);
-            ST_SetKey( st, record.GetRecordId(), count, STT_ASCII, geokeys );
-            delete[] geokeys;
-
-
-        }        
-        // else if (uid == record.GetUserId() && record.GetRecordId())
-        // {
-        //     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 == record.GetUserId() && record.GetRecordId())
-        // {
-        //     uint8_t count = vlrh.recordLengthAfterHeader / sizeof(uint8_t);
-        //     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));
-        // }
+            ST_SetKey( st, record.GetRecordId(), count, STT_ASCII, 
+                       &(data[0]) );
+        }
     }
 
     GTIF *gtif = GTIFNewSimpleTags( st );
+
+    //GTIFPrint(gtif,0,0);
+
     GTIFDefn defn;
     if (GTIFGetDefn(gtif, &defn)) 

src/lasrecordheader.cpp

@@ -195 +195 @@
 void LASVLR::SetData(const std::vector<uint8_t>& v) 
 {
-    std::vector<uint8_t> m_data(v);
+    m_data = v;
 }