[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61243] trunk/lib/darwin-9.x.universal/ openimageio: OSX/OIIO: update to v 1.3.9 and adapt buildscript
jens verwiebe
info at jensverwiebe.de
Tue Dec 3 13:03:24 CET 2013
Revision: 61243
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61243
Author: jensverwiebe
Date: 2013-12-03 12:03:23 +0000 (Tue, 03 Dec 2013)
Log Message:
-----------
OSX/OIIO: update to v 1.3.9 and adapt buildscript
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/openimageio/build.sh
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/color.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/dassert.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/errorhandler.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/export.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/filesystem.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/fmath.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/hash.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagebuf.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagebufalgo.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagecache.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imageio.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/optparser.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/paramlist.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/plugin.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/pugiconfig.hpp
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/pugixml.hpp
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/refcnt.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/strutil.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/sysutil.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/tbb/tbb_exception.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/texture.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/thread.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/timer.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/tinyformat.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/typedesc.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/version.h
trunk/lib/darwin-9.x.universal/openimageio/lib/libOpenImageIO.a
Added Paths:
-----------
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/imagebufalgo_util.h
trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/pugixml.cpp
Modified: trunk/lib/darwin-9.x.universal/openimageio/build.sh
===================================================================
--- trunk/lib/darwin-9.x.universal/openimageio/build.sh 2013-11-28 12:15:28 UTC (rev 61242)
+++ trunk/lib/darwin-9.x.universal/openimageio/build.sh 2013-12-03 12:03:23 UTC (rev 61243)
@@ -5,7 +5,7 @@
mkdir -p build/macosx_i386
cd build/macosx_i386
-cmake ../../src \
+cmake ../.. \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_OSX_ARCHITECTURES="i386" \
@@ -30,7 +30,9 @@
-DUSE_FIELD3D=OFF \
-DUSE_QT=OFF \
-DUSE_PYTHON=OFF \
- -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_BUILD_TYPE=Release \
+ -DOIIO_BUILD_TESTS=OFF \
+ -DOIIO_BUILD_TOOLS=OFF
make -j8 install
@@ -39,7 +41,7 @@
mkdir -p build/macosx_x86_64
cd build/macosx_x86_64
-cmake ../../src \
+cmake ../.. \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_OSX_ARCHITECTURES="x86_64" \
@@ -64,7 +66,9 @@
-DUSE_FIELD3D=OFF \
-DUSE_QT=OFF \
-DUSE_PYTHON=OFF \
- -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_BUILD_TYPE=Release \
+ -DOIIO_BUILD_TESTS=OFF \
+ -DOIIO_BUILD_TOOLS=OFF
make -j8 install
Modified: trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/color.h
===================================================================
--- trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/color.h 2013-11-28 12:15:28 UTC (rev 61242)
+++ trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/color.h 2013-12-03 12:03:23 UTC (rev 61243)
@@ -94,20 +94,98 @@
/// or NULL if none could be identified.
const char * getColorSpaceNameByRole (const char *role) const;
+ /// Get the number of Looks defined in this configuration
+ int getNumLooks() const;
+
+ /// Query the name of the specified Look.
+ const char * getLookNameByIndex(int index) const;
+
/// Given the specified input and output ColorSpace, construct the
/// processor. It is possible that this will return NULL, if the
- /// inputColorSpace doesnt exist, the outputColorSpace doesn't exist,
- /// or if the specified transformation is illegal (for example, it may
- /// require the inversion of a 3D-LUT, etc). When the user is finished
- /// with a ColorProcess, deleteColorProcessor should be called.
- /// ColorProcessor(s) remain valid even if the ColorConfig that created
- /// them no longer exists.
+ /// inputColorSpace doesnt exist, the outputColorSpace doesn't
+ /// exist, or if the specified transformation is illegal (for
+ /// example, it may require the inversion of a 3D-LUT, etc). When
+ /// the user is finished with a ColorProcess, deleteColorProcessor
+ /// should be called. ColorProcessor(s) remain valid even if the
+ /// ColorConfig that created them no longer exists.
///
- /// Multiple calls to this are potentially expensive.
-
+ /// Multiple calls to this are potentially expensive, so you should
+ /// call once to create a ColorProcessor to use on an entire image
+ /// (or multiple images), NOT for every scanline or pixel
+ /// separately!
ColorProcessor* createColorProcessor(const char * inputColorSpace,
const char * outputColorSpace) const;
+ /// Given the named look(s), input and output color spaces,
+ /// construct a color processor that applies an OCIO look
+ /// transformation. If inverse==true, construct the inverse
+ /// transformation. The context_key and context_value can
+ /// optionally be used to establish an extra token/value pair in the
+ /// OCIO context.
+ ///
+ /// It is possible that this will return NULL, if one of the color
+ /// spaces or the look itself doesnt exist or is not allowed. When
+ /// the user is finished with a ColorProcess, deleteColorProcessor
+ /// should be called. ColorProcessor(s) remain valid even if the
+ /// ColorConfig that created them no longer exists.
+ ///
+ /// Multiple calls to this are potentially expensive, so you should
+ /// call once to create a ColorProcessor to use on an entire image
+ /// (or multiple images), NOT for every scanline or pixel
+ /// separately!
+ ColorProcessor* createLookTransform (const char * looks,
+ const char * inputColorSpace,
+ const char * outputColorSpace,
+ bool inverse=false,
+ const char *context_key=NULL,
+ const char *context_value=NULL) const;
+
+ /// Get the number of displays defined in this configuration
+ int getNumDisplays() const;
+
+ /// Query the name of the specified display.
+ const char * getDisplayNameByIndex(int index) const;
+
+ /// Get the number of views for a given display defined in this configuration
+ int getNumViews(const char * display) const;
+
+ /// Query the name of the specified view for the specified display
+ const char * getViewNameByIndex(const char * display, int index) const;
+
+ /// Query the name of the default display
+ const char * getDefaultDisplayName() const;
+
+ /// Query the name of the default view for the specified display
+ const char * getDefaultViewName(const char * display) const;
+
+ /// Construct a processor to transform from the given color space
+ /// to the color space of the given display and view. You may optionally
+ /// override the looks that are, by default, used with the display/view
+ /// combination. Looks is a potentially comma (or colon) delimited list
+ /// of lookNames, where +/- prefixes are optionally allowed to denote
+ /// forward/inverse transformation (and forward is assumed in the
+ /// absence of either). It is possible to remove all looks from the
+ /// display by passing an empty string. The context_key and context_value
+ /// can optionally be used to establish an extra token/value pair in the
+ /// OCIO context.
+ ///
+ /// It is possible that this will return NULL, if one of the color
+ /// spaces or the display or view doesn't exist or is not allowed. When
+ /// the user is finished with a ColorProcess, deleteColorProcessor
+ /// should be called. ColorProcessor(s) remain valid even if the
+ /// ColorConfig that created them no longer exists.
+ ///
+ /// Multiple calls to this are potentially expensive, so you should
+ /// call once to create a ColorProcessor to use on an entire image
+ /// (or multiple images), NOT for every scanline or pixel
+ /// separately!
+ ColorProcessor* createDisplayTransform (const char * display,
+ const char * view,
+ const char * inputColorSpace,
+ const char * looks=NULL,
+ const char * context_key=NULL,
+ const char * context_value=NULL) const;
+
/// Delete the specified ColorProcessor
static void deleteColorProcessor(ColorProcessor * processor);
Modified: trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/dassert.h
===================================================================
--- trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/dassert.h 2013-11-28 12:15:28 UTC (rev 61242)
+++ trunk/lib/darwin-9.x.universal/openimageio/include/OpenImageIO/dassert.h 2013-12-03 12:03:23 UTC (rev 61243)
@@ -40,13 +40,13 @@
///
/// Handy macros for debugging assertions.
///
-/// - ABORT (if not already defined) is defined to print an error message
-/// and then abort().
/// - ASSERT (if not already defined) is defined to check if a condition
/// is met, and if not, calls ABORT with an error message
/// indicating the module and line where it occurred.
-/// - DASSERT is the same as ASSERT when in DEBUG mode, but a no-op when
-/// not in debug mode.
+/// - ASSERT_MSG: like ASSERT, but takes printf-like extra arguments
+/// - DASSERT is the same as ASSERT when NDEBUG is not defined but a
+/// no-op when not in debug mode.
+/// - DASSERT_MSG: like DASSERT, but takes printf-like extra arguments
///
/// The presumed usage is that you want ASSERT for dire conditions that
/// must be checked at runtime even in an optimized build. DASSERT is
@@ -60,13 +60,6 @@
/// trying to recover gracefully.
-/// ABORT(msg) prints the message to stderr and then aborts.
-///
-#ifndef ABORT
-# define ABORT(msg) fprintf(stderr,"%s",msg), abort()
-#endif
-
-
/// ASSERT(condition) checks if the condition is met, and if not, prints
/// an error message indicating the module and line where the error
/// occurred and then aborts.
@@ -74,37 +67,47 @@
#ifndef ASSERT
# define ASSERT(x) \
((x) ? ((void)0) \
- : (fprintf (stderr, "%s:%u: Failed assertion '%s'\n", \
+ : (fprintf (stderr, "%s:%u: failed assertion '%s'\n", \
__FILE__, __LINE__, #x), abort()))
#endif
-/// ASSERTMSG(condition,msg,...) is like ASSERT, but lets you add
+/// ASSERT_MSG(condition,msg,...) is like ASSERT, but lets you add
/// formatted output (a la printf) to the failure message.
-#ifndef ASSERTMSG
-# define ASSERTMSG(x,msg,...) \
+#ifndef ASSERT_MSG
+# define ASSERT_MSG(x,msg,...) \
((x) ? ((void)0) \
- : (fprintf (stderr, "%s:%u: Failed assertion '" #x "': " msg "\n", \
- __FILE__, __LINE__, __VA_ARGS__), abort()))
+ : (fprintf (stderr, "%s:%u: failed assertion '%s': " msg "\n", \
+ __FILE__, __LINE__, #x, __VA_ARGS__), abort()))
#endif
+#ifndef ASSERTMSG
+#define ASSERTMSG ASSERT_MSG
+#endif
+
/// DASSERT(condition) is just like ASSERT, except that it only is
/// functional in DEBUG mode, but does nothing when in a non-DEBUG
/// (optimized, shipping) build.
-#ifdef DEBUG
+#ifndef NDEBUG
# define DASSERT(x) ASSERT(x)
#else
-# define DASSERT(x) ((void)0) /* DASSERT does nothing when not debugging */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list