[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61486] trunk/lib/windows_vc12/ openexr: Windows MSVC 2013 x32 bump OpenEXR 2.2

Martijn Berger martijn.berger at gmail.com
Mon Feb 2 20:57:43 CET 2015


Revision: 61486
          https://developer.blender.org/rBL61486
Author:   juicyfruit
Date:     2015-02-02 19:57:41 +0000 (Mon, 02 Feb 2015)
Log Message:
-----------
Windows MSVC 2013 x32 bump OpenEXR 2.2 

Modified Paths:
--------------
    trunk/lib/windows_vc12/openexr/include/OpenEXR/IlmBaseConfig.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfArray.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfCompression.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfMultiView.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfPartType.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfStandardAttributes.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfTestFile.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/OpenEXRConfig.h
    trunk/lib/windows_vc12/openexr/lib/Half.lib
    trunk/lib/windows_vc12/openexr/lib/Half_d.lib
    trunk/lib/windows_vc12/openexr/lib/pkgconfig/IlmBase.pc

Added Paths:
-----------
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfDeepImage.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfDeepImageChannel.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfDeepImageIO.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfDeepImageLevel.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfFlatImage.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfFlatImageChannel.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfFlatImageIO.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfFlatImageLevel.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfFloatVectorAttribute.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfImage.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfImageChannel.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfImageChannelRenaming.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfImageDataWindow.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfImageIO.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfImageLevel.h
    trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfSampleCountChannel.h
    trunk/lib/windows_vc12/openexr/lib/Iex-2_2.lib
    trunk/lib/windows_vc12/openexr/lib/Iex-2_2_d.lib
    trunk/lib/windows_vc12/openexr/lib/IexMath-2_2.lib
    trunk/lib/windows_vc12/openexr/lib/IexMath-2_2_d.lib
    trunk/lib/windows_vc12/openexr/lib/IlmImf-2_2.lib
    trunk/lib/windows_vc12/openexr/lib/IlmImf-2_2_d_d.lib
    trunk/lib/windows_vc12/openexr/lib/IlmImfUtil-2_2.lib
    trunk/lib/windows_vc12/openexr/lib/IlmImfUtil-2_2_d_d.lib
    trunk/lib/windows_vc12/openexr/lib/IlmThread-2_2.lib
    trunk/lib/windows_vc12/openexr/lib/IlmThread-2_2_d.lib
    trunk/lib/windows_vc12/openexr/lib/Imath-2_2.lib
    trunk/lib/windows_vc12/openexr/lib/Imath-2_2_d.lib

Removed Paths:
-------------
    trunk/lib/windows_vc12/openexr/lib/Iex-2_1.lib
    trunk/lib/windows_vc12/openexr/lib/Iex-2_1_d.lib
    trunk/lib/windows_vc12/openexr/lib/IexMath-2_1.lib
    trunk/lib/windows_vc12/openexr/lib/IexMath-2_1_d.lib
    trunk/lib/windows_vc12/openexr/lib/IlmImf-2_1.lib
    trunk/lib/windows_vc12/openexr/lib/IlmImf-2_1_d.lib
    trunk/lib/windows_vc12/openexr/lib/IlmThread-2_1.lib
    trunk/lib/windows_vc12/openexr/lib/IlmThread-2_1_d.lib
    trunk/lib/windows_vc12/openexr/lib/Imath-2_1.lib
    trunk/lib/windows_vc12/openexr/lib/Imath-2_1_d.lib

Modified: trunk/lib/windows_vc12/openexr/include/OpenEXR/IlmBaseConfig.h
===================================================================
--- trunk/lib/windows_vc12/openexr/include/OpenEXR/IlmBaseConfig.h	2015-02-02 18:46:48 UTC (rev 61485)
+++ trunk/lib/windows_vc12/openexr/include/OpenEXR/IlmBaseConfig.h	2015-02-02 19:57:41 UTC (rev 61486)
@@ -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/windows_vc12/openexr/include/OpenEXR/ImfArray.h
===================================================================
--- trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfArray.h	2015-02-02 18:46:48 UTC (rev 61485)
+++ trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfArray.h	2015-02-02 19:57:41 UTC (rev 61486)
@@ -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/windows_vc12/openexr/include/OpenEXR/ImfCompression.h
===================================================================
--- trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfCompression.h	2015-02-02 18:46:48 UTC (rev 61485)
+++ trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfCompression.h	2015-02-02 19:57:41 UTC (rev 61486)
@@ -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
 };
 

Added: trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfDeepImage.h
===================================================================
--- trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfDeepImage.h	                        (rev 0)
+++ trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfDeepImage.h	2015-02-02 19:57:41 UTC (rev 61486)
@@ -0,0 +1,93 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2014, Industrial Light & Magic, a division of Lucas
+// Digital Ltd. LLC
+// 
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+// *       Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// *       Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// *       Neither the name of Industrial Light & Magic nor the names of
+// its contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission. 
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDED_IMF_DEEP_IMAGE_H
+#define INCLUDED_IMF_DEEP_IMAGE_H
+
+//----------------------------------------------------------------------------
+//
+//      class DeepImage
+//
+//      For an explanation of images, levels and channels,
+//      see the comments in header file Image.h.
+//
+//----------------------------------------------------------------------------
+
+#include "ImfDeepImageLevel.h"
+#include <ImfImage.h>
+#include <ImfTileDescription.h>
+#include "ImfExport.h"
+
+OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
+
+
+class IMF_EXPORT DeepImage : public Image
+{
+  public:
+
+    //
+    // Constructors and destructor.
+    // The default constructor constructs an image with an empty data
+    // window level mode ONE_LEVEL and level rounding mode ROUND_DOWN.
+    //
+
+	DeepImage();
+
+	DeepImage(const IMATH_NAMESPACE::Box2i &dataWindow,
+               LevelMode levelMode = ONE_LEVEL,
+               LevelRoundingMode levelRoundingMode = ROUND_DOWN);
+
+	virtual ~DeepImage();
+
+
+    //
+    // Accessing image levels by level number
+    //
+
+	virtual DeepImageLevel &        level(int l = 0);
+	virtual const DeepImageLevel &  level(int l = 0) const;
+
+	virtual DeepImageLevel &        level(int lx, int ly);
+	virtual const DeepImageLevel &  level(int lx, int ly) const;
+
+   protected:
+
+	virtual DeepImageLevel *
+        newLevel (int lx, int ly, const IMATH_NAMESPACE::Box2i &dataWindow);
+};
+
+
+OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_EXIT
+
+#endif

Added: trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfDeepImageChannel.h
===================================================================
--- trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfDeepImageChannel.h	                        (rev 0)
+++ trunk/lib/windows_vc12/openexr/include/OpenEXR/ImfDeepImageChannel.h	2015-02-02 19:57:41 UTC (rev 61486)
@@ -0,0 +1,533 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2014, Industrial Light & Magic, a division of Lucas
+// Digital Ltd. LLC
+// 
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+// *       Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// *       Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// *       Neither the name of Industrial Light & Magic nor the names of
+// its contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission. 
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDED_IMF_DEEP_IMAGE_CHANNEL_H
+#define INCLUDED_IMF_DEEP_IMAGE_CHANNEL_H
+
+//----------------------------------------------------------------------------
+//
+//      class DeepImageChannel,
+//      template class TypedDeepImageChannel<T>
+//
+//      For an explanation of images, levels and channels,
+//      see the comments in header file Image.h.
+//
+//----------------------------------------------------------------------------
+
+#include "ImfImageChannel.h"
+#include <ImfDeepFrameBuffer.h>
+#include "ImfExport.h"
+
+OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
+
+class DeepImageLevel;
+class SampleCountChannel;
+
+//
+// Image channels:
+//
+// A TypedDeepImageChannel<T> holds the pixel data for a single channel
+// of one level of a deep image.  Each pixel in the channel contains an
+// array of n samples of type T, where T is either half, float or
+// unsigned int, and n is stored in a separate sample count channel.
+// Sample storage is allocated only for pixels within the data window
+// of the level.
+//
+
+class DeepImageChannel: public ImageChannel
+{
+  public:
+
+    //
+    // Construct an OpenEXR frame buffer slice for this channel.
+    // This function is needed reading an image from an OpenEXR
+    // file and for saving an image in an OpenEXR file.
+    // 
+
+    virtual DeepSlice           slice () const = 0;
+
+    //

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list