Merge pull request #160 from mdaus/revert_copy_constructor

Revert "Merge pull request #159 from mdaus/band_info_copy"
mdaus · Jan 29, 2020 · 3bce1fb · 3bce1fb
2 parents f2ee167 + ba2d1b6
commit 3bce1fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/modules/c++/nitf/include/nitf/BandInfo.hpp b/modules/c++/nitf/include/nitf/BandInfo.hpp
@@ -115,7 +115,6 @@ DECLARE_CLASS(BandInfo)
               const std::string& imageFilterCode);
 
 private:
-    void cloneFromNative(nitf_BandInfo* bandInfo);
     nitf_Error error;
 };
 

diff --git a/modules/c++/nitf/source/BandInfo.cpp b/modules/c++/nitf/source/BandInfo.cpp
@@ -26,23 +26,20 @@ using namespace nitf;
 
 BandInfo::BandInfo(const BandInfo & x)
 {
-    cloneFromNative(x.getNative());
+    setNative(x.getNative());
 }
 
-BandInfo& BandInfo::operator=(const BandInfo & x)
+BandInfo & BandInfo::operator=(const BandInfo & x)
 {
     if (&x != this)
-    {
-        cloneFromNative(x.getNative());
-    }
+        setNative(x.getNative());
     return *this;
 }
 
 BandInfo::BandInfo(nitf_BandInfo * x)
 {
     setNative(x);
     getNativeOrThrow();
-    setManaged(false);
 }
 
 BandInfo::BandInfo()
@@ -148,13 +145,3 @@ void BandInfo::init(const std::string& representation,
         throw nitf::NITFException(&error);
 }
 
-void BandInfo::cloneFromNative(nitf_BandInfo* bandInfo)
-{
-    nitf_BandInfo* clone = nitf_BandInfo_clone(bandInfo, &error);
-    if (!clone)
-    {
-        throw nitf::NITFException(&error);
-    }
-    setNative(clone);
-    setManaged(false);
-}