]>
Commit | Line | Data |
---|---|---|
fcbf7643 JR |
1 | --- darktable-1.1.4/src/common/imageio_exr.hh~ 2013-03-09 22:48:35.000000000 +0100 |
2 | +++ darktable-1.1.4/src/common/imageio_exr.hh 2013-04-05 08:11:04.499777789 +0200 | |
3 | @@ -31,7 +31,7 @@ | |
4 | #include <OpenEXR/ImfStandardAttributes.h> | |
5 | ||
6 | // this stores our exif data as a blob. | |
7 | -namespace Imf | |
8 | +namespace Imf_2_0 | |
9 | { | |
10 | class Blob | |
11 | { | |
12 | @@ -54,7 +54,7 @@ | |
13 | }; | |
14 | ||
15 | ||
16 | -typedef Imf::TypedAttribute<Imf::Blob> BlobAttribute; | |
17 | +typedef Imf_2_0::TypedAttribute<Imf_2_0::Blob> BlobAttribute; | |
18 | template <> const char *BlobAttribute::staticTypeName() | |
19 | { | |
20 | return "blob"; |