Remove unused header, fix attribute spec order to work with clang

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
kdt3rd · Apr 18, 2024 · 43155c0 · 43155c0
1 parent 2297c10
commit 43155c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/lib/OpenEXR/ImfContext.cpp b/src/lib/OpenEXR/ImfContext.cpp
@@ -15,7 +15,6 @@
 #include <mutex>
 
 #include <string.h>
-#include <string_view>
 
 #include <ImfBoxAttribute.h>
 #include <ImfChannelListAttribute.h>

diff --git a/src/lib/OpenEXR/ImfInputFile.h b/src/lib/OpenEXR/ImfInputFile.h
@@ -78,9 +78,9 @@ class IMF_EXPORT_TYPE InputFile : public GenericInputFile
     // Access to the file header
     //--------------------------
 
-    IMF_EXPORT
     OPENEXR_DEPRECATED (
         "Use context-based attribute access for faster retrieval")
+    IMF_EXPORT
     const Header& header () const;
 
     //----------------------------------
@@ -101,18 +101,18 @@ class IMF_EXPORT_TYPE InputFile : public GenericInputFile
     // to readPixels().
     //-----------------------------------------------------------
 
-    IMF_EXPORT
     OPENEXR_DEPRECATED (
         "Use stateless API to pass framebuffer with read request")
+    IMF_EXPORT
     void setFrameBuffer (const FrameBuffer& frameBuffer);
 
     //-----------------------------------
     // Access to the current frame buffer
     //-----------------------------------
 
-    IMF_EXPORT
     OPENEXR_DEPRECATED (
         "Use stateless API to pass framebuffer with read request")
+    IMF_EXPORT
     const FrameBuffer& frameBuffer () const;
 
     //---------------------------------------------------------------
@@ -145,8 +145,8 @@ class IMF_EXPORT_TYPE InputFile : public GenericInputFile
     //
     //---------------------------------------------------------------
 
-    IMF_EXPORT
     OPENEXR_DEPRECATED ("No longer meaningful")
+    IMF_EXPORT
     bool isOptimizationEnabled () const;
 
     //---------------------------------------------------------------
@@ -168,13 +168,14 @@ class IMF_EXPORT_TYPE InputFile : public GenericInputFile
     //
     //---------------------------------------------------------------
 
-    IMF_EXPORT
     OPENEXR_DEPRECATED (
         "Use stateless API to pass framebuffer with read request")
-    void readPixels (int scanLine1, int scanLine2);
     IMF_EXPORT
+    void readPixels (int scanLine1, int scanLine2);
+
     OPENEXR_DEPRECATED (
         "Use stateless API to pass framebuffer with read request")
+    IMF_EXPORT
     void readPixels (int scanLine);
 
     //----------------------------------------------
@@ -183,8 +184,8 @@ class IMF_EXPORT_TYPE InputFile : public GenericInputFile
     // used to implement OutputFile::copyPixels()).
     //----------------------------------------------
 
-    IMF_EXPORT
     OPENEXR_DEPRECATED ("Prefer using externally managed buffer")
+    IMF_EXPORT
     void rawPixelData (
         int firstScanLine, const char*& pixelData, int& pixelDataSize);
 
@@ -214,8 +215,8 @@ class IMF_EXPORT_TYPE InputFile : public GenericInputFile
     // used to implement TiledOutputFile::copyPixels()).
     //--------------------------------------------------
 
-    IMF_EXPORT
     OPENEXR_DEPRECATED ("Prefer using externally managed buffer")
+    IMF_EXPORT
     void rawTileData (
         int&         dx,
         int&         dy,