Fix botched merges

Signed-off-by: Cary Phillips <cary@ilm.com>
AcademySoftwareFoundation · Mar 5, 2023 · b54f7d3 · b54f7d3
1 parent 66f427f
commit b54f7d3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/src/lib/OpenEXR/ImfDwaCompressor.cpp b/src/lib/OpenEXR/ImfDwaCompressor.cpp
@@ -2110,7 +2110,7 @@ DwaCompressor::compress
 
             //
             // For RLE, bash the bytes up so that the first bytes of each
-            // pixel are contingous, as are the second bytes, and so on.
+            // pixel are contiguous, as are the second bytes, and so on.
             //
 
             for (unsigned int y = 0; y < rowPtrs[chan].size(); ++y)

diff --git a/src/lib/OpenEXR/ImfIDManifest.cpp b/src/lib/OpenEXR/ImfIDManifest.cpp
@@ -378,7 +378,7 @@ void IDManifest::init(const char* data, const char* endOfData)
 
    //
    // decode mapping table from indices in table to indices in string list
-   // the mapping uses smaller indices for more commonly occuring strings, since these are encoded with fewer bits
+   // the mapping uses smaller indices for more commonly occurring strings, since these are encoded with fewer bits
    // comments in serialize function describe the format
    //
 

diff --git a/src/lib/OpenEXR/ImfOutputFile.cpp b/src/lib/OpenEXR/ImfOutputFile.cpp
@@ -1176,7 +1176,7 @@ OutputFile::writePixels (int numScanLines)
         }
 
 	//
-	// Exeption handling:
+	// Exception handling:
 	//
 	// LineBufferTask::execute() may have encountered exceptions, but
 	// those exceptions occurred in another thread, not in the thread

diff --git a/src/lib/OpenEXR/ImfScanLineInputFile.cpp b/src/lib/OpenEXR/ImfScanLineInputFile.cpp
@@ -1703,7 +1703,7 @@ ScanLineInputFile::readPixels (int scanLine1, int scanLine2)
         }
 
 	//
-	// Exeption handling:
+	// Exception handling:
 	//
 	// LineBufferTask::execute() may have encountered exceptions, but
 	// those exceptions occurred in another thread, not in the thread

diff --git a/src/lib/OpenEXR/ImfZip.cpp b/src/lib/OpenEXR/ImfZip.cpp
@@ -8,6 +8,7 @@
 #include "ImfNamespace.h"
 #include "ImfSimd.h"
 #include "ImfSystemSpecific.h"
+#include "Iex.h"
 
 #include <math.h>
 #include <zlib.h>

diff --git a/src/lib/OpenEXRCore/internal_structs.c b/src/lib/OpenEXRCore/internal_structs.c
@@ -7,7 +7,6 @@
 #include "internal_attr.h"
 #include "internal_constants.h"
 #include "internal_memory.h"
-#include "backward_compatibility.h"
 
 #include <IlmThreadConfig.h>
 

diff --git a/src/test/OpenEXRTest/testCompositeDeepScanLine.cpp b/src/test/OpenEXRTest/testCompositeDeepScanLine.cpp
@@ -489,7 +489,7 @@ make_pattern(data<DATA> & bob,int pattern_number)
 
 template<class T>
 void
-write_file(const char * filename, const data<T> & master, int number_of_parts)
+write_file(const char * filename, const data<T> & main, int number_of_parts)
 {
     vector<Header> headers(number_of_parts);
 
@@ -518,12 +518,12 @@ write_file(const char * filename, const data<T> & master, int number_of_parts)
 
     if(number_of_parts>1)
     {
-      master.frak(sub_parts);
+      main.frak(sub_parts);
     }  
 
     if(number_of_parts==1)
     {
-        master.setHeader(headers[0]);
+        main.setHeader(headers[0]);
     }else{
 
         for(int i=0;i<number_of_parts;i++)
@@ -538,7 +538,7 @@ write_file(const char * filename, const data<T> & master, int number_of_parts)
         DeepScanLineOutputPart p(f,i);
         if(number_of_parts==1)
         {
-            master.writeData(p);
+            main.writeData(p);
         }else{
             sub_parts[i].writeData(p);
         }
@@ -555,9 +555,9 @@ test_parts (int pattern_number,
 {
      std::string fn = tempDir + "imf_test_composite_deep_scanline_source.exr";
 
-     data<T> master;
-     make_pattern (master, pattern_number);
-     write_file (fn.c_str(), master,number_of_parts);
+     data<T> main;
+     make_pattern (main, pattern_number);
+     write_file (fn.c_str(), main,number_of_parts);
 
 
      {
@@ -576,7 +576,7 @@ test_parts (int pattern_number,
         }
 
 
-        master.setUpFrameBuffer(data,testbuf,comp.dataWindow(),load_depths);
+        main.setUpFrameBuffer(data,testbuf,comp.dataWindow(),load_depths);
 
         comp.setFrameBuffer(testbuf);
 
@@ -598,7 +598,7 @@ test_parts (int pattern_number,
            }
          }
 
-         master.checkValues(data,comp.dataWindow(),load_depths);
+         main.checkValues(data,comp.dataWindow(),load_depths);
 
          for(int i=0;i<number_of_parts;i++)
          {
@@ -612,7 +612,7 @@ test_parts (int pattern_number,
          vector<T> data;
          FrameBuffer testbuf;
          const Box2i & dataWindow = file.header().dataWindow();
-         master.setUpFrameBuffer(data,testbuf,dataWindow,load_depths);
+         main.setUpFrameBuffer(data,testbuf,dataWindow,load_depths);
          file.setFrameBuffer(testbuf);
          if(entire_buffer)
          {
@@ -629,7 +629,7 @@ test_parts (int pattern_number,
              }
          }
 
-         master.checkValues (data, dataWindow, load_depths);
+         main .checkValues (data, dataWindow, load_depths);
 
      }
      remove (fn.c_str());

diff --git a/src/test/OpenEXRTest/testExistingStreams.cpp b/src/test/OpenEXRTest/testExistingStreams.cpp
@@ -18,6 +18,8 @@
 #include <ImfOutputPart.h>
 #include <ImfStdIO.h>
 #include <ImfArray.h>
+#include <ImfRgbaFile.h>
+#include <ImfTiledRgbaFile.h>
 
 #include <stdio.h>
 #include <assert.h>