[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46012] trunk/lib/windows: Windows x86 MSVC Libraries:
Thomas Dinges
blender at dingto.org
Sat Apr 28 08:38:13 CEST 2012
Revision: 46012
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46012
Author: dingto
Date: 2012-04-28 06:38:12 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Windows x86 MSVC Libraries:
* Upgrade to libpng 1.5.10, from the older 1.2.x series
* Update to OpenImageIO 1.0.3
Modified Paths:
--------------
trunk/lib/windows/Readme.txt
trunk/lib/windows/openimageio/CHANGES
trunk/lib/windows/openimageio/bin/OpenImageIO.dll
trunk/lib/windows/openimageio/build.patch
trunk/lib/windows/openimageio/include/OpenImageIO/thread.h
trunk/lib/windows/openimageio/include/OpenImageIO/version.h
trunk/lib/windows/openimageio/lib/OpenImageIO.lib
trunk/lib/windows/openimageio/readme.txt
trunk/lib/windows/png/include/png.h
trunk/lib/windows/png/include/pngconf.h
trunk/lib/windows/png/lib/libpng.lib
Added Paths:
-----------
trunk/lib/windows/png/include/pnglibconf.h
Removed Paths:
-------------
trunk/lib/windows/openimageio/include/OpenImageIO/colortransfer.h
Modified: trunk/lib/windows/Readme.txt
===================================================================
--- trunk/lib/windows/Readme.txt 2012-04-28 06:33:30 UTC (rev 46011)
+++ trunk/lib/windows/Readme.txt 2012-04-28 06:38:12 UTC (rev 46012)
@@ -1,10 +1,10 @@
OpenEXR 1.6.1
IlmBase 1.0.1
OpenCOLLADA r788 (patch in dir is for setting project files quickly correct)
-libpng 1.2.46
+libpng 1.5.10
FFMPEG autobuild April 22nd, 2010, r22941
jpeglib 8b (16.05.2010)
Python 3.1.2
Freetype 2.4.4 ("LIB Release Multithreaded and LIB Debug Multithreaded")
-OpenImageIO 1.0.2
+OpenImageIO 1.0.3
Boost 1.47
Modified: trunk/lib/windows/openimageio/CHANGES
===================================================================
--- trunk/lib/windows/openimageio/CHANGES 2012-04-28 06:33:30 UTC (rev 46011)
+++ trunk/lib/windows/openimageio/CHANGES 2012-04-28 06:38:12 UTC (rev 46012)
@@ -1,6 +1,15 @@
Changes:
+Release 1.0.3 (16 Apr 2012)
+---------------------------
+* Fix reading bugs in DPX and Cineon.
+* iconvert handles the int32 and uint32 cases.
+* Bug fix in to_native_rectangle, which could lead to errors in certain
+ data format conversions.
+* Various Windows build fixes, including fixes for Windows 7.
+* Compilation fixes on FreeBSD.
+
Release 1.0.2 (19 Mar 2012)
----------------------------
* Fixed TARGA reader bug where for 16-bpp, 4-channel images, we weren't
Modified: trunk/lib/windows/openimageio/bin/OpenImageIO.dll
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/openimageio/build.patch
===================================================================
--- trunk/lib/windows/openimageio/build.patch 2012-04-28 06:33:30 UTC (rev 46011)
+++ trunk/lib/windows/openimageio/build.patch 2012-04-28 06:38:12 UTC (rev 46012)
@@ -173,7 +173,7 @@
return OSAtomicCompareAndSwap64Barrier (compareval, newval, at);
#elif defined(_WIN32)
- return (InterlockedCompareExchange64 ((volatile LONGLONG *)at, newval, compareval) == compareval);
-+ return (_InterlockedCompareExchange64 ((volatile LONGLONG *)at, newval, compareval) == compareval);
++ return (_InterlockedCompareExchange64 ((volatile LONGLONG *)at, newval, compareval) == compareval); #Note: Change not needed anymore
#else
error ("No atomics on this platform.")
#endif
Deleted: trunk/lib/windows/openimageio/include/OpenImageIO/colortransfer.h
===================================================================
--- trunk/lib/windows/openimageio/include/OpenImageIO/colortransfer.h 2012-04-28 06:33:30 UTC (rev 46011)
+++ trunk/lib/windows/openimageio/include/OpenImageIO/colortransfer.h 2012-04-28 06:38:12 UTC (rev 46012)
@@ -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
Modified: trunk/lib/windows/openimageio/include/OpenImageIO/thread.h
===================================================================
--- trunk/lib/windows/openimageio/include/OpenImageIO/thread.h 2012-04-28 06:33:30 UTC (rev 46011)
+++ trunk/lib/windows/openimageio/include/OpenImageIO/thread.h 2012-04-28 06:38:12 UTC (rev 46012)
@@ -306,7 +306,7 @@
# if defined(_WIN64)
return _InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
# else
- LONGLONG Old;
+ LONGLONG Old;
do Old = *at;
while (_InterlockedCompareExchange64(at, Old + x, Old) != Old);
return Old;
Modified: trunk/lib/windows/openimageio/include/OpenImageIO/version.h
===================================================================
--- trunk/lib/windows/openimageio/include/OpenImageIO/version.h 2012-04-28 06:33:30 UTC (rev 46011)
+++ trunk/lib/windows/openimageio/include/OpenImageIO/version.h 2012-04-28 06:38:12 UTC (rev 46012)
@@ -38,7 +38,7 @@
#define OIIO_NAMESPACE OpenImageIO
#define OIIO_VERSION_MAJOR 1
#define OIIO_VERSION_MINOR 0
-#define OIIO_VERSION_PATCH 2
+#define OIIO_VERSION_PATCH 3
#define OIIO_VERSION_NS v1_0
#define OIIO_VERSION (10000 * OIIO_VERSION_MAJOR + \
Modified: trunk/lib/windows/openimageio/lib/OpenImageIO.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/openimageio/readme.txt
===================================================================
--- trunk/lib/windows/openimageio/readme.txt 2012-04-28 06:33:30 UTC (rev 46011)
+++ trunk/lib/windows/openimageio/readme.txt 2012-04-28 06:38:12 UTC (rev 46012)
@@ -1,9 +1,9 @@
Build Steps
-* OpenImageIO 1.0
+* OpenImageIO 1.0.x
* In lib/windows/openimageio/oiio
-* Apply build.patch to this (manually)
+* Apply build.patch to this (manually, code changed a bit)
* Open Visual Studio 2008 Command Prompt
* cd into lib/windows/openimageio/oiio
* ..\build.bat
Modified: trunk/lib/windows/png/include/png.h
===================================================================
--- trunk/lib/windows/png/include/png.h 2012-04-28 06:33:30 UTC (rev 46011)
+++ trunk/lib/windows/png/include/png.h 2012-04-28 06:38:12 UTC (rev 46012)
@@ -1,6 +1,7 @@
+
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.47 - February 18, 2012
+ * libpng version 1.5.10 - March 29, 2012
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -8,18 +9,18 @@
* This code is released under the libpng license (See LICENSE, below)
*
* Authors and maintainers:
- * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
- * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.2.47 - February 18, 2012: Glenn
- * See also "Contributing Authors", below.
+ * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
+ * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
+ * libpng versions 0.97, January 1998, through 1.5.10 - March 29, 2012: Glenn
+ * See also "Contributing Authors", below.
*
* Note about libpng version numbers:
*
- * Due to various miscommunications, unforeseen code incompatibilities
- * and occasional factors outside the authors' control, version numbering
- * on the library has not always been consistent and straightforward.
- * The following table summarizes matters since version 0.89c, which was
- * the first widely used release:
+ * Due to various miscommunications, unforeseen code incompatibilities
+ * and occasional factors outside the authors' control, version numbering
+ * on the library has not always been consistent and straightforward.
+ * The following table summarizes matters since version 0.89c, which was
+ * the first widely used release:
*
* source png.h png.h shared-lib
* version string int version
@@ -104,198 +105,96 @@
* 1.0.16 10 10016 10.so.0.1.0.16
* 1.2.6 13 10206 12.so.0.1.2.6
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list