[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44456] trunk/lib/windows/gcc/openimageio: missed these two in last commit
Antony Riakiotakis
kalast at gmail.com
Sun Feb 26 10:20:57 CET 2012
Revision: 44456
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44456
Author: psy-fi
Date: 2012-02-26 09:20:57 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
missed these two in last commit
Removed Paths:
-------------
trunk/lib/windows/gcc/openimageio/include/OpenImageIO/colortransfer.h
trunk/lib/windows/gcc/openimageio/patch.diff
Deleted: trunk/lib/windows/gcc/openimageio/include/OpenImageIO/colortransfer.h
===================================================================
--- trunk/lib/windows/gcc/openimageio/include/OpenImageIO/colortransfer.h 2012-02-26 09:19:48 UTC (rev 44455)
+++ trunk/lib/windows/gcc/openimageio/include/OpenImageIO/colortransfer.h 2012-02-26 09:20:57 UTC (rev 44456)
@@ -1,90 +0,0 @@
-/*
- Copyright 2010 Larry Gritz and the other authors and contributors.
- 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 the software's owners 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.
-
- (This is the Modified BSD License)
-*/
-
-#ifndef OPENIMAGEIO_COLORTRANSFER_H
-#define OPENIMAGEIO_COLORTRANSFER_H
-
-#include "export.h"
-#include "version.h"
-
-OIIO_NAMESPACE_ENTER
-{
-
-/// Base class a functor that remaps values accorrding to a color
-/// transfer function.
-class DLLPUBLIC ColorTransfer {
-public:
- ColorTransfer (std::string name_) { m_name = name_; };
- virtual ~ColorTransfer (void) { };
-
- /// Return the name of the color transfer function, e.g., "sRGB_to_linear",
- /// "linear_to_Rec709", etc.
- const std::string name (void) { return m_name; };
-
- /// Return a vector of transfer paramater names
- ///
- const std::vector<std::string> & paramaters (void) { return m_params; };
-
- /// Set a transfer function paramater If the name is not recognized,
- /// return false.
- virtual bool set (std::string name_, float param);
-
- /// Get a transfer function paramater
- /// If the name is not recognized, return false.
- virtual bool get (std::string name_, float ¶m);
-
- /// Evalutate the transfer function.
- virtual float operator() (float x) = 0;
-
- /// This static function allocates and returns an instance of the
- /// specific color transfer implementation for the name you provide.
- /// Example use:
- /// ColorTransfer *mytf = ColorTransfer::create ("KodakLog_to_linear");
- /// The caller is responsible for deleting it when it's done.
- /// If the name is not recognized, return NULL.
- static ColorTransfer *create (const std::string &name);
-
-protected:
- std::string m_name;
- std::vector<std::string> m_params;
-
- // Add transfer function paramater
- bool add_paramater (const std:: string &name_) {
- m_params.push_back (name_);
- return true;
- };
-
-};
-
-
-}
-OIIO_NAMESPACE_EXIT
-
-#endif // OPENIMAGEIO_COLORTRANSFER_H
Deleted: trunk/lib/windows/gcc/openimageio/patch.diff
===================================================================
--- trunk/lib/windows/gcc/openimageio/patch.diff 2012-02-26 09:19:48 UTC (rev 44455)
+++ trunk/lib/windows/gcc/openimageio/patch.diff 2012-02-26 09:20:57 UTC (rev 44456)
@@ -1,463 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 8c94bd9..aa61fb5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -77,6 +77,7 @@ if (NOT WIN32)
- add_definitions ("-Wall")
- endif()
-
-+
- # Disable some warnings for Clang, it's a little too picky with boost
- if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
- add_definitions ("-Wno-parentheses")
-@@ -122,14 +123,14 @@ endif (MSVC)
- # Tell CMake to process the sub-directories
- add_subdirectory (libOpenImageIO)
-
--add_subdirectory (iconvert)
--add_subdirectory (idiff)
--add_subdirectory (igrep)
--add_subdirectory (iinfo)
--add_subdirectory (iprocess)
--add_subdirectory (maketx)
--add_subdirectory (testtex)
--add_subdirectory (iv)
-+#add_subdirectory (iconvert)
-+#add_subdirectory (idiff)
-+#add_subdirectory (igrep)
-+#add_subdirectory (iinfo)
-+#add_subdirectory (iprocess)
-+#add_subdirectory (maketx)
-+#add_subdirectory (testtex)
-+#add_subdirectory (iv)
-
- # Add IO plugin directories
- if (NOT EMBEDPLUGINS)
-@@ -167,37 +168,37 @@ add_subdirectory (doc)
- # Testing
-
- # List all the individual testsuite tests here:
--oiio_add_tests (ico gpsread sgi
-- texture-fill texture-gray texture-grid
-- texture-missing texture-pointsample texture-res
-- texture-skinny texture-fat
-- imagecache-files texture-field3d)
-+#oiio_add_tests (ico gpsread sgi
-+# texture-fill texture-gray texture-grid
-+# texture-missing texture-pointsample texture-res
-+# texture-skinny texture-fat
-+# imagecache-files texture-field3d)
-
- # List testsuites which need special external reference images from the web
- # here:
--oiio_add_tests (bmp
-- IMAGEDIR bmpsuite
-- URL http://entropymine.com/jason/bmpsuite/bmpsuite.zip)
-+#oiio_add_tests (bmp
-+# IMAGEDIR bmpsuite
-+# URL http://entropymine.com/jason/bmpsuite/bmpsuite.zip)
-
--oiio_add_tests (tiff-suite tiff-depths
-- IMAGEDIR libtiffpic
-- URL http://www.remotesensing.org/libtiff/images.html)
-+#oiio_add_tests (tiff-suite tiff-depths
-+# IMAGEDIR libtiffpic
-+# URL http://www.remotesensing.org/libtiff/images.html)
-
--oiio_add_tests (openexr-suite openexr-multires openexr-chroma
-- IMAGEDIR openexr-images-1.5.0
-- URL http://www.openexr.com/downloads.html)
-+#oiio_add_tests (openexr-suite openexr-multires openexr-chroma
-+# IMAGEDIR openexr-images-1.5.0
-+# URL http://www.openexr.com/downloads.html)
-
--oiio_add_tests (jpeg2000
-- IMAGEDIR j2kp4files_v1_5
-- URL http://www.crc.ricoh.com/~gormish/jpeg2000conformance/)
-+#oiio_add_tests (jpeg2000
-+# IMAGEDIR j2kp4files_v1_5
-+# URL http://www.crc.ricoh.com/~gormish/jpeg2000conformance/)
-
--oiio_add_tests (targa-tgautils
-- IMAGEDIR TGAUTILS
-- URL http://tgautils.inequation.org/)
-+#oiio_add_tests (targa-tgautils
-+# IMAGEDIR TGAUTILS
-+# URL http://tgautils.inequation.org/)
-
--oiio_add_tests (fits
-- IMAGEDIR fits-images
-- URL http://www.cv.nrao.edu/fits/data/tests/)
-+#oiio_add_tests (fits
-+# IMAGEDIR fits-images
-+# URL http://www.cv.nrao.edu/fits/data/tests/)
-
- #########################################################################
- # Packaging
-@@ -230,7 +231,7 @@ if (WIN32)
- set(CPACK_PACKAGE_EXECUTABLES "iv" "iv - Image Viewer")
- # set(CPACK_CREATE_DESCTOP_LINKS "iv" "iv - Image Viewer")
- set(CPACK_NSIS_MODIFY_PATH ON)
-- add_dll_files ()
-+ #add_dll_files ()
- include (InstallRequiredSystemLibraries)
- endif ()
- set (CPACK_SOURCE_PACKAGE_FILE_NAME OpenImageIO-${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}-source)
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 5b43245..b54b4bc 100644
---- a/src/cmake/externalpackages.cmake
-+++ b/src/cmake/externalpackages.cmake
-@@ -82,7 +82,7 @@ endmacro ()
-
- message (STATUS "BOOST_ROOT ${BOOST_ROOT}")
-
--set (Boost_ADDITIONAL_VERSIONS "1.45" "1.44"
-+set (Boost_ADDITIONAL_VERSIONS "1.47" "1_46_1" "1.45" "1.44"
- "1.43" "1.43.0" "1.42" "1.42.0"
- "1.41" "1.41.0" "1.40" "1.40.0"
- "1.39" "1.39.0" "1.38" "1.38.0"
-diff --git a/src/include/fmath.h b/src/include/fmath.h
-index 78300dc..cd365b4 100644
---- a/src/include/fmath.h
-+++ b/src/include/fmath.h
-@@ -43,6 +43,7 @@
- #define OPENIMAGEIO_FMATH_H
-
- #include <cmath>
-+#include <float.h>
- #include <limits>
- #include <typeinfo>
- #include <algorithm>
-@@ -809,7 +810,7 @@ inline float degrees (float rad) { return rad * (float)(180.0 / M_PI); }
-
-
-
--#ifdef _WIN32
-+#if defined(_WIN32) && !defined(__GNUC__)
- // Windows doesn't define these functions from math.h
- #define hypotf _hypotf
- #define copysign(x,y) _copysign(x,y)
-@@ -934,7 +935,7 @@ truncf(float val)
-
-
- // Some systems have isnan, isinf and isfinite in the std namespace.
--#ifndef WIN32
-+#if !defined(WIN32) || defined(__GNUC__)
- using std::isnan;
- using std::isinf;
- using std::isfinite;
-diff --git a/src/include/thread.h b/src/include/thread.h
-index 73d9ba7..edab1dc 100644
---- a/src/include/thread.h
-+++ b/src/include/thread.h
-@@ -243,7 +243,33 @@ private:
-
- #endif
-
--
-+inline LONGLONG _InterlockedCompareExchange64(LONGLONG volatile* Destination, LONGLONG Exchange, LONGLONG Comperand)
-+{
-+#ifndef __GNUC__
-+ __asm {
-+ mov esi, [Destination]
-+ mov ebx, dword ptr [Exchange]
-+ mov ecx, dword ptr [Exchange + 4]
-+ mov eax, dword ptr [Comperand]
-+ mov edx, dword ptr [Comperand + 4]
-+ lock cmpxchg8b [esi]
-+ }
-+#else
-+ LONGLONG *ep = &Exchange;
-+ LONGLONG *cp = &Comperand;
-+
-+ asm("movl (%2), %%ebx\n\t"
-+ "movl 4(%2), %%ecx\n\t"
-+ "movl (%1), %%eax\n\t"
-+ "movl 4(%1), %%edx\n\t"
-+ "lock\n\t"
-+ "cmpxchg8b (%0)\n\t"
-+ : "=r" (Destination)
-+ : "r" (cp), "r" (ep)
-+ : "%edx", "%eax", "%ecx", "%ebx"
-+ );
-+#endif
-+}
-
- /// Atomic version of: r = *at, *at += x, return r
- /// For each of several architectures.
-@@ -280,9 +306,16 @@ atomic_exchange_and_add (volatile long long *at, long long x)
- // Apple, not inline for Intel (only PPC?)
- return OSAtomicAdd64Barrier (x, at) - x;
- #elif defined(_WIN32)
-+#if !defined(__GNUC__)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list