add overloads for other code

Dan Smith · Dan Smith · commit f705be9129ea · 2021-12-09T17:35:35.000-05:00
diff --git a/six/modules/c++/six.sicd/include/six/sicd/NITFReadComplexXMLControl.h b/six/modules/c++/six.sicd/include/six/sicd/NITFReadComplexXMLControl.h
@@ -65,6 +65,10 @@ namespace six
 			six::NITFReadControl& NITFReadControl() { return reader; }
 
 			void load(const std::string& fromFile, const std::vector<std::string>* pSchemaPaths);
+			void load(const std::string& fromFile, const std::vector<std::string>& schemaPaths)
+			{
+				load(fromFile, &schemaPaths);
+			}
 			void load(const std::filesystem::path& fromFile, const std::vector<std::filesystem::path>* pSchemaPaths);
 			void load(const std::filesystem::path& fromFile, const std::vector<std::filesystem::path>& schemaPaths)
 			{
@@ -74,7 +78,11 @@ namespace six
 			{
 				load(fromFile, nullptr /*schemaPaths*/);
 			}
-			void load(io::FileInputStream&, const std::vector<std::string>& schemaPaths);
+			void load(io::FileInputStream&, const std::vector<std::string>* pSchemaPaths);
+			void load(io::FileInputStream& fis, const std::vector<std::string>& schemaPaths)
+			{
+				load(fis, &schemaPaths);
+			}
 
 			std::shared_ptr<const six::Container> getContainer() const;
 			std::shared_ptr<six::Container> getContainer();
diff --git a/six/modules/c++/six.sicd/source/NITFReadComplexXMLControl.cpp b/six/modules/c++/six.sicd/source/NITFReadComplexXMLControl.cpp
@@ -55,6 +55,11 @@ void six::sicd::NITFReadComplexXMLControl::load(const std::filesystem::path& fro
     }
     load(fromFile.string(), pSchemaPaths_);
 }
+void six::sicd::NITFReadComplexXMLControl::load(io::FileInputStream& fis, const std::vector<std::string>* pSchemaPaths)
+{
+    reader.load(fis, pSchemaPaths);
+}
+
 
 std::shared_ptr<const six::Container> six::sicd::NITFReadComplexXMLControl::getContainer() const
 {
diff --git a/six/modules/c++/six/include/six/NITFReadControl.h b/six/modules/c++/six/include/six/NITFReadControl.h
@@ -136,7 +136,12 @@ struct NITFReadControl : public ReadControl
      *  \param schemaPaths Directories or files of schema locations.
      */
     void load(io::SeekableInputStream& ioStream,
-              const std::vector<std::string>& schemaPaths);
+        const std::vector<std::string>* pSchemaPaths);
+    void load(io::SeekableInputStream& ioStream,
+        const std::vector<std::string>& schemaPaths)
+    {
+        load(ioStream, &schemaPaths);
+    }
 
     void load(std::shared_ptr<nitf::IOInterface> ioInterface);
     void load(std::shared_ptr<nitf::IOInterface> ioInterface,
diff --git a/six/modules/c++/six/source/NITFReadControl.cpp b/six/modules/c++/six/source/NITFReadControl.cpp
@@ -264,10 +264,10 @@ void NITFReadControl::load(const std::string& fromFile,
 }
 
 void NITFReadControl::load(io::SeekableInputStream& stream,
-                           const std::vector<std::string>& schemaPaths)
+                           const std::vector<std::string>* pSchemaPaths)
 {
     auto handle(std::make_shared<nitf::IOStreamReader>(stream));
-    load(handle, schemaPaths);
+    load(handle, pSchemaPaths);
 }
 
 void NITFReadControl::load(std::shared_ptr<nitf::IOInterface> ioInterface)

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,11 @@ void six::sicd::NITFReadComplexXMLControl::load(const std::filesystem::path& fro`
`55`	`55`	`}`
`56`	`56`	`load(fromFile.string(), pSchemaPaths_);`
`57`	`57`	`}`
	`58`	`+void six::sicd::NITFReadComplexXMLControl::load(io::FileInputStream& fis, const std::vector<std::string>* pSchemaPaths)`
	`59`	`+{`
	`60`	`+ reader.load(fis, pSchemaPaths);`
	`61`	`+}`
	`62`	`+`
`58`	`63`
`59`	`64`	`std::shared_ptr<const six::Container> six::sicd::NITFReadComplexXMLControl::getContainer() const`
`60`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -264,10 +264,10 @@ void NITFReadControl::load(const std::string& fromFile,`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`void NITFReadControl::load(io::SeekableInputStream& stream,`
`267`		`- const std::vector<std::string>& schemaPaths)`
	`267`	`+ const std::vector<std::string>* pSchemaPaths)`
`268`	`268`	`{`
`269`	`269`	`auto handle(std::make_shared<nitf::IOStreamReader>(stream));`
`270`		`- load(handle, schemaPaths);`
	`270`	`+ load(handle, pSchemaPaths);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`void NITFReadControl::load(std::shared_ptr<nitf::IOInterface> ioInterface)`