Fixed exports on DeepImageChannel and FlatImageChannel. If the whole …

…class isn't exported, the typeinfo doesn't get exported, and so dynamic casting into those classes will not work. Also fixed angle-bracket include to a quoted include.
AcademySoftwareFoundation · Aug 8, 2018 · 942ff97 · 942ff97
1 parent fd85709
commit 942ff97
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/OpenEXR/IlmImfUtil/ImfDeepImageChannel.h b/OpenEXR/IlmImfUtil/ImfDeepImageChannel.h
@@ -48,7 +48,7 @@
 #include "ImfImageChannel.h"
 #include "ImfUtilExport.h"
 
-#include <ImfDeepFrameBuffer.h>
+#include "ImfDeepFrameBuffer.h"
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
 
@@ -66,7 +66,7 @@ class SampleCountChannel;
 // of the level.
 //
 
-class DeepImageChannel: public ImageChannel
+class IMFUTIL_EXPORT DeepImageChannel: public ImageChannel
 {
   public:
 
@@ -82,20 +82,16 @@ class DeepImageChannel: public ImageChannel
     // Access to the image level to which this channel belongs.
     //
 
-	IMFUTIL_EXPORT 
-    DeepImageLevel &            deepLevel();
-	IMFUTIL_EXPORT
-    const DeepImageLevel &      deepLevel() const;
+	DeepImageLevel &            deepLevel();
+	const DeepImageLevel &      deepLevel() const;
 
 
     //
     // Access to the sample count channel for this deep channel.
     //
 
-	IMFUTIL_EXPORT 
-    SampleCountChannel &        sampleCounts();
-	IMFUTIL_EXPORT
-    const SampleCountChannel &  sampleCounts() const;
+	SampleCountChannel &        sampleCounts();
+	const SampleCountChannel &  sampleCounts() const;
 
 
   protected:

diff --git a/OpenEXR/IlmImfUtil/ImfFlatImageChannel.h b/OpenEXR/IlmImfUtil/ImfFlatImageChannel.h
@@ -66,7 +66,7 @@ class FlatImageLevel;
 // only for pixels within the data window of the level.
 //
 
-class FlatImageChannel: public ImageChannel
+class IMF_EXPORT FlatImageChannel: public ImageChannel
 {
   public:
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,7 @@ class FlatImageLevel; @@
     // only for pixels within the data window of the level.
     //
-    class FlatImageChannel: public ImageChannel
+    class IMF_EXPORT FlatImageChannel: public ImageChannel
     {
       public:
@@ Expand Down @@