Revision: 61484
https://developer.blender.org/rBL61484
Author: juicyfruit
Date: 2015-02-02 18:40:18 +0000 (Mon, 02 Feb 2015)
Log Message:
-----------
Bump OpenEXR to 2.2
Modified Paths:
--------------
trunk/lib/win64_vc12/openexr/build.bat
trunk/lib/win64_vc12/openexr/include/OpenEXR/IlmBaseConfig.h
trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfArray.h
trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfCompression.h
trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfMultiView.h
trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfPartType.h
trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfStandardAttributes.h
trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfTestFile.h
trunk/lib/win64_vc12/openexr/include/OpenEXR/OpenEXRConfig.h
trunk/lib/win64_vc12/openexr/lib/Half.lib
trunk/lib/win64_vc12/openexr/lib/Half_d.lib
trunk/lib/win64_vc12/openexr/lib/pkgconfig/IlmBase.pc
Added Paths:
-----------
trunk/lib/win64_vc12/openexr/lib/Iex-2_2.lib
trunk/lib/win64_vc12/openexr/lib/Iex-2_2_d.lib
trunk/lib/win64_vc12/openexr/lib/IexMath-2_2.lib
trunk/lib/win64_vc12/openexr/lib/IexMath-2_2_d.lib
trunk/lib/win64_vc12/openexr/lib/IlmImf-2_2.lib
trunk/lib/win64_vc12/openexr/lib/IlmImf-2_2_d_d.lib
trunk/lib/win64_vc12/openexr/lib/IlmImfUtil-2_2.lib
trunk/lib/win64_vc12/openexr/lib/IlmImfUtil-2_2_d_d.lib
trunk/lib/win64_vc12/openexr/lib/IlmThread-2_2.lib
trunk/lib/win64_vc12/openexr/lib/IlmThread-2_2_d.lib
trunk/lib/win64_vc12/openexr/lib/Imath-2_2.lib
trunk/lib/win64_vc12/openexr/lib/Imath-2_2_d.lib
Removed Paths:
-------------
trunk/lib/win64_vc12/openexr/lib/Iex-2_1.lib
trunk/lib/win64_vc12/openexr/lib/Iex-2_1_d.lib
trunk/lib/win64_vc12/openexr/lib/IexMath-2_1.lib
trunk/lib/win64_vc12/openexr/lib/IexMath-2_1_d.lib
trunk/lib/win64_vc12/openexr/lib/IlmImf-2_1.lib
trunk/lib/win64_vc12/openexr/lib/IlmImf-2_1_d.lib
trunk/lib/win64_vc12/openexr/lib/IlmThread-2_1.lib
trunk/lib/win64_vc12/openexr/lib/IlmThread-2_1_d.lib
trunk/lib/win64_vc12/openexr/lib/Imath-2_1.lib
trunk/lib/win64_vc12/openexr/lib/Imath-2_1_d.lib
Modified: trunk/lib/win64_vc12/openexr/build.bat
===================================================================
--- trunk/lib/win64_vc12/openexr/build.bat 2015-02-01 21:00:53 UTC (rev
61483)
+++ trunk/lib/win64_vc12/openexr/build.bat 2015-02-02 18:40:18 UTC (rev
61484)
@@ -1,6 +1,6 @@
@Echo off
-cd ilmbase-2.1.0
+cd ilmbase-2.2.0
set LIBDIR=%CD%\..\..
@@ -42,7 +42,7 @@
cd ..\..\..\
-cd openexr-2.1.0
+cd openexr-2.2.0
set LIBDIR=%CD%\..\..
Modified: trunk/lib/win64_vc12/openexr/include/OpenEXR/IlmBaseConfig.h
===================================================================
--- trunk/lib/win64_vc12/openexr/include/OpenEXR/IlmBaseConfig.h
2015-02-01 21:00:53 UTC (rev 61483)
+++ trunk/lib/win64_vc12/openexr/include/OpenEXR/IlmBaseConfig.h
2015-02-02 18:40:18 UTC (rev 61484)
@@ -14,17 +14,21 @@
#undef HAVE_POSIX_SEMAPHORES
+// Required for system-specific debug trap code in IexBaseExc.cpp
+
+#define PLATFORM_WINDOWS 1
+
#define ILMBASE_INTERNAL_NAMESPACE_CUSTOM 1
-#define IMATH_INTERNAL_NAMESPACE Imath_2_1
-#define IEX_INTERNAL_NAMESPACE Iex_2_1
-#define ILMTHREAD_INTERNAL_NAMESPACE IlmThread_2_1
+#define IMATH_INTERNAL_NAMESPACE Imath_2_2
+#define IEX_INTERNAL_NAMESPACE Iex_2_2
+#define ILMTHREAD_INTERNAL_NAMESPACE IlmThread_2_2
#define IMATH_NAMESPACE Imath
#define IEX_NAMESPACE Iex
#define ILMTHREAD_NAMESPACE IlmThread
-#define ILMBASE_VERSION_STRING "2.1.0"
-#define ILMBASE_PACKAGE_STRING "IlmBase 2.1.0"
+#define ILMBASE_VERSION_STRING "2.2.0"
+#define ILMBASE_PACKAGE_STRING "IlmBase 2.2.0"
#define ILMBASE_VERSION_MAJOR 2
-#define ILMBASE_VERSION_MINOR 1
+#define ILMBASE_VERSION_MINOR 2
#define ILMBASE_VERSION_PATCH 0
// Version as a single hex number, e.g. 0x01000300 == 1.0.3
Modified: trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfArray.h
===================================================================
--- trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfArray.h 2015-02-01
21:00:53 UTC (rev 61483)
+++ trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfArray.h 2015-02-02
18:40:18 UTC (rev 61484)
@@ -115,7 +115,7 @@
// Return the size of this array.
//-------------------------------
- long size() {return _size;}
+ long size() const {return _size;}
private:
@@ -170,8 +170,8 @@
// Return the size of this array.
//-------------------------------
- long height() {return _sizeX;}
- long width() {return _sizeY;}
+ long height() const {return _sizeX;}
+ long width() const {return _sizeY;}
private:
Modified: trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfCompression.h
===================================================================
--- trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfCompression.h
2015-02-01 21:00:53 UTC (rev 61483)
+++ trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfCompression.h
2015-02-02 18:40:18 UTC (rev 61484)
@@ -66,6 +66,15 @@
B44A_COMPRESSION = 7, // lossy 4-by-4 pixel block compression,
// flat fields are compressed more
+ DWAA_COMPRESSION = 8, // lossy DCT based compression, in blocks
+ // of 32 scanlines. More efficient for partial
+ // buffer access.
+
+ DWAB_COMPRESSION = 9, // lossy DCT based compression, in blocks
+ // of 256 scanlines. More efficient space
+ // wise and faster to decode full frames
+ // than DWAA_COMPRESSION.
+
NUM_COMPRESSION_METHODS // number of different compression methods
};
Modified: trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfMultiView.h
===================================================================
--- trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfMultiView.h 2015-02-01
21:00:53 UTC (rev 61483)
+++ trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfMultiView.h 2015-02-02
18:40:18 UTC (rev 61484)
@@ -120,6 +120,7 @@
// Return a list of all channels belonging to view viewName.
//
+IMF_EXPORT
ChannelList channelsInView (const std::string &viewName,
const ChannelList &channelList,
const StringVector &multiView);
Modified: trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfPartType.h
===================================================================
--- trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfPartType.h 2015-02-01
21:00:53 UTC (rev 61483)
+++ trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfPartType.h 2015-02-02
18:40:18 UTC (rev 61484)
@@ -37,6 +37,7 @@
#include <string>
#include "ImfNamespace.h"
+#include "ImfExport.h"
OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
@@ -46,13 +47,13 @@
const std::string DEEPSCANLINE = "deepscanline";
const std::string DEEPTILE = "deeptile";
-bool isImage(const std::string& name);
+IMF_EXPORT bool isImage(const std::string& name);
-bool isTiled(const std::string& name);
+IMF_EXPORT bool isTiled(const std::string& name);
-bool isDeepData(const std::string& name);
+IMF_EXPORT bool isDeepData(const std::string& name);
-bool isSupportedType(const std::string& name);
+IMF_EXPORT bool isSupportedType(const std::string& name);
OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_EXIT
Modified: trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfStandardAttributes.h
===================================================================
--- trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfStandardAttributes.h
2015-02-01 21:00:53 UTC (rev 61483)
+++ trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfStandardAttributes.h
2015-02-02 18:40:18 UTC (rev 61484)
@@ -55,6 +55,7 @@
//-----------------------------------------------------------------------------
#include "ImfHeader.h"
+#include "ImfBoxAttribute.h"
#include "ImfChromaticitiesAttribute.h"
#include "ImfEnvmapAttribute.h"
#include "ImfDeepImageStateAttribute.h"
@@ -69,18 +70,20 @@
#include "ImfNamespace.h"
#include "ImfExport.h"
-#define IMF_STD_ATTRIBUTE_DEF(name,suffix,object)
\
-
\
- OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
\
- IMF_EXPORT void add##suffix (Header &header,
const object &v); \
- IMF_EXPORT bool has##suffix (const Header
&header); \
- IMF_EXPORT const TypedAttribute<object> & name##Attribute (const Header
&header); \
- IMF_EXPORT TypedAttribute<object> & name##Attribute (Header
&header); \
- IMF_EXPORT const object & name (const Header &header);
\
- IMF_EXPORT object & name (Header &header);
\
- OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_EXIT
\
+#define IMF_STD_ATTRIBUTE_DEF(name,suffix,object) \
+ \
+ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER \
+ IMF_EXPORT void add##suffix (Header &header, const object &v); \
+ IMF_EXPORT bool has##suffix (const Header &header); \
+ IMF_EXPORT const TypedAttribute<object> & \
+ name##Attribute (const Header &header); \
+ IMF_EXPORT TypedAttribute<object> & \
+ name##Attribute (Header &header); \
+ IMF_EXPORT const object & \
+ name (const Header &header); \
+ IMF_EXPORT object & name (Header &header); \
+ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_EXIT \
-
//
// chromaticities -- for RGB images, specifies the CIE (x,y)
// chromaticities of the primaries and the white point
@@ -357,4 +360,23 @@
IMF_STD_ATTRIBUTE_DEF (deepImageState, DeepImageState, DeepImageState)
+
+//
+// originalDataWindow -- if application software crops an image, then it
+// should save the data window of the original, un-cropped image in the
+// originalDataWindow attribute.
+//
+
+IMF_STD_ATTRIBUTE_DEF
+ (originalDataWindow, OriginalDataWindow, IMATH_NAMESPACE::Box2i)
+
+
+//
+// dwaCompressionLevel -- sets the quality level for images compressed
+// with the DWAA or DWAB method.
+//
+
+IMF_STD_ATTRIBUTE_DEF (dwaCompressionLevel, DwaCompressionLevel, float)
+
+
#endif
Modified: trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfTestFile.h
===================================================================
--- trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfTestFile.h 2015-02-01
21:00:53 UTC (rev 61483)
+++ trunk/lib/win64_vc12/openexr/include/OpenEXR/ImfTestFile.h 2015-02-02
18:40:18 UTC (rev 61484)
@@ -51,14 +51,47 @@
OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
-IMF_EXPORT bool isOpenExrFile (const char fileName[], bool &isTiled);
IMF_EXPORT bool isOpenExrFile (const char fileName[]);
+
+IMF_EXPORT bool isOpenExrFile (const char fileName[],
+ bool &isTiled);
+
+IMF_EXPORT bool isOpenExrFile (const char fileName[],
+ bool &isTiled,
+ bool &isDeep);
+
+IMF_EXPORT bool isOpenExrFile (const char fileName[],
+ bool &isTiled,
+ bool &isDeep,
+ bool &isMultiPart);
+
IMF_EXPORT bool isTiledOpenExrFile (const char fileName[]);
-IMF_EXPORT bool isOpenExrFile (IStream &is, bool &isTiled);
+
+IMF_EXPORT bool isDeepOpenExrFile (const char fileName[]);
+
+IMF_EXPORT bool isMultiPartOpenExrFile (const char fileName[]);
+
IMF_EXPORT bool isOpenExrFile (IStream &is);
+
+IMF_EXPORT bool isOpenExrFile (IStream &is,
+ bool &isTiled);
+
+IMF_EXPORT bool isOpenExrFile (IStream &is,
+ bool &isTiled,
+ bool &isDeep);
+
+IMF_EXPORT bool isOpenExrFile (IStream &is,
+ bool &isTiled,
+ bool &isDeep,
+ bool &isMultiPart);
+
IMF_EXPORT bool isTiledOpenExrFile (IStream &is);
+IMF_EXPORT bool isDeepOpenExrFile (IStream &is);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
