more elegant exception handling in exrmaketiled (AcademySoftwareFound…

…ation#841) Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
peterhillman · Dec 6, 2020 · 9bda463 · 9bda463
1 parent 1472578
commit 9bda463
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/OpenEXR/exrmaketiled/main.cpp b/OpenEXR/exrmaketiled/main.cpp
@@ -393,31 +393,32 @@ main(int argc, char **argv)
 
     int exitStatus = 0;
 
-    //
-    // check input
-    //
+    try
     {
-        MultiPartInputFile input (inFile);
-        int parts = input.parts();
+        //
+        // check input
+        //
+        {
+            MultiPartInputFile input (inFile);
+            int parts = input.parts();
 
-        if (partnum < 0 || partnum >= parts){
-            cerr << "ERROR: you asked for part " << partnum << " in " << inFile;
-            cerr << ", which only has " << parts << " parts\n";
-            exit(1);
-        }
+            if (partnum < 0 || partnum >= parts){
+                cerr << "ERROR: you asked for part " << partnum << " in " << inFile;
+                cerr << ", which only has " << parts << " parts\n";
+                exit(1);
+            }
+
+            Header h = input.header (partnum);
+            if (h.type() == DEEPTILE || h.type() == DEEPSCANLINE)
+            {
+                cerr << "Cannot make tile for deep data" << endl;
+                exit(1);
+            }
 
-        Header h = input.header (partnum);
-        if (h.type() == DEEPTILE || h.type() == DEEPSCANLINE)
-        {
-            cerr << "Cannot make tile for deep data" << endl;
-            exit(1);
         }
 
-    }
 
 
-    try
-    {
         makeTiled (inFile, outFile, partnum,
                    mode, roundingMode, compression,
                    tileSizeX, tileSizeY,