diff options
Diffstat (limited to 'graphics/darktable/patches/patch-src_common_imageio__exr.hh')
| -rw-r--r-- | graphics/darktable/patches/patch-src_common_imageio__exr.hh | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/graphics/darktable/patches/patch-src_common_imageio__exr.hh b/graphics/darktable/patches/patch-src_common_imageio__exr.hh index c5d1de42ab9..a3db7a0c340 100644 --- a/graphics/darktable/patches/patch-src_common_imageio__exr.hh +++ b/graphics/darktable/patches/patch-src_common_imageio__exr.hh @@ -1,10 +1,8 @@ -$NetBSD: patch-src_common_imageio__exr.hh,v 1.2 2013/05/09 15:27:02 wiz Exp $ +$NetBSD: patch-src_common_imageio__exr.hh,v 1.3 2013/12/04 13:02:08 drochner Exp $ -stdc++ fixes from joerg (first, first half of third junk). +stdc++ fixes from joerg -openexr-2.0 compat from http://www.darktable.org/redmine/issues/9398 - ---- src/common/imageio_exr.hh.orig 2013-04-03 20:13:14.000000000 +0000 +--- src/common/imageio_exr.hh.orig 2013-06-24 18:35:28.000000000 +0000 +++ src/common/imageio_exr.hh @@ -21,7 +21,15 @@ #include "common/image.h" @@ -22,23 +20,7 @@ openexr-2.0 compat from http://www.darktable.org/redmine/issues/9398 #include <OpenEXR/ImfFrameBuffer.h> #include <OpenEXR/ImfTestFile.h> -@@ -30,8 +38,14 @@ - #include <OpenEXR/ImfChannelList.h> - #include <OpenEXR/ImfStandardAttributes.h> - -+#ifdef OPENEXR_IMF_INTERNAL_NAMESPACE -+#define IMF_NS OPENEXR_IMF_INTERNAL_NAMESPACE -+#else -+#define IMF_NS Imf -+#endif -+ - // this stores our exif data as a blob. --namespace Imf -+namespace IMF_NS - { - class Blob - { -@@ -50,11 +64,11 @@ public: +@@ -56,7 +64,7 @@ public: } uint32_t size; @@ -47,8 +29,3 @@ openexr-2.0 compat from http://www.darktable.org/redmine/issues/9398 }; --typedef Imf::TypedAttribute<Imf::Blob> BlobAttribute; -+typedef IMF_NS::TypedAttribute<IMF_NS::Blob> BlobAttribute; - template <> const char *BlobAttribute::staticTypeName() - { - return "blob"; |