Remove vestiges of IlmImf, split apart test runs

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>

CONTRIBUTING.md

@@ -282,7 +282,7 @@ required.
 
 All functionality in the library must be covered by an automated
 test. Each library has a companion ``Test`` project - ``ImathTest``,
-``HalfTest``, ``IlmImfTest`, etc.  This test suite is collectively
+``HalfTest``, ``OpenEXRTest`, etc.  This test suite is collectively
 expected to validate the behavior of very part of the library.
 
 * Any new functionality should be accompanied by a test that validates
@@ -294,7 +294,7 @@ expected to validate the behavior of very part of the library.
 The test should should be run, via ``make check``, before submitting a
 pull request.
 
-In addition, the ``IlmImfFuzzTest`` project validates the library by
+In addition, the ``OpenEXRFuzzTest`` project validates the library by
 feeding it corrupted input data. This test is time-consuming (possible
 over 24 hours), so it will only be run occasionally, but it must
 succeed before a release is made.

Contrib/DtexToExr/Makefile.test

@@ -16,7 +16,7 @@ LPATH = -L${DTEXTOEXR_PREFIX}/lib \
 	-Wl,-rpath ${DTEXTOEXR_RMANROOT}/lib/prmansdk-160 \
 	-Wl,-rpath ${DTEXTOEXR_RMANROOT}/lib
 
-LIBS = -lIlmImf -lImath -lIlmThread -lIex -lHalf \
+LIBS = -lOpenEXR -lImath -lIlmThread -lIex -lHalf \
 	-lprman \
 	-lpthread -lm
 

Contrib/DtexToExr/configure.ac

@@ -62,7 +62,7 @@ AM_PATH_PKGCONFIG(
    [OpenEXR],
    [OpenEXR],
    [$LIB64_IF_EXISTS -L/usr/local/lib],
-   [-lIlmImf -lImath -lIex -lHalf -lz -lpthread],
+   [-lOpenEXR -lImath -lIex -lHalf -lz -lpthread],
    [openexr-prefix])
 
 

PATENTS

@@ -8,13 +8,13 @@ licensee's option, under either:
 
 The files to which this choice applies are:
 
-* /OpenEXR/IlmImf/ImfDwaCompressor.h
-* /OpenEXR/IlmImf/ImfDwaCompressor.cpp
-* /OpenEXR/IlmImf/ImfDwaCompressorSimd.h
-* /OpenEXR/IlmImfTest/compareDwa.h
-* /OpenEXR/IlmImfTest/compareDwa.cpp
-* /OpenEXR/IlmImfTest/testDwaCompressorSimd.h
-* /OpenEXR/IlmImfTest/testDwaCompressorSimd.cpp
+* /src/lib/OpenEXR/ImfDwaCompressor.h
+* /src/lib/OpenEXR/ImfDwaCompressor.cpp
+* /src/lib/OpenEXR/ImfDwaCompressorSimd.h
+* /src/test/OpenEXRTest/compareDwa.h
+* /src/test/OpenEXRTest/compareDwa.cpp
+* /src/test/OpenEXRTest/testDwaCompressorSimd.h
+* /src/test/OpenEXRTest/testDwaCompressorSimd.cpp
 
 = = = = =
 
@@ -244,4 +244,4 @@ is filed.
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

cmake/OpenEXRConfigInternal.h.in

@@ -11,7 +11,7 @@
 //
 // Define and set to 1 if the target system supports a proc filesystem
 // compatible with the Linux kernel's proc filesystem.  Note that this
-// is only used by a program in the IlmImfTest test suite, it's not
+// is only used by a program in the OpenEXRTest test suite, it's not
 // used by any OpenEXR library or application code.
 //
 

sonar-project.properties

@@ -19,7 +19,7 @@ sonar.links.scm=https://github.com/AcademySoftwareFoundation/openexr
 sonar.links.issue=https://github.com/AcademySoftwareFoundation/openexr/issues
 
 # Source properties
-sonar.sources=IlmBase,OpenEXR,PyIlmBase
+sonar.sources=src
 sonar.sourceEncoding=UTF-8
 sonar.exclusions=src/bindings/java/**,*.java
 

src/bin/exr2aces/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright Contributors to the OpenEXR Project.
 
 add_executable(exr2aces main.cpp)
-target_link_libraries(exr2aces OpenEXR::IlmImf)
+target_link_libraries(exr2aces OpenEXR::OpenEXR)
 set_target_properties(exr2aces PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )

src/bin/exrcheck/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright Contributors to the OpenEXR Project.
 
 add_executable(exrcheck main.cpp)
-target_link_libraries(exrcheck OpenEXR::IlmImf OpenEXR::IlmImfUtil)
+target_link_libraries(exrcheck OpenEXR::OpenEXR OpenEXR::OpenEXRUtil)
 set_target_properties(exrcheck PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )

src/bin/exrenvmap/CMakeLists.txt

@@ -11,7 +11,7 @@ add_executable( exrenvmap
   EnvmapImage.cpp
 )
 
-target_link_libraries(exrenvmap OpenEXR::IlmImf)
+target_link_libraries(exrenvmap OpenEXR::OpenEXR)
 set_target_properties(exrenvmap PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )

src/bin/exrheader/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright Contributors to the OpenEXR Project.
 
 add_executable(exrheader main.cpp)
-target_link_libraries(exrheader OpenEXR::IlmImf)
+target_link_libraries(exrheader OpenEXR::OpenEXR)
 set_target_properties(exrheader PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )

src/bin/exrmakepreview/CMakeLists.txt

@@ -5,7 +5,7 @@ add_executable(exrmakepreview
   main.cpp
   makePreview.cpp
 )
-target_link_libraries(exrmakepreview OpenEXR::IlmImf)
+target_link_libraries(exrmakepreview OpenEXR::OpenEXR)
 set_target_properties(exrmakepreview PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )

src/bin/exrmaketiled/CMakeLists.txt

@@ -6,7 +6,7 @@ add_executable(exrmaketiled
   main.cpp
   Image.cpp
 )
-target_link_libraries(exrmaketiled OpenEXR::IlmImf)
+target_link_libraries(exrmaketiled OpenEXR::OpenEXR)
 set_target_properties(exrmaketiled PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )

src/bin/exrmultipart/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright Contributors to the OpenEXR Project.
 
 add_executable(exrmultipart exrmultipart.cpp)
-target_link_libraries(exrmultipart OpenEXR::IlmImf)
+target_link_libraries(exrmultipart OpenEXR::OpenEXR)
 set_target_properties(exrmultipart PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )

src/bin/exrmultiview/CMakeLists.txt

@@ -6,7 +6,7 @@ add_executable(exrmultiview
   main.cpp
   Image.cpp
 )
-target_link_libraries(exrmultiview OpenEXR::IlmImf)
+target_link_libraries(exrmultiview OpenEXR::OpenEXR)
 set_target_properties(exrmultiview PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )

src/bin/exrstdattr/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright Contributors to the OpenEXR Project.
 
 add_executable(exrstdattr main.cpp)
-target_link_libraries(exrstdattr OpenEXR::IlmImf)
+target_link_libraries(exrstdattr OpenEXR::OpenEXR)
 set_target_properties(exrstdattr PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )

src/examples/CMakeLists.txt

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright Contributors to the OpenEXR Project.
 
-add_executable(IlmImfExamples
+add_executable(OpenEXRExamples
   drawImage.cpp
   generalInterfaceExamples.cpp
   generalInterfaceTiledExamples.cpp
@@ -11,7 +11,7 @@ add_executable(IlmImfExamples
   rgbaInterfaceExamples.cpp
   rgbaInterfaceTiledExamples.cpp
 )
-target_link_libraries(IlmImfExamples OpenEXR::IlmImf)
+target_link_libraries(OpenEXRExamples OpenEXR::OpenEXR)
 
 # Examples
 install(
@@ -36,5 +36,5 @@ install(
     ${CMAKE_INSTALL_DOCDIR}/examples
   )
 if(WIN32 AND (BUILD_SHARED_LIBS OR OPENEXR_BUILD_BOTH_STATIC_SHARED))
-  target_compile_definitions(IlmImfExamples PRIVATE OPENEXR_DLL)
+  target_compile_definitions(OpenEXRExamples PRIVATE OPENEXR_DLL)
 endif()

src/examples/lowLevelIoExamples.cpp

@@ -39,7 +39,7 @@
 //	Code examples that show how implement custom low-level
 //	file input and output for OpenEXR files:
 //
-//	Classes C_IStream and C_OStream are derived from IlmImf's
+//	Classes C_IStream and C_OStream are derived from OpenEXR's
 //	abstract IStream and OStreamd classes.  They allow OpenEXR
 //	file input and output via C stdio files (FILE *).
 //

src/lib/OpenEXR/CMakeLists.txt

@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright Contributors to the OpenEXR Project.
 
-openexr_define_library(IlmImf
-  PRIV_EXPORT ILMIMF_EXPORTS
+openexr_define_library(OpenEXR
+  PRIV_EXPORT OPENEXR_EXPORTS
   CURDIR ${CMAKE_CURRENT_SOURCE_DIR}
   SOURCES
     b44ExpLogTable.h

src/lib/OpenEXR/ImfAttribute.h

@@ -227,7 +227,7 @@ class TypedAttribute: public Attribute
     // a global variable in the IlmIlm library.  A thread in a multi-
     // threaded program may call registerAttributeType() only when no
     // other thread is accessing any functions or classes in the
-    // IlmImf library.
+    // OpenEXR library.
     //
     //---------------------------------------------------------------
 

src/lib/OpenEXR/ImfExport.h

@@ -33,7 +33,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #if defined(OPENEXR_DLL)
-    #if defined(ILMIMF_EXPORTS)
+    #if defined(OPENEXR_EXPORTS)
 	    #define IMF_EXPORT __declspec(dllexport)
         #define IMF_EXPORT_CONST extern __declspec(dllexport)
     #else

src/lib/OpenEXR/ImfHeader.h

@@ -570,7 +570,7 @@ class Header::ConstIterator
 //
 // In a multithreaded program, staticInitialize() must be called once
 // during startup, before the program accesses any other functions or
-// classes in the IlmImf library.  Calling staticInitialize() in this
+// classes in the OpenEXR library.  Calling staticInitialize() in this
 // way avoids races during initialization of the library's global
 // variables.
 //

src/lib/OpenEXR/ImfMisc.cpp

@@ -1821,11 +1821,11 @@ usesLongNames (const Header &header)
     //
     // If an OpenEXR file contains any attribute names, attribute type names
     // or channel names longer than 31 characters, then the file cannot be
-    // read by older versions of the IlmImf library (up to OpenEXR 1.6.1).
+    // read by older versions of the OpenEXR library (up to OpenEXR 1.6.1).
     // Before writing the file header, we check if the header contains
     // any names longer than 31 characters; if it does, then we set the
     // LONG_NAMES_FLAG in the file version number.  Older versions of the
-    // IlmImf library will refuse to read files that have the LONG_NAMES_FLAG
+    // OpenEXR library will refuse to read files that have the LONG_NAMES_FLAG
     // set.  Without the flag, older versions of the library would mis-
     // interpret the file as broken.
     //

src/lib/OpenEXR/ImfStandardAttributes.h

@@ -356,7 +356,7 @@ IMF_STD_ATTRIBUTE_DEF (worldToNDC, WorldToNDC, IMATH_NAMESPACE::M44f)
 // Note: this attribute can be set by application code that writes a file
 // in order to tell applications that read the file whether the pixel data
 // must be cleaned up prior to image processing operations such as flattening. 
-// The IlmImf library does not verify that the attribute is consistent with
+// The OpenEXR library does not verify that the attribute is consistent with
 // the actual state of the pixels.  Application software may assume that the
 // attribute is valid, as long as the software will not crash or lock up if
 // any pixels are inconsistent with the deepImageState attribute.

src/lib/OpenEXR/ImfThreading.cpp

@@ -34,7 +34,7 @@
 
 //-----------------------------------------------------------------------------
 //
-//	Threading support for the IlmImf library
+//	Threading support for the OpenEXR library
 //
 //-----------------------------------------------------------------------------
 

src/lib/OpenEXR/ImfThreading.h

@@ -40,9 +40,9 @@
 
 //-----------------------------------------------------------------------------
 //
-//	Threading support for the IlmImf library
+//	Threading support for the OpenEXR library
 //
-//	The IlmImf library uses threads to perform reading and writing
+//	The OpenEXR library uses threads to perform reading and writing
 //	of OpenEXR files in parallel.  The thread that calls the library
 //	always performs the actual file IO (this is usually the main
 //	application thread) whereas a several worker threads perform
@@ -54,7 +54,7 @@
 //	worker threads, then pipelining as well as concurrent compression
 //	of multiple blocks can be performed.
 // 
-//	Threading in the Imf library is controllable at two granularities:
+//	Threading in the EXR library is controllable at two granularities:
 //
 //	* The functions in this file query and control the total number
 //	  of worker threads, which will be created globally for the whole

src/lib/OpenEXRUtil/CMakeLists.txt

@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright Contributors to the OpenEXR Project.
 
-openexr_define_library(IlmImfUtil
-  PRIV_EXPORT ILMIMFUTIL_EXPORTS
+openexr_define_library(OpenEXRUtil
+  PRIV_EXPORT OPENEXRUTIL_EXPORTS
   CURDIR ${CMAKE_CURRENT_SOURCE_DIR}
   SOURCES
     ImfImageChannel.cpp
@@ -39,5 +39,5 @@ openexr_define_library(IlmImfUtil
     ImfUtilExport.h
     ImfCheckFile.h
   DEPENDENCIES
-    OpenEXR::IlmImf
+    OpenEXR::OpenEXR
 )

src/lib/OpenEXRUtil/ImfDeepImageIO.cpp

@@ -112,7 +112,7 @@ loadDeepImage
 
     //XXX TODO: the tiled flag obtained above is unreliable;
     // open the file as a multi-part file and inspect the header.
-    // Can the IlmImf library be fixed?
+    // Can the OpenEXR library be fixed?
 
     {
         MultiPartInputFile mpi (fileName.c_str());
@@ -161,7 +161,7 @@ saveDeepScanLineImage
     newHdr.dataWindow() = dataWindowForFile (hdr, img, dws);
 
     //XXX TODO: setting the compression to, for example,  ZIP_COMPRESSION,
-    //then the IlmImf library will save the file, but later it will not be
+    //then the OpenEXR library will save the file, but later it will not be
     //able to read it.  Fix the library!
 
     newHdr.compression() = ZIPS_COMPRESSION;
@@ -309,7 +309,7 @@ saveDeepTiledImage
     newHdr.dataWindow() = dataWindowForFile (hdr, img, dws);
 
     //XXX TODO: setting the compression to, for example,  ZIP_COMPRESSION,
-    //then the IlmImf library will save the file, but later it will not be
+    //then the OpenEXR library will save the file, but later it will not be
     //able to read it.  Fix the library!
 
     newHdr.compression() = ZIPS_COMPRESSION;

src/lib/OpenEXRUtil/ImfImageIO.cpp

@@ -107,7 +107,7 @@ loadImage (const string &fileName, Header &hdr)
 
     //XXX TODO: the tiled flag obtained above is unreliable;
     // open the file as a multi-part file and inspect the header.
-    // Can the IlmImf library be fixed?
+    // Can the OpenEXR library be fixed?
 
     {
         MultiPartInputFile mpi (fileName.c_str());

src/lib/OpenEXRUtil/ImfUtilExport.h

@@ -33,7 +33,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #if defined(OPENEXR_DLL)
-    #if defined(ILMIMFUTIL_EXPORTS)
+    #if defined(OPENEXRUTIL_EXPORTS)
         #define IMFUTIL_EXPORT __declspec(dllexport)
         #define IMFUTIL_EXPORT_CONST extern __declspec(dllexport)
     #else

src/lib/OpenEXRUtil/README

@@ -1,7 +1,7 @@
-The IlmImfUtil Library
+The OpenEXRUtil Library
 ----------------------
 
-The IlmImfUtil library implements an in-memory image data structure, as
+The OpenEXRUtil library implements an in-memory image data structure, as
 well as simple function calls for saving images in OpenEXR files, and for
 constructing images from the contents of existing OpenEXR files.
 
@@ -11,7 +11,7 @@ format selection, sub-sampled channels, multi-resolution images, deep
 images, or storing images as tiles or scan lines.  While reading a simple
 RGBA image does not require a lot of code, reading the contents of an
 arbitrary OpenEXR file, and representing those contents in main memory
-is not trivial.  The IlmImfUtil library simplifies those tasks.
+is not trivial.  The OpenEXRUtil library simplifies those tasks.
 
 Image, Image Level, Image Channel
 ---------------------------------
@@ -132,7 +132,7 @@ or
 The application owns the image that is returned by the loadImage() call.
 It is the application's responsibility to delete the Image object.
 
-The IlmImfUtil library also provides versions of the saveImage() and
+The OpenEXRUtil library also provides versions of the saveImage() and
 loadImage() functions that work only on flat images or only on deep images:
 
     saveFlatImage()
@@ -216,7 +216,7 @@ Reading and writing pixels in the single-level deep image:
 In addition to functions for reading and writing individual pixels, there
 are functions for accessing a whole row of pixels with a single function
 call.  For details see the ImfFlatImageChannel.h, ImfDeepImageChannel.h
-and ImfSampleCountChannel.h header files in the IlmImf library:
+and ImfSampleCountChannel.h header files in the OpenEXR library:
 
     T*                   TypedFlatImageChannel<T>::row (int r);
     const T*             TypedFlatImageChannel<T>::row (int r) const;
@@ -256,7 +256,7 @@ Erase a channel, rename a channel, rename multiple channels at the same time:
 Missing Functionality:
 ----------------------
 
-At this point, the IlmImfUtil library cannot read or write multi-part
+At this point, the OpenEXRUtil library cannot read or write multi-part
 files.  A future version of the library should probably define a new class
 MultiPartImage that contains a set of regular images.  The library should
 also define corresponding loadMultiPartImage() and saveMultiPartImage()