From 942ff971d30cba1b237c91e9f448376d279dc5ee Mon Sep 17 00:00:00 2001
From: Halfdan Ingvarsson <halfdan@sidefx.com>
Date: Mon, 6 Oct 2014 20:55:43 -0400
Subject: [PATCH] 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.
---
 OpenEXR/IlmImfUtil/ImfDeepImageChannel.h | 16 ++++++----------
 OpenEXR/IlmImfUtil/ImfFlatImageChannel.h |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/OpenEXR/IlmImfUtil/ImfDeepImageChannel.h b/OpenEXR/IlmImfUtil/ImfDeepImageChannel.h
index 8e0555387e..cd29a4839c 100644
--- 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
index 6d268f909b..c6b49ee847 100644
--- 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: