ngageoint
diff --git a/‎six/modules/c++/cphd/source/PVPBlock.cpp‎
Lines changed: 6 additions & 0 deletions b/‎six/modules/c++/cphd/source/PVPBlock.cpp‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎six/modules/c++/cphd03/source/CPHDWriter.cpp‎
Lines changed: 6 additions & 0 deletions b/‎six/modules/c++/cphd03/source/CPHDWriter.cpp‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎six/modules/c++/cphd03/source/VBM.cpp‎
Lines changed: 6 additions & 0 deletions b/‎six/modules/c++/cphd03/source/VBM.cpp‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎six/modules/c++/samples/image_to_scene.cpp‎
Lines changed: 10 additions & 9 deletions b/‎six/modules/c++/samples/image_to_scene.cpp‎
Lines changed: 10 additions & 9 deletions
diff --git a/‎six/modules/c++/six.sicd/include/six/sicd/Utilities.h‎
Lines changed: 15 additions & 9 deletions b/‎six/modules/c++/six.sicd/include/six/sicd/Utilities.h‎
Lines changed: 15 additions & 9 deletions
diff --git a/‎six/modules/c++/six.sicd/source/SICDMesh.cpp‎
Lines changed: 6 additions & 0 deletions b/‎six/modules/c++/six.sicd/source/SICDMesh.cpp‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎six/modules/c++/six.sicd/source/Utilities.cpp‎
Lines changed: 7 additions & 2 deletions b/‎six/modules/c++/six.sicd/source/Utilities.cpp‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎six/modules/c++/six/source/NITFHeaderCreator.cpp‎
Lines changed: 4 additions & 4 deletions b/‎six/modules/c++/six/source/NITFHeaderCreator.cpp‎
Lines changed: 4 additions & 4 deletions
@@ -37,6 +37,12 @@
 #include <cphd/Metadata.h>
 #include <cphd/Utilities.h>
 
+#include <sys/Bit.h>
+namespace std
+{
+    using endian = sys::Endian;
+}
+
 namespace
 {
 // Set data from data block into data struct
 
@@ -30,6 +30,12 @@
 #include <cphd03/FileHeader.h>
 #include <cphd/ByteSwap.h>
 
+#include <sys/Bit.h>
+namespace std
+{
+    using endian = sys::Endian;
+}
+
 namespace cphd03
 {
 CPHDWriter::CPHDWriter(const Metadata& metadata,
 
@@ -31,6 +31,12 @@
 
 #include <cphd/ByteSwap.h>
 
+#include <sys/Bit.h>
+namespace std
+{
+    using endian = sys::Endian;
+}
+
 namespace
 {
 inline void setData(const std::byte*& data,
 
@@ -24,7 +24,7 @@
 #include <stdexcept>
 #include <memory>
 
-#include <nitf/coda-oss.hpp>
+#include <sys/Conf.h>
 #include <sys/Path.h>
 #include <except/Exception.h>
 #include <str/Convert.h>
@@ -37,11 +37,11 @@
 #include <six/sidd/DerivedXMLControl.h>
 
 #include <sys/Filesystem.h>
-namespace fs = std::filesystem;
+namespace fs = sys::Filesystem;
 
 namespace
 {
-void usage(const fs::path& progname, std::ostream& ostr)
+void usage(const std::string& progname, std::ostream& ostr)
 {
     ostr << progname << " -h\n"
          << progname
@@ -51,9 +51,10 @@ void usage(const fs::path& progname, std::ostream& ostr)
          << "-image_to_ground must be specified\n\n";
 }
 
-struct Converter final
+class Converter
 {
-    Converter(const fs::path& pathname);
+public:
+    Converter(const std::string& pathname);
 
     void groundToImage(const scene::Vector3& groundPt) const;
 
@@ -74,7 +75,7 @@ struct Converter final
     types::RowCol<double> mAOIOffset;
 };
 
-Converter::Converter(const fs::path& pathname)
+Converter::Converter(const std::string& pathname)
 {
     // Read in the SICD
     six::NITFReadControl reader;
@@ -88,10 +89,10 @@ Converter::Converter(const fs::path& pathname)
         new six::XMLControlCreatorT<six::sidd::DerivedXMLControl>());
 
     reader.setXMLControlRegistry(&xmlRegistry);
-    reader.load(pathname.string());
+    reader.load(pathname);
 
     // Verify it's a SICD
-    auto container(reader.getContainer());
+    std::shared_ptr<const six::Container> container(reader.getContainer());
     if (container->getDataType() != six::DataType::COMPLEX)
     {
         throw except::InvalidFormatException(Ctxt("Expected a SICD NITF"));
@@ -166,7 +167,7 @@ int main(int argc, char** argv)
     try
     {
         // Parse the command line
-        const auto progname(fs::path(argv[0]).filename());
+        const std::string progname(fs::path(argv[0]).filename().string());
         if (argc < 2)
         {
             usage(progname, std::cerr);
 
@@ -27,6 +27,8 @@
 #include <vector>
 #include <utility>
 
+#include <sys/Filesystem.h>
+
 #include <scene/SceneGeometry.h>
 #include <scene/ProjectionModel.h>
 #include <six/sicd/ComplexData.h>
@@ -83,7 +85,7 @@ class Utilities
      * with the valid data polygon.
      * \return ProjectionPolynomialFitter from ComplexData
      */
-    static std::auto_ptr<scene::ProjectionPolynomialFitter>
+    static mem::auto_ptr<scene::ProjectionPolynomialFitter>
     getPolynomialFitter(const ComplexData& complexData,
                         size_t numPoints1D =
                          scene::ProjectionPolynomialFitter::DEFAULTS_POINTS_1D,
@@ -126,6 +128,10 @@ class Utilities
                          const std::vector<std::string>& schemaPaths,
                          std::unique_ptr<ComplexData>& complexData,
                          std::vector<std::complex<float> >& widebandData);
+    static void readSicd(const std::filesystem::path& sicdPathname,
+                         const std::vector<std::string>& schemaPaths,
+                         std::unique_ptr<ComplexData>& complexData,
+                         std::vector<std::complex<float> >& widebandData);
 
     /*
      * Given a SICD path name and a list of schema, this function reads
@@ -192,7 +198,7 @@ class Utilities
      * \throws except::Exception if file is not a SICD or Complex XML
      */
     static
-    std::auto_ptr<ComplexData> getComplexData(
+    mem::auto_ptr<ComplexData> getComplexData(
             const std::string& pathname,
             const std::vector<std::string>& schemaPaths);
 
@@ -207,7 +213,7 @@ class Utilities
      * \throws except::Exception if the provided reader is not a SICD
      *
      */
-    static std::auto_ptr<ComplexData> getComplexData(NITFReadControl& reader);
+    static mem::auto_ptr<ComplexData> getComplexData(NITFReadControl& reader);
 
     /*
      * Given a loaded NITFReadControl and a ComplexData object, this
@@ -381,7 +387,7 @@ class Utilities
      *
      * \return Data representation of 'xmlStr'
      */
-    static std::auto_ptr<ComplexData> parseData(
+    static mem::auto_ptr<ComplexData> parseData(
             ::io::InputStream& xmlStream,
             const std::vector<std::string>& schemaPaths,
             logging::Logger& log);
@@ -396,7 +402,7 @@ class Utilities
      *
      * \return Data representation of the contents of 'pathname'
      */
-    static std::auto_ptr<ComplexData> parseDataFromFile(
+    static mem::auto_ptr<ComplexData> parseDataFromFile(
             const std::string& pathname,
             const std::vector<std::string>& schemaPaths,
             logging::Logger& log);
@@ -410,7 +416,7 @@ class Utilities
      *
      * \return Data representation of 'xmlStr'
      */
-    static std::auto_ptr<ComplexData> parseDataFromString(
+    static mem::auto_ptr<ComplexData> parseDataFromString(
         const std::string& xmlStr,
         const std::vector<std::string>& schemaPaths,
         logging::Logger& log);
@@ -437,7 +443,7 @@ class Utilities
      *
      * \return mock ComplexData object
      */
-    static std::auto_ptr<ComplexData> createFakeComplexData();
+    static mem::auto_ptr<ComplexData> createFakeComplexData();
 
     /*
      * Given a reference to a loaded NITFReadControl, this function
@@ -447,7 +453,7 @@ class Utilities
      * \throws except::Exception if the provided reader is not a SICD
      *
      */
-    static std::auto_ptr<NoiseMesh> getNoiseMesh(NITFReadControl& reader);
+    static mem::auto_ptr<NoiseMesh> getNoiseMesh(NITFReadControl& reader);
 
     /*
      * Given a reference to a loaded NITFReadControl, this function
@@ -460,7 +466,7 @@ class Utilities
      *
      * \return Scalar Mesh associated with the SICD NITF
      */
-    static std::auto_ptr<ScalarMesh> getScalarMesh(NITFReadControl& reader);
+    static mem::auto_ptr<ScalarMesh> getScalarMesh(NITFReadControl& reader);
 
     /*
      * Given a reference to a loaded NITFReadControl, this function
 
@@ -27,6 +27,12 @@
 #include <six/sicd/SICDMesh.h>
 #include <six/Serialize.h>
 
+#include <sys/Bit.h>
+namespace std
+{
+    using endian = sys::Endian;
+}
+
 namespace six
 {
 namespace sicd
 
@@ -36,8 +36,6 @@
 #include <sys/Conf.h>
 #include <types/RowCol.h>
 
-
-#include <sys/Filesystem.h>
 namespace fs = std::filesystem;
 
 namespace
@@ -518,6 +516,13 @@ void Utilities::readSicd(const std::string& sicdPathname,
 {
     readSicd_(sicdPathname, schemaPaths, complexData, widebandData);
 }
+void Utilities::readSicd(const fs::path& sicdPathname,
+                         const std::vector<std::string>& schemaPaths,
+                         std::unique_ptr<ComplexData>& complexData,
+                         std::vector<std::complex<float>>& widebandData)
+{
+    readSicd(sicdPathname.string(), schemaPaths, complexData, widebandData);
+}
 
 template<typename TComplexDataPtr, typename TNoiseMeshPtr, typename TScalarMeshPtr>
 static void readSicd_(const std::string& sicdPathname,
 
@@ -348,7 +348,7 @@ void NITFHeaderCreator::setSecurity(const six::Classification& classification,
         security.getClassificationSystem().set("US");
     }
 
-    if (mLog != NULL)
+    if (mLog != nullptr)
     {
         classification.setSecurity(prefix, *mLog, security);
     }
@@ -597,9 +597,9 @@ void NITFHeaderCreator::addUserDefinedSubheader(
 void NITFHeaderCreator::addAdditionalDES(
         mem::SharedPtr<nitf::SegmentWriter> segmentWriter)
 {
-    if (segmentWriter.get() == NULL)
+    if (segmentWriter.get() == nullptr)
     {
-        throw except::Exception(Ctxt("segmentWriter is NULL"));
+        throw except::Exception(Ctxt("segmentWriter is nullptr"));
     }
 
     mSegmentWriters.push_back(segmentWriter);
@@ -860,7 +860,7 @@ void NITFHeaderCreator::initialize(mem::SharedPtr<Container> container)
 
             case PixelType::RGB8LU:
                 // We should have a legend
-                if (legend->mLUT.get() == NULL)
+                if (legend->mLUT.get() == nullptr)
                 {
                     throw except::Exception(Ctxt(
                             "LUT should be present for indexed RGB legend"));
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ void NITFHeaderCreator::setSecurity(const six::Classification& classification,`
`348`	`348`	`security.getClassificationSystem().set("US");`
`349`	`349`	`}`
`350`	`350`
`351`		`- if (mLog != NULL)`
	`351`	`+ if (mLog != nullptr)`
`352`	`352`	`{`
`353`	`353`	`classification.setSecurity(prefix, *mLog, security);`
`354`	`354`	`}`
`@@ -597,9 +597,9 @@ void NITFHeaderCreator::addUserDefinedSubheader(`
`597`	`597`	`void NITFHeaderCreator::addAdditionalDES(`
`598`	`598`	`mem::SharedPtr<nitf::SegmentWriter> segmentWriter)`
`599`	`599`	`{`
`600`		`- if (segmentWriter.get() == NULL)`
	`600`	`+ if (segmentWriter.get() == nullptr)`
`601`	`601`	`{`
`602`		`- throw except::Exception(Ctxt("segmentWriter is NULL"));`
	`602`	`+ throw except::Exception(Ctxt("segmentWriter is nullptr"));`
`603`	`603`	`}`
`604`	`604`
`605`	`605`	`mSegmentWriters.push_back(segmentWriter);`
`@@ -860,7 +860,7 @@ void NITFHeaderCreator::initialize(mem::SharedPtr<Container> container)`
`860`	`860`
`861`	`861`	`case PixelType::RGB8LU:`
`862`	`862`	`// We should have a legend`
`863`		`- if (legend->mLUT.get() == NULL)`
	`863`	`+ if (legend->mLUT.get() == nullptr)`
`864`	`864`	`{`
`865`	`865`	`throw except::Exception(Ctxt(`
`866`	`866`	`"LUT should be present for indexed RGB legend"));`