use GDAL's NITFGetField instead of our own

PDAL · Jan 7, 2013 · 69b97e6 · 69b97e6
1 parent b32061e
commit 69b97e6
Showing 1 changed file with 2 additions and 26 deletions.
diff --git a/src/drivers/nitf/NitfFile.cpp b/src/drivers/nitf/NitfFile.cpp
@@ -51,23 +51,6 @@ namespace drivers
 namespace nitf
 {
 
-
-
-
-// this is a copy of the GDAL function, because the GDAL function isn't exported
-static char* myNITFGetField(char *pszTarget, const char *pszSource,
-                            int nStart, int nLength)
-{
-    memcpy(pszTarget, pszSource + nStart, nLength);
-    pszTarget[nLength] = '\0';
-
-    return pszTarget;
-}
-
-
-// --------------------------------------------------------------------------
-
-
 NitfFile::NitfFile(const std::string& filename)
     : m_filename(filename)
     , m_file(NULL)
@@ -293,7 +276,7 @@ void NitfFile::processTREs(int nTREBytes, const char *pszTREData, pdal::Metadata
 
     while (nTREBytes > 10)
     {
-        int nThisTRESize = atoi(myNITFGetField(szTemp, pszTREData, 6, 5));
+        int nThisTRESize = atoi(NITFGetField(szTemp, pszTREData, 6, 5));
         if (nThisTRESize < 0 || nThisTRESize > nTREBytes - 11)
         {
             break;
@@ -306,14 +289,7 @@ void NitfFile::processTREs(int nTREBytes, const char *pszTREData, pdal::Metadata
         const std::string value(pszTREData, nThisTRESize+1);
         Metadata m(parentkey+"."+key, value);
 
-        // const std::string value(pszTREData + 11);
-
-        //std::vector<boost::uint8_t> data(nThisTRESize);
-        //boost::uint8_t* p = (boost::uint8_t*)(pszTREData + 11);
-        //for (int i=0; i<nThisTRESize; i++) data[i] = p[i];
-        //ByteArray value(data);
-
-        if (!boost::iequals(key, "DESDATA"))
+        if (!boost::iequals(key, "DESDATA")) // LAS data stored in here
         {
             ms.addMetadata<std::string>(parentkey+"."+key, value);
         }