Changeset 662:4dd7b4faeee0

Timestamp:

05/18/08 22:17:27 (2 years ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Convert:

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

Message:

take in a reference to a pointer for LASVLR_GetData, I don't know if I like this though

Files:

• include/liblas/capi/liblas.h (modified) (3 diffs)
• src/las_c_api.cpp (modified) (2 diffs)

include/liblas/capi/liblas.h

@@ -758 +758 @@
 LAS_DLL LASError LASHeader_SetProj4(LASHeaderH hHeader, const char* value);
 
+/** Returns the VLR record for the given index.  Use LASHeader_GetRecordsCount to 
+ *  determine the number of VLR records available on the header.
+ *  @param hHeader the LASHeaderH instance
+ *  @param i the index starting from 0 of the VLR to fetch
+ *  @return LASVLRH instance that models the Variable Length Record
+*/
+LAS_DLL LASVLRH LASHeader_GetVLR(const LASHeaderH hHeader, uint32_t i);
+
+/** Deletes a VLR record from the header for the given index.
+ *  @param hHeader the LASHeaderH instance
+ *  @param index the index starting from 0 of the VLR to delete
+ *  @return LASErrorEnum
+*/
+LAS_DLL LASError LASHeader_DeleteVLR(LASHeaderH hHeader, uint32_t index);
+
+/** Adds a VLR record to the header. 
+ *  @param hHeader the LASHeaderH instance
+ *  @param hVLR the VLR to add to the header
+ *  @return LASErrorEnum
+*/
+LAS_DLL LASError LASHeader_AddVLR(LASHeaderH hHeader, const LASVLRH hVLR);
+
 /****************************************************************************/
 /* Writer Operations                                                        */
@@ -842 +864 @@
 LAS_DLL char* LASGuid_AsString(LASGuidH hId);
 
-/** Returns the VLR record for the given index.  Use LASHeader_GetRecordsCount to 
- *  determine the number of VLR records available on the header.
- *  @param hHeader the LASHeaderH instance
- *  @param i the index starting from 0 of the VLR to fetch
- *  @return LASVLRH instance that models the Variable Length Record
-*/
-LAS_DLL LASVLRH LASHeader_GetVLR(const LASHeaderH hHeader, uint32_t i);
-
-/** Deletes a VLR record from the header for the given index.
- *  @param hHeader the LASHeaderH instance
- *  @param index the index starting from 0 of the VLR to delete
- *  @return LASErrorEnum
-*/
-LAS_DLL LASError LASHeader_DeleteVLR(LASHeaderH hHeader, uint32_t index);
-
-/** Adds a VLR record to the header. 
- *  @param hHeader the LASHeaderH instance
- *  @param hVLR the VLR to add to the header
- *  @return LASErrorEnum
-*/
-LAS_DLL LASError LASHeader_AddVLR(LASHeaderH hHeader, const LASVLRH hVLR);
+/****************************************************************************/
+/* VLR Operations                                                           */
+/****************************************************************************/
 
 /** Creates a new VLR record
@@ -947 +951 @@
  *  @return LASErrorEnum
 */
-LAS_DLL LASError LASVLR_GetData(const LASVLRH hVLR, uint8_t* data, int* length);
+LAS_DLL LASError LASVLR_GetData(const LASVLRH hVLR, uint8_t** data, int* length);
 
 LAS_C_END

src/las_c_api.cpp

@@ -1431 +1431 @@
 }
 
-LAS_DLL LASErrorEnum LASVLR_GetData(const LASVLRH hVLR, liblas::uint8_t* data, int* length) {
+LAS_DLL LASErrorEnum LASVLR_GetData(const LASVLRH hVLR, liblas::uint8_t** data, int* length) {
     
     VALIDATE_POINTER1(hVLR, "LASVLR_GetData", LE_Failure);
@@ -1437 +1437 @@
     try {
         std::vector<liblas::uint8_t> *d = new std::vector<liblas::uint8_t>(((LASVLR*) hVLR)->GetData());
-        *data = d->front();
+        *data = &(d->front());
+        //data = &(d[0])
         *length = static_cast<int>(d->size());
+        printf("GetData length %d\n", *length);
     }
     catch (std::exception const& e) {