[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55881] trunk/lib/darwin-9.x.universal/ openexr: OSX: up exr to 1.7.1(prerequisite for osl 1.3)
jens verwiebe
info at jensverwiebe.de
Sun Apr 7 16:25:10 CEST 2013
Revision: 55881
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55881
Author: jensverwiebe
Date: 2013-04-07 14:25:10 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
OSX: up exr to 1.7.1(prerequisite for osl 1.3)
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMacros.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IlmBaseConfig.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IlmThread.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IlmThreadMutex.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IlmThreadPool.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IlmThreadSemaphore.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathBox.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathBoxAlgo.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathColorAlgo.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathEuler.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathExc.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathFrustum.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathFun.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathLimits.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathLineAlgo.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathMath.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathMatrix.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathMatrixAlgo.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathPlatform.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathQuat.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathRandom.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathRoots.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathSphere.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathVec.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathVecAlgo.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfAttribute.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfCRgbaFile.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfChannelList.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfChromaticities.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfCompression.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfEnvmap.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfFrameBuffer.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfHeader.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfInt64.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfMatrixAttribute.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfName.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfRgbaFile.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfStandardAttributes.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfTileDescription.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfTiledRgbaFile.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfVecAttribute.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfVersion.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/OpenEXRConfig.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/half.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/halfFunction.h
trunk/lib/darwin-9.x.universal/openexr/lib/libHalf.a
trunk/lib/darwin-9.x.universal/openexr/lib/libIex.a
trunk/lib/darwin-9.x.universal/openexr/lib/libIlmImf.a
trunk/lib/darwin-9.x.universal/openexr/lib/libIlmThread.a
trunk/lib/darwin-9.x.universal/openexr/lib/libImath.a
Added Paths:
-----------
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFloatExc.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFpu.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathIeeeExc.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImathInt64.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfAcesFile.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfB44Compressor.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfFramesPerSecond.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfMultiView.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfRational.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfRationalAttribute.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfStringVectorAttribute.h
Removed Paths:
-------------
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/EnvmapImage.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/Image.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImageView.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImageViewFragShader.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfAutoArray.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfCompressor.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfMisc.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfPizCompressor.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfPxr24Compressor.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfRleCompressor.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfScanLineInputFile.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfStdIO.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfTileOffsets.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfTiledMisc.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/ImfZipCompressor.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/compareFloat.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/drawImage.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/eLut.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/generalInterfaceExamples.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/generalInterfaceTiledExamples.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/loadImage.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/lowLevelIoExamples.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/makeCubeMap.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/makeLatLongMap.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/makePreview.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/makeTiled.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/previewImageExamples.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/rgbaInterfaceExamples.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/rgbaInterfaceTiledExamples.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/scaleImage.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/tmpDir.h
trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/toFloat.h
Deleted: trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/EnvmapImage.h
===================================================================
--- trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/EnvmapImage.h 2013-04-07 14:09:29 UTC (rev 55880)
+++ trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/EnvmapImage.h 2013-04-07 14:25:10 UTC (rev 55881)
@@ -1,82 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2004, 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_ENVMAP_IMAGE_H
-#define INCLUDED_ENVMAP_IMAGE_H
-
-//-----------------------------------------------------------------------------
-//
-// class EnvmapImage
-//
-//-----------------------------------------------------------------------------
-
-#include <ImfArray.h>
-#include <ImfRgba.h>
-#include <ImfEnvmap.h>
-#include "ImathBox.h"
-
-
-class EnvmapImage
-{
- public:
-
- EnvmapImage ();
- EnvmapImage (Imf::Envmap type, const Imath::Box2i &dataWindow);
-
- void resize (Imf::Envmap type,
- const Imath::Box2i &dataWindow);
-
- void clear ();
-
- Imf::Envmap type () const;
- const Imath::Box2i & dataWindow () const;
-
- Imf::Array2D<Imf::Rgba> & pixels ();
- const Imf::Array2D<Imf::Rgba> & pixels () const;
-
- Imf::Rgba filteredLookup (Imath::V3f direction,
- float radius,
- int numSamples) const;
-
- private:
-
- Imf::Rgba sample (const Imath::V2f &pos) const;
-
- Imf::Envmap _type;
- Imath::Box2i _dataWindow;
- Imf::Array2D<Imf::Rgba> _pixels;
-};
-
-
-#endif
Modified: trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMacros.h
===================================================================
--- trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMacros.h 2013-04-07 14:09:29 UTC (rev 55880)
+++ trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMacros.h 2013-04-07 14:25:10 UTC (rev 55881)
@@ -132,15 +132,15 @@
//
// Example:
//
-// ASSERT (NullExc, ptr != NULL, "Null pointer" );
+// ASSERT (ptr != NULL, NullExc, "Null pointer" );
//
//-------------------------------------------------------------
#define ASSERT(assertion, type, text) \
do \
{ \
- if( (assertion) == false ) \
- THROW( type, text ); \
+ if ((assertion) == false) \
+ THROW (type, text); \
} \
while (0)
Added: trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFloatExc.h
===================================================================
--- trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFloatExc.h (rev 0)
+++ trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFloatExc.h 2013-04-07 14:25:10 UTC (rev 55881)
@@ -0,0 +1,125 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2002, 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_IEXMATHFLOATEXC_H
+#define INCLUDED_IEXMATHFLOATEXC_H
+
+#include <IexMathExc.h>
+//#include <IexBaseExc.h>
+#include <IexMathIeeeExc.h>
+
+namespace Iex {
+
+
+//-------------------------------------------------------------
+// Function mathExcOn() defines which floating point exceptions
+// will be trapped and converted to C++ exceptions.
+//-------------------------------------------------------------
+
+void mathExcOn (int when = (IEEE_OVERFLOW | IEEE_DIVZERO | IEEE_INVALID));
+
+
+//----------------------------------------------------------------------
+// Function getMathExcOn() tells you for which floating point exceptions
+// trapping and conversion to C++ exceptions is currently enabled.
+//----------------------------------------------------------------------
+
+int getMathExcOn ();
+
+
+//------------------------------------------------------------------------
+// A classs that temporarily sets floating point exception trapping
+// and conversion, and later restores the previous settings.
+//
+// Example:
+//
+// float
+// trickyComputation (float x)
+// {
+// MathExcOn meo (0); // temporarily disable floating
+// // point exception trapping
+//
+// float result = ...; // computation which may cause
+// // floating point exceptions
+//
+// return result; // destruction of meo restores
+// } // the program's previous floating
+// // point exception settings
+//------------------------------------------------------------------------
+
+class MathExcOn
+{
+ public:
+
+ MathExcOn (int when)
+ :
+ _changed (false)
+ {
+ _saved = getMathExcOn();
+
+ if (_saved != when)
+ {
+ _changed = true;
+ mathExcOn (when);
+ }
+ }
+
+ ~MathExcOn ()
+ {
+ if (_changed)
+ mathExcOn (_saved);
+ }
+
+ // It is possible for functions to set the exception registers
+ // yet not trigger a SIGFPE. Specifically, the implementation
+ // of pow(x, y) we're using can generates a NaN from a negative x
+ // and fractional y but a SIGFPE is not generated.
+ // This function examimes the exception registers and calls the
+ // fpHandler if those registers modulo the exception mask are set.
+ // It should be called wherever this class is commonly used where it has
+ // been found that certain floating point exceptions are not being thrown.
+
+ void handleOutstandingExceptions();
+
+ private:
+
+ bool _changed;
+ int _saved;
+};
+
+} // namespace Iex
+
+#endif
Added: trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFpu.h
===================================================================
--- trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFpu.h (rev 0)
+++ trunk/lib/darwin-9.x.universal/openexr/include/OpenEXR/IexMathFpu.h 2013-04-07 14:25:10 UTC (rev 55881)
@@ -0,0 +1,62 @@
+#ifndef INCLUDED_IEXMATHFPU_H
+#define INCLUDED_IEXMATHFPU_H
+
+//
+// Copyright (c) 1997 Industrial Light and Magic.
+// All rights reserved. Used under authorization.
+// This material contains the confidential and proprietary
+// information of Industrial Light and Magic and
+// may not be copied in whole or in part without the express
+// written permission of Industrial Light and Magic.
+// This copyright notice does not imply publication.
+//
+
+//------------------------------------------------------------------------
+//
+// Functions to control floating point exceptions.
+//
+//------------------------------------------------------------------------
+
+#include <IexMathIeeeExc.h>
+
+namespace Iex {
+
+//-----------------------------------------
+// setFpExceptions() defines which floating
+// point exceptions cause SIGFPE signals.
+//-----------------------------------------
+
+void setFpExceptions (int when = (IEEE_OVERFLOW | IEEE_DIVZERO | IEEE_INVALID));
+
+
+//----------------------------------------
+// fpExceptions() tells you which floating
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list