From 5181aa0e6dc33a9bfddaacb88d043215e07990f3 Mon Sep 17 00:00:00 2001
From: scott <scott.stanie@gmail.com>
Date: Wed, 7 Jul 2021 12:46:25 -0500
Subject: [PATCH] move stdexcept to base, convert InterleavedAccessor.cpp to
 exceptions

---
 .../InterleavedAccessor/include/GDALAccessor.h       |  1 -
 .../InterleavedAccessor/include/InterleavedBase.h    |  1 +
 .../InterleavedAccessor/src/GDALAccessor.cpp         |  3 +--
 .../InterleavedAccessor/src/InterleavedAccessor.cpp  | 12 ++++++------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/components/iscesys/ImageApi/InterleavedAccessor/include/GDALAccessor.h b/components/iscesys/ImageApi/InterleavedAccessor/include/GDALAccessor.h
index 0161f3b..1707cf7 100644
--- a/components/iscesys/ImageApi/InterleavedAccessor/include/GDALAccessor.h
+++ b/components/iscesys/ImageApi/InterleavedAccessor/include/GDALAccessor.h
@@ -9,7 +9,6 @@
 #endif
 
 #include <iostream>
-#include <stdexcept>
 #include "InterleavedBase.h"
 #include <stdint.h>
 #include "gdal_priv.h"
diff --git a/components/iscesys/ImageApi/InterleavedAccessor/include/InterleavedBase.h b/components/iscesys/ImageApi/InterleavedAccessor/include/InterleavedBase.h
index bba0790..fc66f59 100644
--- a/components/iscesys/ImageApi/InterleavedAccessor/include/InterleavedBase.h
+++ b/components/iscesys/ImageApi/InterleavedAccessor/include/InterleavedBase.h
@@ -10,6 +10,7 @@
 
 #include <stdlib.h>
 #include <string>
+#include <stdexcept>
 
 
 using namespace std;
diff --git a/components/iscesys/ImageApi/InterleavedAccessor/src/GDALAccessor.cpp b/components/iscesys/ImageApi/InterleavedAccessor/src/GDALAccessor.cpp
index ad69276..2ae9c3c 100644
--- a/components/iscesys/ImageApi/InterleavedAccessor/src/GDALAccessor.cpp
+++ b/components/iscesys/ImageApi/InterleavedAccessor/src/GDALAccessor.cpp
@@ -75,8 +75,7 @@ GDALAccessor::openFile (string filename, string accessMode, GDALDataset ** fd)
             string errMsg = "Cannot open the file " + filename + " in "
                             + accessMode + " mode.";
             throw runtime_error(errMsg);
-            // ERR_MESSAGE
-            // ;
+            // ERR_MESSAGE;
         }
     }
     else
diff --git a/components/iscesys/ImageApi/InterleavedAccessor/src/InterleavedAccessor.cpp b/components/iscesys/ImageApi/InterleavedAccessor/src/InterleavedAccessor.cpp
index 5951606..498dae0 100644
--- a/components/iscesys/ImageApi/InterleavedAccessor/src/InterleavedAccessor.cpp
+++ b/components/iscesys/ImageApi/InterleavedAccessor/src/InterleavedAccessor.cpp
@@ -112,8 +112,8 @@ void  InterleavedAccessor::openFile(string filename, string accessMode, fstream
         fd.open(filename.c_str(), ios_base::in);
         if(fd.fail())
         {
-            cout << "Error. Cannot open the file " << filename << " in " << accessMode << " mode." <<endl;
-            ERR_MESSAGE;
+            string errMsg = "Cannot open the file " + filename + " in " + accessMode + " mode.";
+            throw runtime_error(errMsg);
         }
 
     }
@@ -139,13 +139,13 @@ void  InterleavedAccessor::openFile(string filename, string accessMode, fstream
     }
     else
     {
-        cout << "Error. Unrecognized open mode " << accessMode << " for file " << filename << endl;
-        ERR_MESSAGE;
+        string errMsg = "Unrecognized open mode " + accessMode + " for file " + filename;
+        throw runtime_error(errMsg);
     }
     if(!fd.good())
     {
-        cout << "Cannot open file " << filename << endl;
-        ERR_MESSAGE;
+        string errMsg = "Cannot open file " + filename;
+        throw runtime_error(errMsg);
     }
 }
 void InterleavedAccessor::getStream(char * dataLine,  int  & numEl)