[Liblas-commits] hg: use IsZipVLR to verify if the one in question is what we want

[liblas-commits at liblas.org]

details:   http://hg.liblas.orghg/rev/5fc4d66afd8d
changeset: 3033:5fc4d66afd8d
user:      Howard Butler <hobu.inc at gmail.com>
date:      Tue Jun 28 15:48:53 2011 -0500
description:
use IsZipVLR to verify if the one in question is what we want
Subject: hg: no need to reset the zipPoint

details:   http://hg.liblas.orghg/rev/1807a68342fa
changeset: 3034:1807a68342fa
user:      Howard Butler <hobu.inc at gmail.com>
date:      Tue Jun 28 15:49:07 2011 -0500
description:
no need to reset the zipPoint

diffstat:

 src/detail/reader/zipreader.cpp |  6 ------
 src/detail/zippoint.cpp         |  2 +-
 2 files changed, 1 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r 47fa1baf1aa4 -r 1807a68342fa src/detail/reader/zipreader.cpp
--- a/src/detail/reader/zipreader.cpp	Tue Jun 28 15:21:50 2011 -0500
+++ b/src/detail/reader/zipreader.cpp	Tue Jun 28 15:49:07 2011 -0500
@@ -95,8 +95,6 @@
     m_ifs.clear();
     m_ifs.seekg(0);
 
-    m_zipPoint.reset();
-    m_unzipper.reset();
     
     // Reset sizes and set internal cursor to the beginning of file.
     m_current = 0;
@@ -237,12 +235,8 @@
 
     if (bNeedHeaderCheck) 
     {
-        // if (m_point->GetHeaderPtr().get() != m_header.get())
-        //     m_point->SetHeaderPtr(m_header);
-
         if (!(m_point->GetHeader().get() == *m_header))
             m_point->SetHeader(HeaderOptionalConstRef(*m_header));
-
     }
     
     ReadIdiom();
diff -r 47fa1baf1aa4 -r 1807a68342fa src/detail/zippoint.cpp
--- a/src/detail/zippoint.cpp	Tue Jun 28 15:21:50 2011 -0500
+++ b/src/detail/zippoint.cpp	Tue Jun 28 15:49:07 2011 -0500
@@ -73,7 +73,7 @@
     for (unsigned int i=0; i<vlrs.size(); i++)
     {
         const VariableRecord& p = vlrs[i];
-        if (p.GetRecordId() == 22204)
+        if (IsZipVLR(p))
         {
             vlr = &p;
             break;