Thread: [Hdrflow-svn] SF.net SVN: hdrflow: [79] lib/openlibraries
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn
|
From: <gl...@us...> - 2007-04-13 10:28:44
|
Revision: 79
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=79&view=rev
Author: glslang
Date: 2007-04-13 03:28:42 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
+ *nix build fix
+ disable ILM tonemap if OpenEXR is not present
Modified Paths:
--------------
lib/openlibraries/openlibraries.pc.in
lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
Modified: lib/openlibraries/openlibraries.pc.in
===================================================================
--- lib/openlibraries/openlibraries.pc.in 2007-04-12 22:17:21 UTC (rev 78)
+++ lib/openlibraries/openlibraries.pc.in 2007-04-13 10:28:42 UTC (rev 79)
@@ -10,6 +10,7 @@
OPENIMAGELIB_PLUGINS=@OPENIMAGELIB_PLUGINPATH@
OPENMEDIALIB_PLUGINS=@OPENMEDIALIB_PLUGINPATH@
+OPENEFFECTSLIB_PLUGINS=@OPENEFFECTSLIB_PLUGINPATH@
OPENOBJECTLIB_PLUGINS=@OPENOBJECTLIB_PLUGINPATH@
OPENASSETLIB_PLUGINS=@OPENASSETLIB_PLUGINPATH@
@@ -18,7 +19,7 @@
Version: @OL_MAJOR@.@OL_MINOR@.@OL_SUB@
Libs: @OPENPLUGINLIB_RPATH@ @OPENIMAGELIB_RPATH@ @OPENMEDIALIB_RPATH@ @OPENOBJECTLIB_RPATH@ \
- @OPENASSETLIB_RPATH@ @OPENEFFECTSLIB_RPATH@ @BOOST_LIB_RPATH@ @GLEW_LIB_RPATH@ \
+ @OPENASSETLIB_RPATH@ @BOOST_LIB_RPATH@ @GLEW_LIB_RPATH@ \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openimagelib/@OL_LIBNAME@ -lopenimagelib_il \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openmedialib/@OL_LIBNAME@ -lopenmedialib_ml \
@@ -29,3 +30,4 @@
Cflags: -I${includedir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@ -I${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/include \
@BOOST_INCLUDE_PATH@ @GLEW_INCLUDE_PATH@
+
Modified: lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
===================================================================
--- lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp 2007-04-12 22:17:21 UTC (rev 78)
+++ lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp 2007-04-13 10:28:42 UTC (rev 79)
@@ -391,6 +391,7 @@
pcos::property prop_maxval_;
};
+#ifdef HAVE_OPENEXR
class ML_PLUGIN_DECLSPEC tm_ilm_exr_filter : public filter_type
{
public:
@@ -427,6 +428,7 @@
pcos::property prop_knee_low_;
pcos::property prop_knee_high_;
};
+#endif
class ML_PLUGIN_DECLSPEC tm_ferwerda_filter : public filter_type
{
@@ -476,8 +478,10 @@
{
if( request == L"tm_linear" )
return filter_type_ptr( new tm_linear_filter( ) );
+# ifdef HAVE_OPENEXR
else if( request == L"tm_ilm_exr" )
return filter_type_ptr( new tm_ilm_exr_filter( ) );
+# endif
else if( request == L"tm_ferwerda" )
return filter_type_ptr( new tm_ferwerda_filter( ) );
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-14 22:44:42
|
Revision: 81
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=81&view=rev
Author: glslang
Date: 2007-04-14 15:44:40 -0700 (Sat, 14 Apr 2007)
Log Message:
-----------
+ tm benchmark
+ disable thread awareness of dlls
Modified Paths:
--------------
lib/openlibraries/openlibraries_vc8.sln
lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
lib/openlibraries/src/openpluginlib/py/py.cpp
Added Paths:
-----------
lib/openlibraries/test/openeffectslib/
lib/openlibraries/test/openeffectslib/tm_bench/
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
Modified: lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- lib/openlibraries/openlibraries_vc8.sln 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/openlibraries_vc8.sln 2007-04-14 22:44:40 UTC (rev 81)
@@ -391,6 +391,13 @@
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tm_bench", "test\openeffectslib\tm_bench\tm_bench_vc8.vcproj", "{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -629,6 +636,10 @@
{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -669,6 +680,7 @@
{BD86F550-C573-4A68-955B-6CEDCC8F595D} = {FE28E322-51C9-4979-9A0A-93055023A503}
{9483FC7B-E396-43E6-84ED-EB021AC54252} = {FE28E322-51C9-4979-9A0A-93055023A503}
{C85EDDFB-1A91-4ABD-8E86-6AFDF0C85CBA} = {67E6C3A2-E542-4D5D-A4A4-61DF5CD73711}
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9} = {C2D61212-6194-4B66-837B-E8A2FA29AB0E}
{14B49ECE-F5DB-4985-A31D-C48483362F9F} = {135B4433-9BD9-42C8-A552-61CA0CBA6CDC}
{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF} = {135B4433-9BD9-42C8-A552-61CA0CBA6CDC}
{B972DCEB-386E-42D2-8C5E-DD2942EC7F63} = {BEF92EC2-7872-48E2-BF6F-3DE4EBA9C037}
Modified: lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-14 22:44:40 UTC (rev 81)
@@ -277,6 +277,16 @@
}
}
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
+
bool init( const string& lookup_path )
{
boost::recursive_mutex::scoped_lock lock( mutex );
Modified: lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-14 22:44:40 UTC (rev 81)
@@ -72,6 +72,7 @@
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib""
GenerateDebugInformation="true"
SubSystem="2"
+ EntryPointSymbol=""
ImportLibrary="$(TargetDir)openpluginlib_pl-vc80-d-0_4_0.lib"
TargetMachine="1"
/>
@@ -361,11 +362,11 @@
>
</File>
<File
- RelativePath=".\property.hpp"
+ RelativePath=".\pcos\property.hpp"
>
</File>
<File
- RelativePath=".\pcos\property.hpp"
+ RelativePath=".\property.hpp"
>
</File>
<File
Modified: lib/openlibraries/src/openpluginlib/py/py.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/py/py.cpp 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/src/openpluginlib/py/py.cpp 2007-04-14 22:44:40 UTC (rev 81)
@@ -5,6 +5,12 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
+#ifdef WIN32
+#define STRICT
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
#include <openpluginlib/py/python.hpp>
#include <openpluginlib/py/py.hpp>
@@ -25,3 +31,13 @@
opl::detail::py_pcos_property( );
opl::detail::py_pcos_visitor( );
}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Added: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
===================================================================
--- lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp (rev 0)
+++ lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp 2007-04-14 22:44:40 UTC (rev 81)
@@ -0,0 +1,38 @@
+
+// el - A effects library representation.
+
+// Copyright (C) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.openlibraries.org.
+
+#include <iostream>
+
+#include <openpluginlib/pl/openpluginlib.hpp>
+#include <openpluginlib/pl/timer.hpp>
+#include <openmedialib/ml/ml.hpp>
+
+namespace ml = olib::openmedialib::ml;
+namespace pl = olib::openpluginlib;
+
+int main( int argc, char* argv[ ] )
+{
+ pl::init( "" );
+
+ ml::input_type_ptr input = ml::create_input( pl::string( argv[ 1 ] ) + pl::string( "/sequence:" ) );
+ ml::filter_type_ptr filter = ml::create_filter( L"tm_linear" );
+
+ pl::rdtsc_default_timer r;
+
+ r.reset( );
+ r.start( );
+
+ if( input && filter )
+ {
+ filter->connect( input );
+ filter->fetch( );
+ }
+
+ r.stop( );
+ pl::rdtsc_default_timer::value_type elapsed = r.elapsed( );
+ std::cout << "rdtsc: elapsed time is " << elapsed.tv_sec << " seconds and " << elapsed.tv_usec << " microseconds.\n";
+}
Property changes on: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
===================================================================
--- lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj (rev 0)
+++ lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj 2007-04-14 22:44:40 UTC (rev 81)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="tm_bench"
+ ProjectGUID="{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
+ RootNamespace="tm_bench"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Multi-threaded Debug DLL|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="$(SolutionDir)\src;"C:\Boost\include\boost-1_33_1""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4503"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="C:\Boost\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Multi-threaded Release DLL|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(SolutionDir)\src;"C:\Boost\include\boost-1_33_1""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4503"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Boost\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\tm_bench.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <File
+ RelativePath=".\VTune\tm_bench.vpj"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-01 01:24:15
|
Revision: 109
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=109&view=rev
Author: glslang
Date: 2007-04-30 18:24:13 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
+ofx bindings build updates
Modified Paths:
--------------
lib/openlibraries/configure.ac
lib/openlibraries/src/openmedialib/plugins/Makefile.am
Added Paths:
-----------
lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am
Modified: lib/openlibraries/configure.ac
===================================================================
--- lib/openlibraries/configure.ac 2007-05-01 00:50:58 UTC (rev 108)
+++ lib/openlibraries/configure.ac 2007-05-01 01:24:13 UTC (rev 109)
@@ -377,6 +377,7 @@
src/openmedialib/plugins/glew/Makefile
src/openmedialib/plugins/openal/Makefile
src/openmedialib/plugins/gensys/Makefile
+src/openmedialib/plugins/ofx/Makefile
src/openmedialib/py/Makefile
src/openeffectslib/Makefile
src/openeffectslib/plugins/Makefile
Modified: lib/openlibraries/src/openmedialib/plugins/Makefile.am
===================================================================
--- lib/openlibraries/src/openmedialib/plugins/Makefile.am 2007-05-01 00:50:58 UTC (rev 108)
+++ lib/openlibraries/src/openmedialib/plugins/Makefile.am 2007-05-01 01:24:13 UTC (rev 109)
@@ -3,4 +3,4 @@
#
#
-SUBDIRS = template avformat oil caca glew openal gensys
+SUBDIRS = template avformat oil caca glew openal gensys ofx
Added: lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am
===================================================================
--- lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am (rev 0)
+++ lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am 2007-05-01 01:24:13 UTC (rev 109)
@@ -0,0 +1,36 @@
+
+#
+#
+#
+
+libdir = $(OPENMEDIALIB_PLUGINPATH)
+
+if HAVE_OFX
+
+lib_LTLIBRARIES = libopenmedialib_ofx.la
+
+libopenmedialib_ofx_la_SOURCES = \
+ ofx_plugin.cpp
+
+libopenmedialib_ofx_la_CXXFLAGS = \
+ $(OLIB_CXXFLAGS) \
+ $(BOOST_INCLUDE_PATH) \
+ $(OFX_INCLUDE_PATH)
+
+libopenmedialib_ofx_la_LIBADD = \
+ $(BOOST_FILESYSTEM_LIBS) \
+ $(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la
+
+libopenmedialib_ofx_la_LDFLAGS = \
+ $(OLIB_LDFLAGS) \
+ $(BOOST_LIB_PATH) \
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
+
+libopenmedialib_ofx_ladir = $(OPENMEDIALIB_PLUGINPATH)
+libopenmedialib_ofx_la_DATA = ofx_plugin.opl
+
+nobase_dist_libopenmedialib_ofx_la_DATA = ofx_plugin.opl
+
+endif
Property changes on: lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-17 22:24:05
|
Revision: 82
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=82&view=rev
Author: glslang
Date: 2007-04-17 15:24:01 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
+ build updates
+ initial dpx storer (not fully functional)
Modified Paths:
--------------
lib/openlibraries/src/openassetlib/al/al.cpp
lib/openlibraries/src/openimagelib/il/Makefile.am
lib/openlibraries/src/openimagelib/il/il.cpp
lib/openlibraries/src/openimagelib/il/il.hpp
lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl
lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp
lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
lib/openlibraries/src/openpluginlib/pl/timer.hpp
lib/openlibraries/test/openmedialib/store/store.cpp
Removed Paths:
-------------
lib/openlibraries/src/openimagelib/il/openimagelib_plugin.cpp
lib/openlibraries/test/openmedialib/store/test.cpp
Modified: lib/openlibraries/src/openassetlib/al/al.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/al/al.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openassetlib/al/al.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -12,7 +12,7 @@
#include <openassetlib/al/set.hpp>
#include <openassetlib/al/base64_codec.hpp>
-#if defined(_WIN32) && !defined(USE_LIBXML2)
+#if defined( WIN32 ) && !defined( USE_LIBXML2 )
#import <msxml6.dll>
#pragma warning( disable : 4290 )
#include <atlbase.h>
@@ -39,10 +39,7 @@
al::guid_factory::initialize(guid_gen);
- opl::init();
- oil::init();
- oml::init();
- ool::init();
+ opl::init( "" );
#if defined(_WIN32) && !defined(USE_LIBXML2)
::CoInitialize(0);
@@ -53,10 +50,7 @@
AL_DECLSPEC bool uninit()
{
- opl::uninit();
- oil::uninit();
- oml::uninit();
- ool::uninit();
+ opl::uninit( );
al::guid_factory::uninitialize();
Modified: lib/openlibraries/src/openimagelib/il/Makefile.am
===================================================================
--- lib/openlibraries/src/openimagelib/il/Makefile.am 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/il/Makefile.am 2007-04-17 22:24:01 UTC (rev 82)
@@ -16,7 +16,6 @@
il.cpp \
noise_traits.hpp \
openimagelib_plugin.hpp \
- openimagelib_plugin.cpp \
rgb_traits.hpp \
traits.hpp \
utility.cpp \
Modified: lib/openlibraries/src/openimagelib/il/il.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/il.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/il/il.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -5,7 +5,7 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
-#include <openimagelib/il/il.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace olib { namespace openimagelib {
Modified: lib/openlibraries/src/openimagelib/il/il.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/il.hpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/il/il.hpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -8,10 +8,6 @@
#ifndef IL_INC_
#define IL_INC_
-#ifdef HAVE_CONFIG_H
-#include <openlibraries_global_config.hpp>
-#endif
-
#include <string>
#include <openimagelib/il/config.hpp>
Modified: lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-04-17 22:24:01 UTC (rev 82)
@@ -208,10 +208,6 @@
>
</File>
<File
- RelativePath=".\openimagelib_plugin.cpp"
- >
- </File>
- <File
RelativePath=".\utility.cpp"
>
</File>
Deleted: lib/openlibraries/src/openimagelib/il/openimagelib_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/openimagelib_plugin.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/il/openimagelib_plugin.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -1,17 +0,0 @@
-
-// il - A image library representation.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace fs = boost::filesystem;
-namespace opl = olib::openpluginlib;
-
-namespace olib { namespace openimagelib { namespace il {
-
-} } }
Modified: lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -102,15 +102,8 @@
char reserved[ 52 ];
};
- struct additional_image_source_information_header
+ struct image_orientation_information_header
{
- float x_scanned_size;
- float y_scanned_size;
- char reserved[ 20 ];
- };
-
- struct image_source_information_header
- {
unsigned int x_offset;
unsigned int y_offset;
float x_center;
@@ -164,6 +157,11 @@
char reserved[ 76 ];
};
+ struct user_defined_data_header
+ {
+ char user_identification[ 32 ];
+ };
+
#ifdef WIN32
# pragma pack( pop )
#else
@@ -234,7 +232,7 @@
}
}
- void swap_image_source_information_header( image_source_information_header& header )
+ void swap_image_orientation_information_header( image_orientation_information_header& header )
{
swap_32_bit( &header.x_offset, 1 );
swap_32_bit( &header.y_offset, 1 );
@@ -346,6 +344,11 @@
return !file.fail( );
}
+ bool Write_s( fs::ofstream& file, char* s, std::streamsize size )
+ {
+ return !file.write( s, size ).fail( );
+ }
+
std::wstring generate_image_pf( const image_information_header& im_header )
{
std::wostringstream str;
@@ -533,7 +536,7 @@
}
}
- void convert_10_bit_method_a_b_to_oil( const std::vector<unsigned char>& v, il::image_type_ptr im, int bs, bool swab, int packing, int plane )
+ void convert_10_bit_method_a_b_to_oil( const std::vector<unsigned char>& v, il::image_type_ptr im, bool swab, int packing, int plane )
{
int width = im->linesize( plane );
int height = im->height( plane );
@@ -595,8 +598,8 @@
if( !Read_s( file, ( char* ) &image_info_header, sizeof( image_info_header ), sizeof( image_info_header ) ) )
return il::image_type_ptr( );
- image_source_information_header image_source_info_header;
- if( !Read_s( file, ( char* ) &image_source_info_header, sizeof( image_source_info_header ), sizeof( image_source_info_header ) ) )
+ image_orientation_information_header image_orientation_info_header;
+ if( !Read_s( file, ( char* ) &image_orientation_info_header, sizeof( image_orientation_info_header ), sizeof( image_orientation_info_header ) ) )
return il::image_type_ptr( );
motion_picture_film_information_header motion_info_header;
@@ -615,7 +618,7 @@
{
swap_file_information_header( header );
swap_image_information_header( image_info_header );
- swap_image_source_information_header( image_source_info_header );
+ swap_image_orientation_information_header( image_orientation_info_header );
swap_motion_picture_film_information_header( motion_info_header );
swap_television_information_header( tv_info_header );
}
@@ -678,19 +681,111 @@
}
else if( packing == 1 || packing == 2 )
{
- convert_10_bit_method_a_b_to_oil( image_data, im, bs, swab, packing, i );
+ convert_10_bit_method_a_b_to_oil( image_data, im, swab, packing, i );
}
}
}
return im;
}
+
+ // Needs to move into IL traits.
+ void element_info( const std::wstring& pf, unsigned char& bitdepth )
+ {
+ if( pf == L"r8g8b8" || pf == L"r8g8b8a8" )
+ bitdepth = 8;
+ else if( pf == L"r10g10b10" || pf == L"r10g10b10a10" )
+ bitdepth = 10;
+ else if( pf == L"r12g12b12" || pf == L"r12g12b12a12" )
+ bitdepth = 12;
+ else if( pf == L"r16g16b16" || pf == L"r16g16b16a16" )
+ bitdepth = 16;
+ }
+
+ bool store_dpx( const fs::path& path, const il::image_type_ptr& im )
+ {
+ fs::ofstream file( path, std::ios::out | std::ios::binary );
+ if( !file.is_open( ) ) return false;
+
+ il::image_type::size_type width = im->width( );
+ il::image_type::size_type height = im->height( );
+
+ unsigned char bitdepth;
+ element_info( im->pf( ), bitdepth );
+
+ int linesize = bytes_per_line( bitdepth, im->linesize( ), 0 );
+
+ file_information_header header;
+ memset( &header, 0, sizeof( header ) );
+ header.magic = 0x53445058;
+ header.offset = 2048; // fixed value if no user defined data is present. check the specification.
+ strcpy( header.version, "V2.0" ); // xxx
+ header.filesize = 2048 + linesize * height;
+
+ image_information_header image_info_header;
+ memset( &image_info_header, 0, sizeof( image_info_header ) );
+ image_info_header.orientation = 0; // xxx
+ image_info_header.image_elements = static_cast<unsigned short>( im->plane_count( ) );
+ image_info_header.pixels_per_line = width;
+ image_info_header.lines_per_element = height;
+
+ for( int i = 0; i < image_info_header.image_elements; ++i )
+ {
+ image_info_header.element[ i ].sign = 0;
+ image_info_header.element[ i ].descriptor = 50; // xxx
+ image_info_header.element[ i ].transfer = 2; // xxx
+ image_info_header.element[ i ].colorimetric = 2; // xxx
+ image_info_header.element[ i ].bitdepth = bitdepth;
+ image_info_header.element[ i ].packing = 0;
+ image_info_header.element[ i ].encoding = 0;
+
+ if( !i )
+ image_info_header.element[ i ].offset = 2048;
+ else
+ image_info_header.element[ i ].offset = image_info_header.element[ i - 1 ].offset + im->pitch( i - 1 ) * im->height( i - 1 );
+ }
+
+ image_orientation_information_header image_orientation_info_header;
+ memset( &image_orientation_info_header, 0, sizeof( image_orientation_info_header ) );
+
+ motion_picture_film_information_header motion_info_header;
+ memset( &motion_info_header, 0, sizeof( motion_info_header ) );
+
+ television_information_header tv_info_header;
+ memset( &tv_info_header, 0, sizeof( tv_info_header ) );
+
+ user_defined_data_header user_defined_header;
+ memset( &user_defined_header, 0, sizeof( user_defined_header ) );
+
+ if( !( Write_s( file, ( char* ) &header, sizeof( header ) ) &&
+ Write_s( file, ( char* ) &image_info_header, sizeof( image_info_header ) ) &&
+ Write_s( file, ( char* ) &image_orientation_info_header, sizeof( image_orientation_info_header ) ) &&
+ Write_s( file, ( char* ) &motion_info_header, sizeof( motion_info_header ) ) &&
+ Write_s( file, ( char* ) &tv_info_header, sizeof( tv_info_header ) ) &&
+ Write_s( file, ( char* ) &user_defined_header, sizeof( user_defined_header ) ) ) )
+ return false;
+
+ for( int i = 0; i < image_info_header.image_elements; ++i )
+ {
+ unsigned char* data = im->data( i );
+
+ for( int j = 0; j < im->height( i ); ++j )
+ {
+ if( !Write_s( file, ( char* ) data, im->pitch( i ) ) )
+ return false;
+
+ data += im->pitch( i );
+ }
+ }
+
+ return true;
+ }
}
il::image_type_ptr DPX_plugin::load( const fs::path& path )
{ return load_dpx( path ); }
-bool DPX_plugin::store( const fs::path& /*path*/, const il::image_type_ptr& )
-{ return false; }
+bool DPX_plugin::store( const fs::path& path, const il::image_type_ptr& im )
+{ return store_dpx( path, im ); }
} } } }
Modified: lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl 2007-04-17 22:24:01 UTC (rev 82)
@@ -3,5 +3,6 @@
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
<plugin name="OpenLibraries DPX plugin" type="input" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_4_0.dll", "openimagelib_dpx-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries DPX plugin" type="output" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_4_0.dll", "openimagelib_dpx-vc80-r-0_4_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -8,10 +8,6 @@
#ifndef GL_UTILITY_INC_
#define GL_UTILITY_INC_
-#ifdef HAVE_CONFIG_H
-#include <openlibraries_global_config.hpp>
-#endif
-
#include <GL/glew.h>
#include <utility>
Modified: lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -173,7 +173,7 @@
else
el_reg.clear( );
-# ifdef HAVE_CG_RUNTIME
+# ifdef HAVE_CG_RUNTIME
shader_manager_instance( ).destroy_Cg_context( );
# endif
}
Modified: lib/openlibraries/src/openpluginlib/pl/timer.hpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/timer.hpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openpluginlib/pl/timer.hpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -8,10 +8,6 @@
#ifndef TIMER_INC_
#define TIMER_INC_
-#ifdef HAVE_CONFIG_H
-#include <openlibraries_global_config.hpp>
-#endif
-
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#pragma warning ( push )
Modified: lib/openlibraries/test/openmedialib/store/store.cpp
===================================================================
--- lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -1,7 +1,7 @@
// ml - A media library representation.
-// Copyright (C) 2005-2006 VM Inc.
+// Copyright (C) 2005 Visual Media FX Ltd.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
@@ -12,10 +12,6 @@
#include <string>
#include <iostream>
-#ifdef HAVE_CONFIG_H
-#include <openlibraries_global_config.hpp>
-#endif
-
#include <openpluginlib/pl/openpluginlib.hpp>
#include <openpluginlib/pl/utf8_utils.hpp>
@@ -26,17 +22,6 @@
namespace il = olib::openimagelib::il;
namespace opl = olib::openpluginlib;
-#ifdef WIN32
- const opl::string oml_plugin_path( "./plugins" );
- const opl::string oil_plugin_path( "./plugins" );
-#else
- const opl::string oil_plugin_path( OPENIMAGELIB_PLUGINS );
- const opl::string oml_plugin_path( OPENMEDIALIB_PLUGINS );
-#endif
-
-
-
-
class handler : public ml::store_keyboard_handler
{
public:
@@ -55,50 +40,16 @@
{
}
- void flush( int offset = 0 )
- {
- ml::frame_type_ptr frame = store_->flush( );
- if ( frame )
- input_->seek( int( frame->get_pts( ) * frame->fps( ) + offset + 0.5 ) );
- }
-
virtual void keyboard_handler( unsigned char key )
{
-
- //boost::mutex::scoped_lock scoped_lock( mutex_ );
+ boost::mutex::scoped_lock scoped_lock( mutex_ );
switch( key )
{
-
case 27:
done_ = true;
break;
- case ' ':
- speed_ = !speed_;
- flush( );
- break;
-
- case 'h':
- speed_ = 0;
- flush( -1 );
- break;
-
- case 'l':
- speed_ = 0;
- flush( 1 );
- break;
-
- case 'j':
- flush( );
- input_->seek( ( int )input_->get_frames( ) );
- break;
-
- case 'k':
- flush( );
- input_->seek( 0 );
- break;
-
default:
break;
}
@@ -106,29 +57,24 @@
void run( )
{
- int end=input_->get_frames( ) - 1;
- int pos=input_->get_position( );
-
- while( !done_ && pos < end )
+ //while( !done_ && input_->get_position( ) != input_->get_frames( ) )
{
- pos = input_->get_position( );
-
ml::frame_type_ptr frame = input_->fetch( );
+ if ( speed_ != 1 )
+ frame->set_audio( ml::audio_type_ptr( ) );
if ( !store_->push( frame ) )
- break;
-
+ //break;
+ boost::mutex::scoped_lock scoped_lock( mutex_ );
input_->seek( speed_, true );
}
-
store_->complete( );
}
-
private:
ml::input_type_ptr input_;
ml::store_type_ptr store_;
-
int speed_;
+ boost::mutex mutex_;
bool done_;
};
@@ -140,27 +86,18 @@
if ( argc > 2 )
{
ml::input_type_ptr input = ml::create_input( argv[ 1 ] );
- if ( input == 0 )
- return 1;
-
+ if ( input == 0 ) return 1;
ml::store_type_ptr store = ml::create_store( argv[ 2 ], input->fetch( ) );
- if ( store == 0 )
- return 2;
+ if ( store == 0 ) return 1;
- if ( store->init( ) )
- {
- handler handler( input, store );
- handler.run( );
- }
+ handler handler( input, store );
+ handler.run( );
}
else
{
std::cerr << "Usage: store input store" << std::endl;
- std::cerr << " ie: file.avi file.mpg" << std::endl;
+ std::cerr << " ie: file.avi glew:" << std::endl;
}
- opl::uninit( );
-
return 0;
}
-
Deleted: lib/openlibraries/test/openmedialib/store/test.cpp
===================================================================
--- lib/openlibraries/test/openmedialib/store/test.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/test/openmedialib/store/test.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -1,171 +0,0 @@
-
-// ml - A media library representation.
-
-// Copyright (C) 2005 Visual Media FX Ltd.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-// simple example to exercise the load and store features of ml
-
-
-
-
-
-#include <cstdio>
-#include <cstdlib>
-#include <string>
-#include <iostream>
-
-
-
-#ifdef HAVE_CONFIG_H
-#include <openlibraries_global_config.hpp>
-#endif
-
-#include <openpluginlib/pl/openpluginlib.hpp>
-#include <openpluginlib/pl/utf8_utils.hpp>
-
-#include <openimagelib/il/openimagelib_plugin.hpp>
-#include <openmedialib/ml/openmedialib_plugin.hpp>
-
-namespace ml = olib::openmedialib::ml;
-namespace il = olib::openimagelib::il;
-namespace opl = olib::openpluginlib;
-
-#ifdef WIN32
- const opl::string oml_plugin_path( "./plugins" );
- const opl::string oil_plugin_path( "./plugins" );
-#else
- const opl::string oil_plugin_path( OPENIMAGELIB_PLUGINS );
- const opl::string oml_plugin_path( OPENMEDIALIB_PLUGINS );
-#endif
-
-class handler : public ml::store_keyboard_handler
-{
- public:
- handler( ml::input_type_ptr input, ml::store_type_ptr store )
- : input_( input )
- , store_( store )
- , speed_( 1 )
- , done_( false )
- {
- ml::store_keyboard_feedback *feedback = dynamic_cast< ml::store_keyboard_feedback * >( store.get( ) );
- if ( feedback )
- feedback->register_keyboard_handler( this );
- }
-
- virtual ~handler( )
- {
- }
-
- void flush( int offset = 0 )
- {
- ml::frame_type_ptr frame = store_->flush( );
- if ( frame )
- input_->seek( int( frame->get_pts( ) * input_->fps( ) + offset + 0.5 ) );
- }
-
- virtual void keyboard_handler( unsigned char key )
- {
- boost::mutex::scoped_lock scoped_lock( mutex_ );
-
- switch( key )
- {
-
- case 27:
- done_ = true;
- break;
-
-
- case 'W':
- flush( int( 10 * input_->fps( ) ) );
- break;
-
- case 'B':
- flush( int( -10 * input_->fps( ) ) );
- break;
-
-
- case ' ':
- speed_ = !speed_;
- flush( );
- break;
-
- case 'h':
- speed_ = 0;
- flush( -1 );
- break;
-
- case 'l':
- speed_ = 0;
- flush( 1 );
- break;
-
-
- default:
- break;
- }
- }
-
- void run( )
- {
-
-
- olib::openmedialib::ml::image_type_ptr img;
-
- while( !done_ && input_->get_position( ) != input_->get_frames( ) )
- {
-
- ml::frame_type_ptr frame = input_->fetch( );//get the frame...
-
- if ( speed_ != 1 )
- frame->set_audio( ml::audio_type_ptr( ) );//sets the audio
-
- if ( !store_->push( frame ) )//pushes the frame
- break;
-
- boost::mutex::scoped_lock scoped_lock( mutex_ );
- input_->seek( speed_, true );
- }
- store_->complete( );
- }
-
- private:
- ml::input_type_ptr input_;
- ml::store_type_ptr store_;
- int speed_;
- boost::mutex mutex_;
- bool done_;
-};
-
-
-int main( int argc, char* argv[ ] )
-{
- // Load both oil and oml plugins since oml uses oil
- opl::init( oil_plugin_path );
- opl::init( oml_plugin_path );
-
-
-
- //now, for testing pourposes, the arguments are in the properties page
- if ( argc > 2 )
- {
- ml::input_type_ptr input = ml::create_input( argv[ 1 ] );
- if ( input == 0 )
- return 1;
- ml::store_type_ptr store = ml::create_store( argv[ 2 ], input->fetch( ) );
- if ( store == 0 )
- return 1;
-
- handler handler( input, store );
- handler.run( );
- }
- else
- {
- std::cerr << "Usage: store input store" << std::endl;
- std::cerr << " ie: file.avi glew:" << std::endl;
- }
-
- return 0;
-}
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-18 22:05:55
|
Revision: 83
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=83&view=rev
Author: glslang
Date: 2007-04-18 15:05:49 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
+ guard fixes
+ dpx storer
Modified Paths:
--------------
lib/openlibraries/src/openimagelib/il/utility.hpp
lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
lib/openlibraries/test/openmedialib/store/store.cpp
Modified: lib/openlibraries/src/openimagelib/il/utility.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/utility.hpp 2007-04-17 22:24:01 UTC (rev 82)
+++ lib/openlibraries/src/openimagelib/il/utility.hpp 2007-04-18 22:05:49 UTC (rev 83)
@@ -14,7 +14,7 @@
inline image_type_ptr conform( image_type_ptr image, int flags )
{
- if ( !image->matching( flags ) )
+ if ( image && !image->matching( flags ) )
image = image_type_ptr( static_cast<image_type*>( image->clone( flags ) ) );
return image;
}
Modified: lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-04-17 22:24:01 UTC (rev 82)
+++ lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-04-18 22:05:49 UTC (rev 83)
@@ -101,6 +101,13 @@
image_element element[ 8 ];
char reserved[ 52 ];
};
+
+ struct additional_image_orientation_information_header
+ {
+ float x_scanned_size;
+ float y_scanned_size;
+ char reserved[ 20 ];
+ };
struct image_orientation_information_header
{
@@ -116,6 +123,7 @@
char input_device_serial_name[ 32 ];
unsigned short border_validity[ 4 ];
unsigned int sar[ 2 ];
+ additional_image_orientation_information_header additional;
};
struct motion_picture_film_information_header
@@ -610,8 +618,6 @@
if( !Read_s( file, ( char* ) &tv_info_header, sizeof( tv_info_header ), sizeof( tv_info_header ) ) )
return il::image_type_ptr( );
- file.rdbuf( )->pubseekoff( header.user_header_length, std::ios::cur );
-
bool swab = header.magic == 0x58504453 ? true : false;
if( swab )
@@ -688,18 +694,66 @@
return im;
}
-
- // Needs to move into IL traits.
- void element_info( const std::wstring& pf, unsigned char& bitdepth )
+
+ // IL enum support for colour spaces... and add swizzling support.
+ bool element_info( int i, const std::wstring& pf, unsigned char& bitdepth, unsigned char& descriptor, unsigned char& transfer, unsigned char& colorimetric )
{
- if( pf == L"r8g8b8" || pf == L"r8g8b8a8" )
- bitdepth = 8;
- else if( pf == L"r10g10b10" || pf == L"r10g10b10a10" )
- bitdepth = 10;
- else if( pf == L"r12g12b12" || pf == L"r12g12b12a12" )
- bitdepth = 12;
- else if( pf == L"r16g16b16" || pf == L"r16g16b16a16" )
- bitdepth = 16;
+ transfer = 2, colorimetric = 2;
+
+ if( pf == L"r8g8b8" || pf == L"r8g8b8a8" || pf == L"r10g10b10" || pf == L"r10g10b10a10"
+ || pf == L"r12g12b12" || pf == L"r12g12b12a12" || pf == L"r16g16b16" || pf == L"r16g16b16a16"
+ || pf == L"r8g8b8log" || pf == L"r8g8b8a8log" || pf == L"r10g10b10log" || pf == L"r10g10b10a10log"
+ || pf == L"r12g12b12log" || pf == L"r12g12b12a12log" || pf == L"r16g16b16log" || pf == L"r16g16b16a16log" )
+ {
+ if( pf == L"r8g8b8" || pf == L"r8g8b8a8" || pf == L"r8g8b8log" || pf == L"r8g8b8a8log" )
+ bitdepth = 8;
+ else if( pf == L"r10g10b10" || pf == L"r10g10b10a10" || pf == L"r10g10b10log" || pf == L"r10g10b10a10log" )
+ bitdepth = 10;
+ else if( pf == L"r12g12b12" || pf == L"r12g12b12a12" || pf == L"r12g12b12log" || pf == L"r12g12b12a12log" )
+ bitdepth = 12;
+ else if( pf == L"r16g16b16" || pf == L"r16g16b16a16" || pf == L"r16g16b16log" || pf == L"r16g16b16a16log" )
+ bitdepth = 16;
+
+ if( pf == L"r8g8b8" || pf == L"r10g10b10" || pf == L"r12g12b12" || pf == L"r16g16b16"
+ || pf == L"r8g8b8log" || pf == L"r10g10b10log" || pf == L"r12g12b12log" || pf == L"r16g16b16log" )
+ descriptor = IMAGE_ELEMENT_DESC_RGB;
+ else
+ descriptor = IMAGE_ELEMENT_DESC_RGBA;
+
+ if( pf == L"r8g8b8log" || pf == L"r8g8b8a8log" || pf == L"r10g10b10log" || pf == L"r10g10b10a10log"
+ || pf == L"r12g12b12log" || pf == L"r12g12b12a12log" || pf == L"r16g16b16log" || pf == L"r16g16b16a16log" )
+ transfer = 1, colorimetric = 1;
+
+ return true;
+ }
+ else if( pf == L"r8g8b8p" || pf == L"r8g8b8a8p" || pf == L"r10g10b10p" || pf == L"r10g10b10a10p"
+ || pf == L"r12g12b12p" || pf == L"r12g12b12a12p" || pf == L"r16g16b16p" || pf == L"r16g16b16a16p" )
+ {
+ if( pf == L"r8g8b8p" || pf == L"r8g8b8a8p" )
+ bitdepth = 8;
+ else if( pf == L"r10g10b10p" || pf == L"r10g10b10a10p" )
+ bitdepth = 10;
+ else if( pf == L"r12g12b12p" || pf == L"r12g12b12a12p" )
+ bitdepth = 12;
+ else if( pf == L"r16g16b16p" || pf == L"r16g16b16a16p" )
+ bitdepth = 16;
+
+ if( i == 0 )
+ descriptor = IMAGE_ELEMENT_DESC_RED;
+ else if( i == 1 )
+ descriptor = IMAGE_ELEMENT_DESC_GREEN;
+ else if( i == 2 )
+ descriptor = IMAGE_ELEMENT_DESC_BLUE;
+ else if( i == 3 )
+ descriptor = IMAGE_ELEMENT_DESC_ALPHA;
+
+ return true;
+ }
+ else if( pf == L"l12a12p" || pf == L"l16a16p" )
+ {
+ }
+
+ return false;
}
bool store_dpx( const fs::path& path, const il::image_type_ptr& im )
@@ -709,18 +763,13 @@
il::image_type::size_type width = im->width( );
il::image_type::size_type height = im->height( );
-
- unsigned char bitdepth;
- element_info( im->pf( ), bitdepth );
- int linesize = bytes_per_line( bitdepth, im->linesize( ), 0 );
-
file_information_header header;
memset( &header, 0, sizeof( header ) );
header.magic = 0x53445058;
- header.offset = 2048; // fixed value if no user defined data is present. check the specification.
- strcpy( header.version, "V2.0" ); // xxx
- header.filesize = 2048 + linesize * height;
+ header.offset = 2080; // fixed value if no user defined data is present. check the specification.
+ strcpy( header.version, "V2.0" );
+ header.filesize = 2080 + im->size( );
image_information_header image_info_header;
memset( &image_info_header, 0, sizeof( image_info_header ) );
@@ -729,20 +778,30 @@
image_info_header.pixels_per_line = width;
image_info_header.lines_per_element = height;
+ int offset = 2080;
for( int i = 0; i < image_info_header.image_elements; ++i )
- {
- image_info_header.element[ i ].sign = 0;
- image_info_header.element[ i ].descriptor = 50; // xxx
- image_info_header.element[ i ].transfer = 2; // xxx
- image_info_header.element[ i ].colorimetric = 2; // xxx
- image_info_header.element[ i ].bitdepth = bitdepth;
- image_info_header.element[ i ].packing = 0;
- image_info_header.element[ i ].encoding = 0;
-
- if( !i )
- image_info_header.element[ i ].offset = 2048;
- else
- image_info_header.element[ i ].offset = image_info_header.element[ i - 1 ].offset + im->pitch( i - 1 ) * im->height( i - 1 );
+ {
+ unsigned char bitdepth, descriptor, transfer, colorimetric;
+ if( element_info( i, im->pf( ), bitdepth, descriptor, transfer, colorimetric ) )
+ {
+ image_info_header.element[ i ].sign = 0;
+ image_info_header.element[ i ].descriptor = descriptor;
+ image_info_header.element[ i ].transfer = transfer;
+ image_info_header.element[ i ].colorimetric = colorimetric;
+ image_info_header.element[ i ].bitdepth = bitdepth == 10 || bitdepth == 12 ? 16 : bitdepth;
+ image_info_header.element[ i ].packing = 0;
+ image_info_header.element[ i ].encoding = 0;
+
+ if( i > 0 )
+ {
+ if( bitdepth == 8 )
+ offset = 2080 + im->offset( i );
+ else
+ offset += im->linesize( i - 1 ) * height * sizeof( unsigned short );
+ }
+
+ image_info_header.element[ i ].offset = offset;
+ }
}
image_orientation_information_header image_orientation_info_header;
@@ -764,20 +823,33 @@
Write_s( file, ( char* ) &tv_info_header, sizeof( tv_info_header ) ) &&
Write_s( file, ( char* ) &user_defined_header, sizeof( user_defined_header ) ) ) )
return false;
-
+
for( int i = 0; i < image_info_header.image_elements; ++i )
{
- unsigned char* data = im->data( i );
-
- for( int j = 0; j < im->height( i ); ++j )
+ if( image_info_header.element[ i ].bitdepth == 8 )
{
- if( !Write_s( file, ( char* ) data, im->pitch( i ) ) )
- return false;
-
- data += im->pitch( i );
+ il::image_type::const_pointer data = im->data( i );
+ for( int j = 0; j < height; ++j )
+ {
+ if( !Write_s( file, ( char* ) data, im->pitch( i ) ) )
+ return false;
+
+ data += im->pitch( i );
+ }
}
+ else
+ {
+ unsigned short* data = ( unsigned short* ) im->data( i );
+ for( int j = 0; j < height; ++j )
+ {
+ if( !Write_s( file, ( char* ) data, im->linesize( i ) * sizeof( unsigned short ) ) )
+ return false;
+
+ data += im->pitch( i );
+ }
+ }
}
-
+
return true;
}
}
Modified: lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
===================================================================
--- lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-04-17 22:24:01 UTC (rev 82)
+++ lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-04-18 22:05:49 UTC (rev 83)
@@ -460,7 +460,6 @@
typedef pl::discovery<il_query_traits> discovery;
il::image_type_ptr image = frame->get_image( );
if ( image == 0 ) return false;
- image = il::convert( image, L"r8g8b8" );
std::ostringstream out;
out << path_;
Modified: lib/openlibraries/test/openmedialib/store/store.cpp
===================================================================
--- lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-17 22:24:01 UTC (rev 82)
+++ lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-18 22:05:49 UTC (rev 83)
@@ -57,13 +57,13 @@
void run( )
{
- //while( !done_ && input_->get_position( ) != input_->get_frames( ) )
+ while( !done_ && input_->get_position( ) != input_->get_frames( ) )
{
ml::frame_type_ptr frame = input_->fetch( );
if ( speed_ != 1 )
frame->set_audio( ml::audio_type_ptr( ) );
if ( !store_->push( frame ) )
- //break;
+ break;
boost::mutex::scoped_lock scoped_lock( mutex_ );
input_->seek( speed_, true );
}
@@ -80,7 +80,6 @@
int main( int argc, char* argv[ ] )
{
- // Load both oil and oml plugins since oml uses oil
opl::init( "" );
if ( argc > 2 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-20 10:47:58
|
Revision: 84
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=84&view=rev
Author: glslang
Date: 2007-04-20 03:47:54 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
+ win build updates
Modified Paths:
--------------
lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/qim/qim_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/glew/glew_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj
lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D/_2D_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap_vc8.vcproj
lib/openlibraries/test/openmedialib/player/player_vc8.vcproj
lib/openlibraries/test/openmedialib/store/store_vc8.vcproj
lib/openlibraries/test/openobjectlib/GL/multipass_draw/multipass_draw_vc8.vcproj
lib/openlibraries/test/openobjectlib/GL/noise_volume/noise_volume_vc8.vcproj
lib/openlibraries/test/openobjectlib/GL/obj_draw/obj_draw_vc8.vcproj
lib/openlibraries/test/openobjectlib/GL/texture_draw/texture_draw_vc8.vcproj
lib/openlibraries/test/openpluginlib/discovery/discovery_vc8.vcproj
lib/openlibraries/test/openpluginlib/enumerate/enumerate_vc8.vcproj
lib/openlibraries/test/openpluginlib/gpu_timer_query/gpu_timer_query_vc8.vcproj
lib/openlibraries/test/openpluginlib/initialization/initialization_vc8.vcproj
lib/openlibraries/test/openpluginlib/pcos/key/key_vc8.vcproj
lib/openlibraries/test/openpluginlib/pcos/property/property_vc8.vcproj
lib/openlibraries/test/openpluginlib/pcos/property_container/property_container_vc8.vcproj
lib/openlibraries/test/openpluginlib/pcos/subject-observer/subject-observer_vc8.vcproj
lib/openlibraries/test/openpluginlib/rdtsc/rdtsc_vc8.vcproj
lib/openlibraries/test/openpluginlib/sleep/sleep_vc8.vcproj
Modified: lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -3,13 +3,15 @@
ProjectType="Visual C++"
Version="8.00"
Name="al"
+ OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
ProjectGUID="{BD346E41-BEBD-43E7-9801-8EC1158355C4}"
RootNamespace="al"
Keyword="Win32Proj"
- OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -19,17 +21,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,16 +47,23 @@
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="0"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\openassetlib_al-vc80-d-0_4_0.dll"
@@ -57,23 +72,32 @@
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="$(TargetDir)openassetlib_al-vc80-d-0_4_0.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
@@ -81,17 +105,23 @@
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
- WholeProgramOptimization="1">
+ WholeProgramOptimization="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="C:\Boost\include\boost-1_33_1;$(SolutionDir)\src"
@@ -99,16 +129,23 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/openassetlib_al-vc80-r-0_4_0.dll"
@@ -119,23 +156,32 @@
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(TargetDir)openassetlib_al-vc80-r-0_4_0.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -144,56 +190,72 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\al.cpp">
+ RelativePath=".\al.cpp"
+ >
</File>
<File
- RelativePath=".\al_plugin.cpp">
+ RelativePath=".\al_plugin.cpp"
+ >
</File>
<File
- RelativePath=".\asset.cpp">
+ RelativePath=".\asset.cpp"
+ >
</File>
<File
- RelativePath=".\base64_codec.cpp">
+ RelativePath=".\base64_codec.cpp"
+ >
</File>
<File
- RelativePath=".\guid.cpp">
+ RelativePath=".\guid.cpp"
+ >
</File>
<File
- RelativePath=".\set.cpp">
+ RelativePath=".\set.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\al.hpp">
+ RelativePath=".\al.hpp"
+ >
</File>
<File
- RelativePath=".\al_plugin.hpp">
+ RelativePath=".\al_plugin.hpp"
+ >
</File>
<File
- RelativePath=".\asset.hpp">
+ RelativePath=".\asset.hpp"
+ >
</File>
<File
- RelativePath=".\base64_codec.hpp">
+ RelativePath=".\base64_codec.hpp"
+ >
</File>
<File
- RelativePath=".\config.hpp">
+ RelativePath=".\config.hpp"
+ >
</File>
<File
- RelativePath=".\guid.hpp">
+ RelativePath=".\guid.hpp"
+ >
</File>
<File
- RelativePath=".\set.hpp">
+ RelativePath=".\set.hpp"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -3,13 +3,15 @@
ProjectType="Visual C++"
Version="8.00"
Name="sqlite"
+ OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
ProjectGUID="{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}"
RootNamespace="sqlite"
Keyword="Win32Proj"
- OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -19,17 +21,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,16 +47,21 @@
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -58,23 +71,32 @@
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
@@ -82,17 +104,23 @@
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
- WholeProgramOptimization="1">
+ WholeProgramOptimization="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(SolutionDir)src;C:\Boost\include\boost-1_33_1"
@@ -100,16 +128,22 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -121,23 +155,32 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -146,38 +189,48 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\database.cpp">
+ RelativePath=".\database.cpp"
+ >
</File>
<File
- RelativePath=".\sqlite3_metadata.cpp">
+ RelativePath=".\sqlite3_metadata.cpp"
+ >
</File>
<File
- RelativePath=".\sqlite3_metadata_plugin.cpp">
+ RelativePath=".\sqlite3_metadata_plugin.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\config.hpp">
+ RelativePath=".\config.hpp"
+ >
</File>
<File
- RelativePath=".\database.hpp">
+ RelativePath=".\database.hpp"
+ >
</File>
<File
- RelativePath=".\sqlite3.h">
+ RelativePath=".\sqlite3.h"
+ >
</File>
<File
- RelativePath=".\sqlite3_metadata_plugin.hpp">
+ RelativePath=".\sqlite3_metadata_plugin.hpp"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -3,13 +3,15 @@
ProjectType="Visual C++"
Version="8.00"
Name="py"
+ OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
ProjectGUID="{ECEDB34E-A863-420F-BFC6-F294AC078892}"
RootNamespace="py"
Keyword="Win32Proj"
- OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -19,17 +21,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,16 +47,21 @@
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
AdditionalDependencies="boost_python-vc80-mt-gd-1_33_1.lib"
@@ -57,23 +70,32 @@
AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)src\openassetlib\al\$(ConfigurationName);$(SolutionDir)src\openimagelib\il\$(ConfigurationName);$(SolutionDir)src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)src\openobjectlib\sg\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
@@ -81,17 +103,23 @@
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
- WholeProgramOptimization="1">
+ WholeProgramOptimization="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1";C:\Python25\include"
@@ -99,16 +127,22 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -120,23 +154,32 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -145,41 +188,52 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\asset.cpp">
+ RelativePath=".\asset.cpp"
+ >
</File>
<File
- RelativePath=".\guid.cpp">
+ RelativePath=".\guid.cpp"
+ >
</File>
<File
- RelativePath=".\openassetlib.cpp">
+ RelativePath=".\openassetlib.cpp"
+ >
</File>
<File
- RelativePath=".\plugin.cpp">
+ RelativePath=".\plugin.cpp"
+ >
</File>
<File
- RelativePath=".\py.cpp">
+ RelativePath=".\py.cpp"
+ >
</File>
<File
- RelativePath=".\set.cpp">
+ RelativePath=".\set.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\py.hpp">
+ RelativePath=".\py.hpp"
+ >
</File>
<File
- RelativePath=".\python.hpp">
+ RelativePath=".\python.hpp"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -46,6 +46,7 @@
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
@@ -127,6 +128,8 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
Modified: lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -48,7 +48,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="true"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
@@ -136,7 +136,8 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
Modified: lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -5,10 +5,12 @@
Name="3D_lightmap"
ProjectGUID="{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}"
RootNamespace="My3D_lightmap"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -18,17 +20,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,18 +47,23 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="true"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
RuntimeTypeInfo="true"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -59,40 +72,55 @@
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCu...
[truncated message content] |
|
From: <gl...@us...> - 2007-04-20 16:31:59
|
Revision: 86
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=86&view=rev
Author: glslang
Date: 2007-04-20 09:31:48 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
+ enables tiff support on win
Modified Paths:
--------------
lib/openlibraries/openlibraries_vc8.sln
Added Paths:
-----------
lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
Modified: lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- lib/openlibraries/openlibraries_vc8.sln 2007-04-20 13:50:09 UTC (rev 85)
+++ lib/openlibraries/openlibraries_vc8.sln 2007-04-20 16:31:48 UTC (rev 86)
@@ -103,80 +103,80 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3D_lightmap", "src\openimagelib\plugins\3D_lightmap\3D_lightmap_vc8.vcproj", "{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmp", "src\openimagelib\plugins\bmp\bmp_vc8.vcproj", "{261595DD-FB76-4D37-A3C8-0D9625C20D46}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dds", "src\openimagelib\plugins\dds\dds_vc8.vcproj", "{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dpx", "src\openimagelib\plugins\dpx\dpx_vc8.vcproj", "{875CE227-A98F-4711-9496-61BC21DA88B8}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exr", "src\openimagelib\plugins\exr\exr_vc8.vcproj", "{17CBC457-3279-40F9-A614-A69046132424}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi+", "src\openimagelib\plugins\gdi+\gdi+_vc8.vcproj", "{08D0F0FA-947B-4AAF-90A8-7FBFC5EBD51B}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdr", "src\openimagelib\plugins\hdr\hdr_vc8.vcproj", "{972FF7FA-BDBE-400E-BDF6-59C13A6AE74D}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "src\openimagelib\plugins\png\png_vc8.vcproj", "{4A6B0F4F-676E-4A96-A990-62464D923ED2}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "psd", "src\openimagelib\plugins\psd\psd_vc8.vcproj", "{FF23E252-5FD9-4642-9563-1111B12D8EE7}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qim", "src\openimagelib\plugins\qim\qim_vc8.vcproj", "{A2C21D3B-0948-4724-8028-C3824213912A}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.vcproj", "{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sgi", "src\openimagelib\plugins\sgi\sgi_vc8.vcproj", "{291BFF23-61D3-4355-8AA5-C8BF0FE30CB0}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tga", "src\openimagelib\plugins\tga\tga_vc8.vcproj", "{227A0088-F3AE-4CA7-941C-0283D44F1678}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ML", "ML", "{F76943CD-19F1-469A-B725-38C44C2DD27F}"
@@ -185,8 +185,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml", "src\openmedialib\ml\ml_vc8.vcproj", "{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "py", "src\openmedialib\py\py_vc8.vcproj", "{1C648B54-C3DC-49B5-AFC9-B205F3151F81}"
@@ -196,80 +196,80 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avformat", "src\openmedialib\plugins\avformat\avformat_vc8.vcproj", "{0C4F7499-83C6-4143-A392-56F299345E8A}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.vcproj", "{88BCD57E-044F-4427-A407-541BA8A938E6}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.vcproj", "{88BCD57E-044F-4427-A407-541BA8A938E6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "src\openmedialib\plugins\glew\glew_vc8.vcproj", "{649D053D-1768-40BB-8FA7-8CD91A765F32}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "src\openmedialib\plugins\glew\glew_vc8.vcproj", "{649D053D-1768-40BB-8FA7-8CD91A765F32}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.vcproj", "{A60E2710-2DA9-4641-AEF6-6488A6264723}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.vcproj", "{A60E2710-2DA9-4641-AEF6-6488A6264723}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oil", "src\openmedialib\plugins\oil\oil_vc8.vcproj", "{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oil", "src\openmedialib\plugins\oil\oil_vc8.vcproj", "{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "template", "src\openmedialib\plugins\template\template_vc8.vcproj", "{18271104-A6E4-4293-A6F1-70B15AE311E5}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "template", "src\openmedialib\plugins\template\template_vc8.vcproj", "{18271104-A6E4-4293-A6F1-70B15AE311E5}"
- ProjectSection(ProjectDependencies) = postProject
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SG", "SG", "{BD86F550-C573-4A68-955B-6CEDCC8F595D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{9483FC7B-E396-43E6-84ED-EB021AC54252}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sg", "src\openobjectlib\sg\sg_vc8.vcproj", "{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "src\openobjectlib\plugins\obj\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "X3D", "src\openobjectlib\plugins\X3D\X3D_vc8.vcproj", "{7A98C731-F651-4427-BD02-25133DEA7171}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AL", "AL", "{D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}"
@@ -278,10 +278,10 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "al", "src\openassetlib\al\al_vc8.vcproj", "{BD346E41-BEBD-43E7-9801-8EC1158355C4}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "py", "src\openassetlib\py\py_vc8.vcproj", "{ECEDB34E-A863-420F-BFC6-F294AC078892}"
@@ -291,94 +291,94 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "src\openassetlib\plugins\sqlite\sqlite_vc8.vcproj", "{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}"
ProjectSection(ProjectDependencies) = postProject
+ {BD346E41-BEBD-43E7-9801-8EC1158355C4} = {BD346E41-BEBD-43E7-9801-8EC1158355C4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {BD346E41-BEBD-43E7-9801-8EC1158355C4} = {BD346E41-BEBD-43E7-9801-8EC1158355C4}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{C2EBF114-BFF6-4520-BC11-EB54565B92D6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D", "test\openimagelib\GL\_2D\_2D_vc8.vcproj", "{24D622CC-4577-49B0-9224-8BB191236A61}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_compressed", "test\openimagelib\GL\_2D_compressed\_2D_compressed_vc8.vcproj", "{F0557FAB-2BC7-4991-9AD8-560526321D80}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_compressed_cubemap", "test\openimagelib\GL\_2D_compressed_cubemap\_2D_compressed_cubemap_vc8.vcproj", "{23B3623B-4FED-49F3-8F16-4883E57588E6}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_crop", "test\openimagelib\GL\_2D_crop\_2D_crop_vc8.vcproj", "{19B62156-49C4-4D43-A0E6-2D45952CC2CC}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_crop2", "test\openimagelib\GL\_2D_crop2\_2D_crop2_vc8.vcproj", "{AA3C0ACD-1251-484F-80D6-E9B8FF249B9E}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_exr", "test\openimagelib\GL\_2D_exr\_2D_exr_vc8.vcproj", "{4CC2C554-1EB4-4E53-A73F-38F0A1862F49}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_sgi", "test\openimagelib\GL\_2D_sgi\_2D_sgi_vc8.vcproj", "{F30DAA25-794E-44F6-BF01-867A72BE385B}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_3D_lightmap", "test\openimagelib\GL\_3D_lightmap\_3D_lightmap_vc8.vcproj", "{DBF9F309-3C1F-4563-AA2B-69FA27C2CBF7}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "player", "test\openmedialib\player\player_vc8.vcproj", "{14B49ECE-F5DB-4985-A31D-C48483362F9F}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "store", "test\openmedialib\store\store_vc8.vcproj", "{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multipass_draw", "test\openobjectlib\GL\multipass_draw\multipass_draw_vc8.vcproj", "{AB0137D5-38BE-45A5-ACE9-02BB34D02358}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noise_volume", "test\openobjectlib\GL\noise_volume\noise_volume_vc8.vcproj", "{3780D440-9C37-4186-B9B2-861EF3833CD4}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_draw", "test\openobjectlib\GL\obj_draw\obj_draw_vc8.vcproj", "{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texture_draw", "test\openobjectlib\GL\texture_draw\texture_draw_vc8.vcproj", "{8032E526-0866-4764-A4E9-F18C7CEE12D2}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{B972DCEB-386E-42D2-8C5E-DD2942EC7F63}"
@@ -387,17 +387,22 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tonemap", "src\openeffectslib\plugins\tonemap\tonemap_vc8.vcproj", "{6D618CAE-230F-4ADD-936B-6C1D3D723236}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tm_bench", "test\openeffectslib\tm_bench\tm_bench_vc8.vcproj", "{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff", "src\openimagelib\plugins\tiff\tiff_vc8.vcproj", "{A1308789-3ABD-438C-BA08-FB341B55D94C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -640,6 +645,10 @@
{534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -699,6 +708,7 @@
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{291BFF23-61D3-4355-8AA5-C8BF0FE30CB0} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{227A0088-F3AE-4CA7-941C-0283D44F1678} = {D9066C6C-E143-472F-860E-004E481F3E0A}
+ {A1308789-3ABD-438C-BA08-FB341B55D94C} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
{1C648B54-C3DC-49B5-AFC9-B205F3151F81} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
{0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
Added: lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj (rev 0)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2007-04-20 16:31:48 UTC (rev 86)
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="tiff"
+ ProjectGUID="{A1308789-3ABD-438C-BA08-FB341B55D94C}"
+ RootNamespace="tiff"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Multi-threaded Debug DLL|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1";C:\libtiff\include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIFF_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ MinimalRebuild="true"
+ ExceptionHandling="2"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
+ AdditionalDependencies="libtiff.lib"
+ OutputFile="$(OutDir)\openimagelib_tiff-vc80-d-0_4_0.dll"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
+ IgnoreDefaultLibraryNames="msvcrt.lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Multi-threaded Release DLL|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1";C:\libtiff\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIFF_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ ExceptionHandling="2"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
+ ...
[truncated message content] |
|
From: <gl...@us...> - 2007-04-21 16:26:50
|
Revision: 88
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=88&view=rev
Author: glslang
Date: 2007-04-21 09:26:49 -0700 (Sat, 21 Apr 2007)
Log Message:
-----------
+build updates
Modified Paths:
--------------
lib/openlibraries/configure.ac
lib/openlibraries/test/Makefile.am
Added Paths:
-----------
lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
Modified: lib/openlibraries/configure.ac
===================================================================
--- lib/openlibraries/configure.ac 2007-04-21 16:19:18 UTC (rev 87)
+++ lib/openlibraries/configure.ac 2007-04-21 16:26:49 UTC (rev 88)
@@ -394,6 +394,8 @@
media/Makefile
effects/Makefile
test/Makefile
+test/openeffectslib/Makefile
+test/openeffectslib/tm_bench/Makefile
test/openpluginlib/Makefile
test/openpluginlib/discovery/Makefile
test/openpluginlib/enumerate/Makefile
Modified: lib/openlibraries/test/Makefile.am
===================================================================
--- lib/openlibraries/test/Makefile.am 2007-04-21 16:19:18 UTC (rev 87)
+++ lib/openlibraries/test/Makefile.am 2007-04-21 16:26:49 UTC (rev 88)
@@ -4,7 +4,8 @@
#
SUBDIRS = \
- openpluginlib \
+ openeffectslib \
+ openpluginlib \
openimagelib \
openmedialib \
openobjectlib \
Added: lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
===================================================================
--- lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am (rev 0)
+++ lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am 2007-04-21 16:26:49 UTC (rev 88)
@@ -0,0 +1,24 @@
+
+#
+#
+#
+
+check_PROGRAMS = tm_bench
+
+tm_bench_SOURCES = \
+ tm_bench.cpp
+
+tm_bench_CXXFLAGS = \
+ $(OLIB_CXXFLAGS) \
+ $(BOOST_INCLUDE_PATH)
+
+tm_bench_LDFLAGS = \
+ $(OLIB_LDFLAGS) \
+ $(BOOST_LIB_PATH) \
+ $(BOOST_LIB_RPATH)
+
+tm_bench_LDADD = \
+ $(BOOST_FILESYSTEM_LIBS) \
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
+
Property changes on: lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-21 19:15:03
|
Revision: 91
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=91&view=rev
Author: glslang
Date: 2007-04-21 12:15:00 -0700 (Sat, 21 Apr 2007)
Log Message:
-----------
+ fast math support
Modified Paths:
--------------
lib/openlibraries/src/openimagelib/il/utility.cpp
lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
Added Paths:
-----------
lib/openlibraries/src/openpluginlib/pl/fast_math.cpp
lib/openlibraries/src/openpluginlib/pl/fast_math.hpp
Modified: lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/utility.cpp 2007-04-21 16:40:23 UTC (rev 90)
+++ lib/openlibraries/src/openimagelib/il/utility.cpp 2007-04-21 19:15:00 UTC (rev 91)
@@ -11,9 +11,10 @@
using namespace std;
+#include <openpluginlib/pl/fast_math.hpp>
+#include <openpluginlib/pl/utf8_utils.hpp>
#include <openimagelib/il/il.hpp>
-#include <openpluginlib/pl/utf8_utils.hpp>
namespace opl = olib::openpluginlib;
namespace olib { namespace openimagelib { namespace il {
@@ -1877,9 +1878,15 @@
{
while( width-- )
{
+/*
*( dst + 2 ) = static_cast<unsigned char>( *src++ );
*( dst + 1 ) = static_cast<unsigned char>( *src++ );
*( dst + 0 ) = static_cast<unsigned char>( *src++ );
+*/
+ *( dst + 2 ) = static_cast<unsigned char>( opl::fast_floorf( *src++ ) );
+ *( dst + 1 ) = static_cast<unsigned char>( opl::fast_floorf( *src++ ) );
+ *( dst + 0 ) = static_cast<unsigned char>( opl::fast_floorf( *src++ ) );
+
*( dst + 3 ) = 255;
dst += 4;
@@ -3241,6 +3248,10 @@
// range is the difference the maximum and minimum luminance values.
float range = maxval - minval;
+ if( range < 1e-6f )
+ return dst_img;
+
+ float one_over_range = 1.0f / range;
// reset the src image pointer.
src = ( const float* ) im->data( );
@@ -3251,9 +3262,9 @@
{
for( size_type j = 0; j < width; ++j )
{
- float r = output_range * ( ( *src++ - minval ) / range );
- float g = output_range * ( ( *src++ - minval ) / range );
- float b = output_range * ( ( *src++ - minval ) / range );
+ float r = output_range * ( ( *src++ - minval ) * one_over_range );
+ float g = output_range * ( ( *src++ - minval ) * one_over_range );
+ float b = output_range * ( ( *src++ - minval ) * one_over_range );
r < 0.0f ? *dst++ = 0.0f : r > output_range ? *dst++ = output_range : *dst++ = r;
g < 0.0f ? *dst++ = 0.0f : g > output_range ? *dst++ = output_range : *dst++ = g;
@@ -3357,13 +3368,15 @@
const float* sptr = src;
float* dptr = dst;
+ const float one_over_gamma = 1.0f / gamma;
+
while( height-- )
{
while( width-- )
{
- *dst++ = powf( *src++, 1.0f / gamma );
- *dst++ = powf( *src++, 1.0f / gamma );
- *dst++ = powf( *src++, 1.0f / gamma );
+ *dst++ = opl::fast_powf( *src++, one_over_gamma );
+ *dst++ = opl::fast_powf( *src++, one_over_gamma );
+ *dst++ = opl::fast_powf( *src++, one_over_gamma );
}
dst = dptr += dst_pitch;
Modified: lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2007-04-21 16:40:23 UTC (rev 90)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2007-04-21 19:15:00 UTC (rev 91)
@@ -151,7 +151,7 @@
OutputFile="$(OutDir)\openimagelib_tiff-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
- IgnoreDefaultLibraryNames="msvcrt.lib"
+ IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Added: lib/openlibraries/src/openpluginlib/pl/fast_math.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/fast_math.cpp (rev 0)
+++ lib/openlibraries/src/openpluginlib/pl/fast_math.cpp 2007-04-21 19:15:00 UTC (rev 91)
@@ -0,0 +1,52 @@
+
+// openpluginlib - A plugin interface to openlibraries.
+
+// Copyright (C) 2007 VM Inc.
+// Released under the LGPL.
+// For more information, see http://www.openlibraries.org.
+
+#include <openpluginlib/pl/fast_math.hpp>
+
+namespace olib { namespace openpluginlib {
+
+// precomputed constants.
+const float two_to_pow_23 = 1 << 23;
+const float one_over_two_to_pow_23 = 1.0f / ( 1 << 23 );
+
+int fast_floorf( float x )
+{
+ double y = ( x + 68719476736.0 * 1.5 );
+
+ return ( int ) ( ( *( ( long long* ) &y ) ) >> 16 );
+}
+
+float fast_log2f( float v )
+{
+ float x = ( float ) *( int* ) &v;
+ x *= one_over_two_to_pow_23;
+ x = x - 127.0f;
+
+ float y = x - fast_floorf( x );
+ y = ( y - y * y ) * 0.346607f;
+
+ return x + y;
+}
+
+float fast_exp2f( float v )
+{
+ float y = v - fast_floorf( v );
+ y = ( y - y * y ) * 0.33971f;
+
+ float x = v + 127.0f - y;
+ x *= two_to_pow_23;
+ *( int* ) &x = ( int ) x;
+
+ return x;
+}
+
+float fast_powf( float x, float y )
+{
+ return fast_exp2f( y * fast_log2f( x ) );
+}
+
+} }
Property changes on: lib/openlibraries/src/openpluginlib/pl/fast_math.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: lib/openlibraries/src/openpluginlib/pl/fast_math.hpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/fast_math.hpp (rev 0)
+++ lib/openlibraries/src/openpluginlib/pl/fast_math.hpp 2007-04-21 19:15:00 UTC (rev 91)
@@ -0,0 +1,22 @@
+
+// openpluginlib - A plugin interface to openlibraries.
+
+// Copyright (C) 2007 VM Inc.
+// Released under the LGPL.
+// For more information, see http://www.openlibraries.org.
+
+#ifndef FAST_MATH_INC_
+#define FAST_MATH_INC_
+
+#include <openpluginlib/pl/config.hpp>
+
+namespace olib { namespace openpluginlib {
+
+OPENPLUGINLIB_DECLSPEC float fast_log2f( float x );
+OPENPLUGINLIB_DECLSPEC float fast_exp2f( float x );
+OPENPLUGINLIB_DECLSPEC float fast_powf( float x, float y );
+OPENPLUGINLIB_DECLSPEC int fast_floorf( float x );
+
+} }
+
+#endif
Property changes on: lib/openlibraries/src/openpluginlib/pl/fast_math.hpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-21 16:40:23 UTC (rev 90)
+++ lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-21 19:15:00 UTC (rev 91)
@@ -211,6 +211,10 @@
>
</File>
<File
+ RelativePath=".\fast_math.cpp"
+ >
+ </File>
+ <File
RelativePath=".\GL_utility.cpp"
>
</File>
@@ -305,6 +309,10 @@
>
</File>
<File
+ RelativePath=".\fast_math.hpp"
+ >
+ </File>
+ <File
RelativePath=".\flex_string.h"
>
</File>
@@ -365,11 +373,11 @@
>
</File>
<File
- RelativePath=".\property.hpp"
+ RelativePath=".\pcos\property.hpp"
>
</File>
<File
- RelativePath=".\pcos\property.hpp"
+ RelativePath=".\property.hpp"
>
</File>
<File
Modified: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
===================================================================
--- lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp 2007-04-21 16:40:23 UTC (rev 90)
+++ lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp 2007-04-21 19:15:00 UTC (rev 91)
@@ -28,8 +28,11 @@
if( input && filter )
{
- filter->connect( input );
- filter->fetch( );
+ for( int i = 0; i < 10; ++i )
+ {
+ filter->connect( input );
+ filter->fetch( );
+ }
}
r.stop( );
Modified: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
===================================================================
--- lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj 2007-04-21 16:40:23 UTC (rev 90)
+++ lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj 2007-04-21 19:15:00 UTC (rev 91)
@@ -149,6 +149,7 @@
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
+ FixedBaseAddress="1"
/>
<Tool
Name="VCALinkTool"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-22 15:47:48
|
Revision: 93
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=93&view=rev
Author: glslang
Date: 2007-04-22 08:47:45 -0700 (Sun, 22 Apr 2007)
Log Message:
-----------
+build updates
Modified Paths:
--------------
lib/openlibraries/configure.ac
Added Paths:
-----------
lib/openlibraries/m4/fast_math.m4
Modified: lib/openlibraries/configure.ac
===================================================================
--- lib/openlibraries/configure.ac 2007-04-21 19:16:49 UTC (rev 92)
+++ lib/openlibraries/configure.ac 2007-04-22 15:47:45 UTC (rev 93)
@@ -274,6 +274,9 @@
dnl Universal Binary Support (OS X only)
AC_CHECK_UNIVERSAL_BINARY_SUPPORT( )
+dnl Fast Math support
+AC_CHECK_FAST_MATH( )
+
SHARED_EXT="so"
case $host in
*-apple-darwin*)
Added: lib/openlibraries/m4/fast_math.m4
===================================================================
--- lib/openlibraries/m4/fast_math.m4 (rev 0)
+++ lib/openlibraries/m4/fast_math.m4 2007-04-22 15:47:45 UTC (rev 93)
@@ -0,0 +1,24 @@
+
+#
+# Enable/Disable fast math support.
+#
+
+AC_DEFUN([AC_CHECK_FAST_MATH],[
+ AC_ARG_ENABLE(fastmath, AC_HELP_STRING([--enable-fastmath], [disable fast math support]),
+ [enablefastmath=$enableval],
+ [enablefastmath=yes])
+
+ AC_MSG_CHECKING(for fast math support)
+ if test x$enablefastmath = "xyes" ; then
+ AC_DEFINE(HAVE_FAST_MATH,1,[Define this to enable fast math support])
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ if test x$enablefastmath = "xyes"; then
+ ifelse([$1], , :, [$1])
+ else
+ ifelse([$2], , :, [$2])
+ fi
+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-22 16:40:49
|
Revision: 94
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=94&view=rev
Author: glslang
Date: 2007-04-22 09:40:46 -0700 (Sun, 22 Apr 2007)
Log Message:
-----------
+ enable fast math by default
Modified Paths:
--------------
lib/openlibraries/src/openpluginlib/pl/fast_math.cpp
lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
Property Changed:
----------------
lib/openlibraries/m4/fast_math.m4
Property changes on: lib/openlibraries/m4/fast_math.m4
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: lib/openlibraries/src/openpluginlib/pl/fast_math.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/fast_math.cpp 2007-04-22 15:47:45 UTC (rev 93)
+++ lib/openlibraries/src/openpluginlib/pl/fast_math.cpp 2007-04-22 16:40:46 UTC (rev 94)
@@ -5,6 +5,14 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
+#ifdef HAVE_CONFIG_H
+#include <openlibraries_global_config.hpp>
+#endif
+
+#ifndef HAVE_FAST_MATH
+#include <cmath>
+#endif
+
#include <openpluginlib/pl/fast_math.hpp>
namespace olib { namespace openpluginlib {
@@ -15,9 +23,13 @@
int fast_floorf( float x )
{
+#if defined( HAVE_FAST_MATH ) && !defined( __ppc )
double y = ( x + 68719476736.0 * 1.5 );
-
+
return ( int ) ( ( *( ( long long* ) &y ) ) >> 16 );
+#else
+ return ( int ) std::floorf( x );
+#endif
}
float fast_log2f( float v )
@@ -25,18 +37,18 @@
float x = ( float ) *( int* ) &v;
x *= one_over_two_to_pow_23;
x = x - 127.0f;
-
+
float y = x - fast_floorf( x );
y = ( y - y * y ) * 0.346607f;
-
+
return x + y;
}
-
+
float fast_exp2f( float v )
{
float y = v - fast_floorf( v );
y = ( y - y * y ) * 0.33971f;
-
+
float x = v + 127.0f - y;
x *= two_to_pow_23;
*( int* ) &x = ( int ) x;
@@ -46,7 +58,11 @@
float fast_powf( float x, float y )
{
+#if defined( HAVE_FAST_MATH )
return fast_exp2f( y * fast_log2f( x ) );
+#else
+ return std::powf( x, y );
+#endif
}
} }
Modified: lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-22 15:47:45 UTC (rev 93)
+++ lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-22 16:40:46 UTC (rev 94)
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1";"C:\Program Files\NVIDIA Corporation\Cg\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM;HAVE_FAST_MATH"
MinimalRebuild="true"
ExceptionHandling="2"
BasicRuntimeChecks="3"
@@ -128,7 +128,7 @@
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1";"C:\Program Files\NVIDIA Corporation\Cg\include""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM;HAVE_FAST_MATH"
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -373,11 +373,11 @@
>
</File>
<File
- RelativePath=".\pcos\property.hpp"
+ RelativePath=".\property.hpp"
>
</File>
<File
- RelativePath=".\property.hpp"
+ RelativePath=".\pcos\property.hpp"
>
</File>
<File
Modified: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
===================================================================
--- lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj 2007-04-22 15:47:45 UTC (rev 93)
+++ lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj 2007-04-22 16:40:46 UTC (rev 94)
@@ -202,10 +202,6 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
- <File
- RelativePath=".\VTune\tm_bench.vpj"
- >
- </File>
</Files>
<Globals>
</Globals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-22 20:57:10
|
Revision: 100
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=100&view=rev
Author: glslang
Date: 2007-04-22 13:57:05 -0700 (Sun, 22 Apr 2007)
Log Message:
-----------
+ cleanups
+ rescaler benchmark
+ example of how to init and uninit pl without a crash at exit
Modified Paths:
--------------
lib/openlibraries/openlibraries_vc8.sln
lib/openlibraries/src/openimagelib/il/utility.cpp
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
Added Paths:
-----------
lib/openlibraries/test/openeffectslib/rescaler_bench/
lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench.cpp
lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
Modified: lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- lib/openlibraries/openlibraries_vc8.sln 2007-04-22 17:05:12 UTC (rev 99)
+++ lib/openlibraries/openlibraries_vc8.sln 2007-04-22 20:57:05 UTC (rev 100)
@@ -103,80 +103,80 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3D_lightmap", "src\openimagelib\plugins\3D_lightmap\3D_lightmap_vc8.vcproj", "{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmp", "src\openimagelib\plugins\bmp\bmp_vc8.vcproj", "{261595DD-FB76-4D37-A3C8-0D9625C20D46}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dds", "src\openimagelib\plugins\dds\dds_vc8.vcproj", "{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dpx", "src\openimagelib\plugins\dpx\dpx_vc8.vcproj", "{875CE227-A98F-4711-9496-61BC21DA88B8}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exr", "src\openimagelib\plugins\exr\exr_vc8.vcproj", "{17CBC457-3279-40F9-A614-A69046132424}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi+", "src\openimagelib\plugins\gdi+\gdi+_vc8.vcproj", "{08D0F0FA-947B-4AAF-90A8-7FBFC5EBD51B}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdr", "src\openimagelib\plugins\hdr\hdr_vc8.vcproj", "{972FF7FA-BDBE-400E-BDF6-59C13A6AE74D}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "src\openimagelib\plugins\png\png_vc8.vcproj", "{4A6B0F4F-676E-4A96-A990-62464D923ED2}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "psd", "src\openimagelib\plugins\psd\psd_vc8.vcproj", "{FF23E252-5FD9-4642-9563-1111B12D8EE7}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qim", "src\openimagelib\plugins\qim\qim_vc8.vcproj", "{A2C21D3B-0948-4724-8028-C3824213912A}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.vcproj", "{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sgi", "src\openimagelib\plugins\sgi\sgi_vc8.vcproj", "{291BFF23-61D3-4355-8AA5-C8BF0FE30CB0}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tga", "src\openimagelib\plugins\tga\tga_vc8.vcproj", "{227A0088-F3AE-4CA7-941C-0283D44F1678}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ML", "ML", "{F76943CD-19F1-469A-B725-38C44C2DD27F}"
@@ -185,8 +185,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml", "src\openmedialib\ml\ml_vc8.vcproj", "{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "py", "src\openmedialib\py\py_vc8.vcproj", "{1C648B54-C3DC-49B5-AFC9-B205F3151F81}"
@@ -196,80 +196,80 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avformat", "src\openmedialib\plugins\avformat\avformat_vc8.vcproj", "{0C4F7499-83C6-4143-A392-56F299345E8A}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.vcproj", "{88BCD57E-044F-4427-A407-541BA8A938E6}"
+ ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.vcproj", "{88BCD57E-044F-4427-A407-541BA8A938E6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "src\openmedialib\plugins\glew\glew_vc8.vcproj", "{649D053D-1768-40BB-8FA7-8CD91A765F32}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "src\openmedialib\plugins\glew\glew_vc8.vcproj", "{649D053D-1768-40BB-8FA7-8CD91A765F32}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.vcproj", "{A60E2710-2DA9-4641-AEF6-6488A6264723}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.vcproj", "{A60E2710-2DA9-4641-AEF6-6488A6264723}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oil", "src\openmedialib\plugins\oil\oil_vc8.vcproj", "{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oil", "src\openmedialib\plugins\oil\oil_vc8.vcproj", "{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "template", "src\openmedialib\plugins\template\template_vc8.vcproj", "{18271104-A6E4-4293-A6F1-70B15AE311E5}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "template", "src\openmedialib\plugins\template\template_vc8.vcproj", "{18271104-A6E4-4293-A6F1-70B15AE311E5}"
- ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SG", "SG", "{BD86F550-C573-4A68-955B-6CEDCC8F595D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{9483FC7B-E396-43E6-84ED-EB021AC54252}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sg", "src\openobjectlib\sg\sg_vc8.vcproj", "{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "src\openobjectlib\plugins\obj\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "X3D", "src\openobjectlib\plugins\X3D\X3D_vc8.vcproj", "{7A98C731-F651-4427-BD02-25133DEA7171}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AL", "AL", "{D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}"
@@ -278,10 +278,10 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "al", "src\openassetlib\al\al_vc8.vcproj", "{BD346E41-BEBD-43E7-9801-8EC1158355C4}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "py", "src\openassetlib\py\py_vc8.vcproj", "{ECEDB34E-A863-420F-BFC6-F294AC078892}"
@@ -291,94 +291,94 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "src\openassetlib\plugins\sqlite\sqlite_vc8.vcproj", "{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{BD346E41-BEBD-43E7-9801-8EC1158355C4} = {BD346E41-BEBD-43E7-9801-8EC1158355C4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{C2EBF114-BFF6-4520-BC11-EB54565B92D6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D", "test\openimagelib\GL\_2D\_2D_vc8.vcproj", "{24D622CC-4577-49B0-9224-8BB191236A61}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_compressed", "test\openimagelib\GL\_2D_compressed\_2D_compressed_vc8.vcproj", "{F0557FAB-2BC7-4991-9AD8-560526321D80}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_compressed_cubemap", "test\openimagelib\GL\_2D_compressed_cubemap\_2D_compressed_cubemap_vc8.vcproj", "{23B3623B-4FED-49F3-8F16-4883E57588E6}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_crop", "test\openimagelib\GL\_2D_crop\_2D_crop_vc8.vcproj", "{19B62156-49C4-4D43-A0E6-2D45952CC2CC}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_crop2", "test\openimagelib\GL\_2D_crop2\_2D_crop2_vc8.vcproj", "{AA3C0ACD-1251-484F-80D6-E9B8FF249B9E}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_exr", "test\openimagelib\GL\_2D_exr\_2D_exr_vc8.vcproj", "{4CC2C554-1EB4-4E53-A73F-38F0A1862F49}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_sgi", "test\openimagelib\GL\_2D_sgi\_2D_sgi_vc8.vcproj", "{F30DAA25-794E-44F6-BF01-867A72BE385B}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_3D_lightmap", "test\openimagelib\GL\_3D_lightmap\_3D_lightmap_vc8.vcproj", "{DBF9F309-3C1F-4563-AA2B-69FA27C2CBF7}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "player", "test\openmedialib\player\player_vc8.vcproj", "{14B49ECE-F5DB-4985-A31D-C48483362F9F}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "store", "test\openmedialib\store\store_vc8.vcproj", "{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multipass_draw", "test\openobjectlib\GL\multipass_draw\multipass_draw_vc8.vcproj", "{AB0137D5-38BE-45A5-ACE9-02BB34D02358}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noise_volume", "test\openobjectlib\GL\noise_volume\noise_volume_vc8.vcproj", "{3780D440-9C37-4186-B9B2-861EF3833CD4}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_draw", "test\openobjectlib\GL\obj_draw\obj_draw_vc8.vcproj", "{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texture_draw", "test\openobjectlib\GL\texture_draw\texture_draw_vc8.vcproj", "{8032E526-0866-4764-A4E9-F18C7CEE12D2}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{B972DCEB-386E-42D2-8C5E-DD2942EC7F63}"
@@ -387,15 +387,15 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tonemap", "src\openeffectslib\plugins\tonemap\tonemap_vc8.vcproj", "{6D618CAE-230F-4ADD-936B-6C1D3D723236}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tm_bench", "test\openeffectslib\tm_bench\tm_bench_vc8.vcproj", "{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff", "src\openimagelib\plugins\tiff\tiff_vc8.vcproj", "{A1308789-3ABD-438C-BA08-FB341B55D94C}"
@@ -403,6 +403,13 @@
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rescaler_bench", "test\openeffectslib\rescaler_bench\rescaler_bench_vc8.vcproj", "{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -649,6 +656,10 @@
{A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -690,6 +701,7 @@
{9483FC7B-E396-43E6-84ED-EB021AC54252} = {FE28E322-51C9-4979-9A0A-93055023A503}
{C85EDDFB-1A91-4ABD-8E86-6AFDF0C85CBA} = {67E6C3A2-E542-4D5D-A4A4-61DF5CD73711}
{534B6931-67CB-4ACA-BD58-6887F35AC4D9} = {C2D61212-6194-4B66-837B-E8A2FA29AB0E}
+ {B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91} = {C2D61212-6194-4B66-837B-E8A2FA29AB0E}
{14B49ECE-F5DB-4985-A31D-C48483362F9F} = {135B4433-9BD9-42C8-A552-61CA0CBA6CDC}
{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF} = {135B4433-9BD9-42C8-A552-61CA0CBA6CDC}
{B972DCEB-386E-42D2-8C5E-DD2942EC7F63} = {BEF92EC2-7872-48E2-BF6F-3DE4EBA9C037}
Modified: lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/utility.cpp 2007-04-22 17:05:12 UTC (rev 99)
+++ lib/openlibraries/src/openimagelib/il/utility.cpp 2007-04-22 20:57:05 UTC (rev 100)
@@ -1878,11 +1878,6 @@
{
while( width-- )
{
-/*
- *( dst + 2 ) = static_cast<unsigned char>( *src++ );
- *( dst + 1 ) = static_cast<unsigned char>( *src++ );
- *( dst + 0 ) = static_cast<unsigned char>( *src++ );
-*/
*( dst + 2 ) = static_cast<unsigned char>( opl::fast_floorf( *src++ ) );
*( dst + 1 ) = static_cast<unsigned char>( opl::fast_floorf( *src++ ) );
*( dst + 0 ) = static_cast<unsigned char>( opl::fast_floorf( *src++ ) );
Added: lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench.cpp
===================================================================
--- lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench.cpp (rev 0)
+++ lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench.cpp 2007-04-22 20:57:05 UTC (rev 100)
@@ -0,0 +1,44 @@
+
+// el - A effects library representation.
+
+// Copyright (C) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.openlibraries.org.
+
+#include <iostream>
+
+#include <openpluginlib/pl/openpluginlib.hpp>
+#include <openpluginlib/pl/timer.hpp>
+#include <openimagelib/il/il.hpp>
+#include <openmedialib/ml/ml.hpp>
+
+namespace ml = olib::openmedialib::ml;
+namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
+
+void run( char* argv )
+{
+ ml::input_type_ptr input = ml::create_input( pl::string( argv ) + pl::string( "/sequence:" ) );
+ ml::frame_type_ptr frame = input->fetch( );
+
+ pl::rdtsc_default_timer r;
+
+ r.reset( );
+ r.start( );
+
+ for( int i = 0; i < 1000; ++i )
+ il::rescale( frame->get_image( ), 100, 100, 1, il::BICUBIC_SAMPLING );
+
+ r.stop( );
+ pl::rdtsc_default_timer::value_type elapsed = r.elapsed( );
+ std::cout << "rdtsc: elapsed time is " << elapsed.tv_sec << " seconds and " << elapsed.tv_usec << " microseconds.\n";
+}
+
+int main( int argc, char* argv[ ] )
+{
+ pl::init( "" );
+
+ run( argv[ 1 ] );
+
+ pl::uninit( );
+}
Property changes on: lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
===================================================================
--- lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj (rev 0)
+++ lib/openlibraries/test/...
[truncated message content] |
|
From: <gl...@us...> - 2007-04-22 22:25:20
|
Revision: 101
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=101&view=rev
Author: glslang
Date: 2007-04-22 15:25:15 -0700 (Sun, 22 Apr 2007)
Log Message:
-----------
+ initial jpg hdr implementation
Modified Paths:
--------------
lib/openlibraries/openlibraries_vc8.sln
lib/openlibraries/src/openimagelib/plugins/jpg/config.hpp
lib/openlibraries/src/openimagelib/plugins/jpg/jpg.cpp
lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.hpp
lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
Removed Paths:
-------------
lib/openlibraries/src/openimagelib/plugins/jpg/jpg_iw.vcproj
Modified: lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- lib/openlibraries/openlibraries_vc8.sln 2007-04-22 20:57:05 UTC (rev 100)
+++ lib/openlibraries/openlibraries_vc8.sln 2007-04-22 22:25:15 UTC (rev 101)
@@ -103,80 +103,80 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3D_lightmap", "src\openimagelib\plugins\3D_lightmap\3D_lightmap_vc8.vcproj", "{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmp", "src\openimagelib\plugins\bmp\bmp_vc8.vcproj", "{261595DD-FB76-4D37-A3C8-0D9625C20D46}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dds", "src\openimagelib\plugins\dds\dds_vc8.vcproj", "{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dpx", "src\openimagelib\plugins\dpx\dpx_vc8.vcproj", "{875CE227-A98F-4711-9496-61BC21DA88B8}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exr", "src\openimagelib\plugins\exr\exr_vc8.vcproj", "{17CBC457-3279-40F9-A614-A69046132424}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi+", "src\openimagelib\plugins\gdi+\gdi+_vc8.vcproj", "{08D0F0FA-947B-4AAF-90A8-7FBFC5EBD51B}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdr", "src\openimagelib\plugins\hdr\hdr_vc8.vcproj", "{972FF7FA-BDBE-400E-BDF6-59C13A6AE74D}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "src\openimagelib\plugins\png\png_vc8.vcproj", "{4A6B0F4F-676E-4A96-A990-62464D923ED2}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "psd", "src\openimagelib\plugins\psd\psd_vc8.vcproj", "{FF23E252-5FD9-4642-9563-1111B12D8EE7}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qim", "src\openimagelib\plugins\qim\qim_vc8.vcproj", "{A2C21D3B-0948-4724-8028-C3824213912A}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.vcproj", "{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sgi", "src\openimagelib\plugins\sgi\sgi_vc8.vcproj", "{291BFF23-61D3-4355-8AA5-C8BF0FE30CB0}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tga", "src\openimagelib\plugins\tga\tga_vc8.vcproj", "{227A0088-F3AE-4CA7-941C-0283D44F1678}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ML", "ML", "{F76943CD-19F1-469A-B725-38C44C2DD27F}"
@@ -185,8 +185,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml", "src\openmedialib\ml\ml_vc8.vcproj", "{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "py", "src\openmedialib\py\py_vc8.vcproj", "{1C648B54-C3DC-49B5-AFC9-B205F3151F81}"
@@ -196,80 +196,80 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avformat", "src\openmedialib\plugins\avformat\avformat_vc8.vcproj", "{0C4F7499-83C6-4143-A392-56F299345E8A}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.vcproj", "{88BCD57E-044F-4427-A407-541BA8A938E6}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.vcproj", "{88BCD57E-044F-4427-A407-541BA8A938E6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "src\openmedialib\plugins\glew\glew_vc8.vcproj", "{649D053D-1768-40BB-8FA7-8CD91A765F32}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "src\openmedialib\plugins\glew\glew_vc8.vcproj", "{649D053D-1768-40BB-8FA7-8CD91A765F32}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.vcproj", "{A60E2710-2DA9-4641-AEF6-6488A6264723}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.vcproj", "{A60E2710-2DA9-4641-AEF6-6488A6264723}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oil", "src\openmedialib\plugins\oil\oil_vc8.vcproj", "{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oil", "src\openmedialib\plugins\oil\oil_vc8.vcproj", "{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "template", "src\openmedialib\plugins\template\template_vc8.vcproj", "{18271104-A6E4-4293-A6F1-70B15AE311E5}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "template", "src\openmedialib\plugins\template\template_vc8.vcproj", "{18271104-A6E4-4293-A6F1-70B15AE311E5}"
- ProjectSection(ProjectDependencies) = postProject
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SG", "SG", "{BD86F550-C573-4A68-955B-6CEDCC8F595D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{9483FC7B-E396-43E6-84ED-EB021AC54252}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sg", "src\openobjectlib\sg\sg_vc8.vcproj", "{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "src\openobjectlib\plugins\obj\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "X3D", "src\openobjectlib\plugins\X3D\X3D_vc8.vcproj", "{7A98C731-F651-4427-BD02-25133DEA7171}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AL", "AL", "{D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}"
@@ -278,10 +278,10 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "al", "src\openassetlib\al\al_vc8.vcproj", "{BD346E41-BEBD-43E7-9801-8EC1158355C4}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "py", "src\openassetlib\py\py_vc8.vcproj", "{ECEDB34E-A863-420F-BFC6-F294AC078892}"
@@ -291,94 +291,94 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "src\openassetlib\plugins\sqlite\sqlite_vc8.vcproj", "{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}"
ProjectSection(ProjectDependencies) = postProject
+ {BD346E41-BEBD-43E7-9801-8EC1158355C4} = {BD346E41-BEBD-43E7-9801-8EC1158355C4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {BD346E41-BEBD-43E7-9801-8EC1158355C4} = {BD346E41-BEBD-43E7-9801-8EC1158355C4}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{C2EBF114-BFF6-4520-BC11-EB54565B92D6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D", "test\openimagelib\GL\_2D\_2D_vc8.vcproj", "{24D622CC-4577-49B0-9224-8BB191236A61}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_compressed", "test\openimagelib\GL\_2D_compressed\_2D_compressed_vc8.vcproj", "{F0557FAB-2BC7-4991-9AD8-560526321D80}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_compressed_cubemap", "test\openimagelib\GL\_2D_compressed_cubemap\_2D_compressed_cubemap_vc8.vcproj", "{23B3623B-4FED-49F3-8F16-4883E57588E6}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_crop", "test\openimagelib\GL\_2D_crop\_2D_crop_vc8.vcproj", "{19B62156-49C4-4D43-A0E6-2D45952CC2CC}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_crop2", "test\openimagelib\GL\_2D_crop2\_2D_crop2_vc8.vcproj", "{AA3C0ACD-1251-484F-80D6-E9B8FF249B9E}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_exr", "test\openimagelib\GL\_2D_exr\_2D_exr_vc8.vcproj", "{4CC2C554-1EB4-4E53-A73F-38F0A1862F49}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D_sgi", "test\openimagelib\GL\_2D_sgi\_2D_sgi_vc8.vcproj", "{F30DAA25-794E-44F6-BF01-867A72BE385B}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_3D_lightmap", "test\openimagelib\GL\_3D_lightmap\_3D_lightmap_vc8.vcproj", "{DBF9F309-3C1F-4563-AA2B-69FA27C2CBF7}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "player", "test\openmedialib\player\player_vc8.vcproj", "{14B49ECE-F5DB-4985-A31D-C48483362F9F}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "store", "test\openmedialib\store\store_vc8.vcproj", "{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multipass_draw", "test\openobjectlib\GL\multipass_draw\multipass_draw_vc8.vcproj", "{AB0137D5-38BE-45A5-ACE9-02BB34D02358}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noise_volume", "test\openobjectlib\GL\noise_volume\noise_volume_vc8.vcproj", "{3780D440-9C37-4186-B9B2-861EF3833CD4}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_draw", "test\openobjectlib\GL\obj_draw\obj_draw_vc8.vcproj", "{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texture_draw", "test\openobjectlib\GL\texture_draw\texture_draw_vc8.vcproj", "{8032E526-0866-4764-A4E9-F18C7CEE12D2}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{B972DCEB-386E-42D2-8C5E-DD2942EC7F63}"
@@ -387,15 +387,15 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tonemap", "src\openeffectslib\plugins\tonemap\tonemap_vc8.vcproj", "{6D618CAE-230F-4ADD-936B-6C1D3D723236}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tm_bench", "test\openeffectslib\tm_bench\tm_bench_vc8.vcproj", "{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff", "src\openimagelib\plugins\tiff\tiff_vc8.vcproj", "{A1308789-3ABD-438C-BA08-FB341B55D94C}"
@@ -405,9 +405,15 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rescaler_bench", "test\openeffectslib\rescaler_bench\rescaler_bench_vc8.vcproj", "{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpg", "src\openimagelib\plugins\jpg\jpg_vc8.vcproj", "{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
Global
@@ -660,6 +666,10 @@
{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -721,6 +731,7 @@
{291BFF23-61D3-4355-8AA5-C8BF0FE30CB0} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{227A0088-F3AE-4CA7-941C-0283D44F1678} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{A1308789-3ABD-438C-BA08-FB341B55D94C} = {D9066C6C-E143-472F-860E-004E481F3E0A}
+ {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
{1C648B54-C3DC-49B5-AFC9-B205F3151F81} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
{0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
Modified: lib/openlibraries/src/openimagelib/plugins/jpg/config.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/jpg/config.hpp 2007-04-22 20:57:05 UTC (rev 100)
+++ lib/openlibraries/src/openimagelib/plugins/jpg/config.hpp 2007-04-22 22:25:15 UTC (rev 101)
@@ -1,7 +1,7 @@
// JPG - An JPG plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005-2007 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/jpg/jpg.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/jpg/jpg.cpp 2007-04-22 20:57:05 UTC (rev 100)
+++ lib/openlibraries/src/openimagelib/plugins/jpg/jpg.cpp 2007-04-22 22:25:15 UTC (rev 101)
@@ -1,100 +1,24 @@
// JPG - An JPG plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005-2007 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
-#ifdef WIN32
-#include <windows.h>
-#include <gdiplus.h>
-#endif // WIN32
-
-#include <boost/thread/recursive_mutex.hpp>
-
#include <openimagelib/plugins/jpg/jpg_plugin.hpp>
namespace opl = olib::openpluginlib;
namespace JPG = olib::openimagelib::plugins::JPG;
-namespace
-{
- void reflib( int init )
- {
- static long refs = 0;
-#ifdef WIN32
- static ULONG_PTR gdiplusToken;
-#endif // WIN32
-
- assert( refs >= 0 && L"JPG_plugin::refinit: refs is negative." );
-
- if( init > 0 && ++refs )
- {
-# ifdef WIN32
- Gdiplus::GdiplusStartupInput gdiplusStartupInput;
-
- Gdiplus::GdiplusStartup( &gdiplusToken, &gdiplusStartupInput, NULL );
-# endif
- }
- else if( init < 0 && --refs == 0 )
- {
-# ifdef WIN32
- Gdiplus::GdiplusShutdown( gdiplusToken );
-# endif
- }
- }
-
-#ifdef WIN32
- ULONG_PTR gdiplusToken;
-
- bool has_jpg_decoder_installed( void )
- {
- UINT num, size;
- Gdiplus::GetImageDecodersSize( &num, &size );
-
- Gdiplus::ImageCodecInfo* decoders = ( Gdiplus::ImageCodecInfo* ) malloc( size );
- Gdiplus::GetImageDecoders( num, size, decoders );
-
- bool found = false;
- for( UINT i = 0; i < num; ++i )
- {
- if( !wcscmp( decoders[ i ].MimeType, L"image/jpeg" ) )
- {
- found = true;
-
- break;
- }
- }
-
- free( decoders );
-
- return found;
- }
-#endif
-}
-
extern "C"
{
JPG_DECLSPEC bool openplugin_init( void )
{
- boost::recursive_mutex mutex;
-
- reflib( 1 );
-
-#...
[truncated message content] |
|
From: <gl...@us...> - 2007-04-24 22:00:21
|
Revision: 103
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=103&view=rev
Author: glslang
Date: 2007-04-24 15:00:03 -0700 (Tue, 24 Apr 2007)
Log Message:
-----------
+ bug fixes
Modified Paths:
--------------
lib/openlibraries/installer/openlibraries_runtime.nsi
lib/openlibraries/installer/openlibraries_sdk.nsi
lib/openlibraries/src/openimagelib/il/utility.cpp
lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
Modified: lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================
--- lib/openlibraries/installer/openlibraries_runtime.nsi 2007-04-23 23:07:38 UTC (rev 102)
+++ lib/openlibraries/installer/openlibraries_runtime.nsi 2007-04-24 22:00:03 UTC (rev 103)
@@ -122,6 +122,8 @@
File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_0.dll"
File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
+ File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-0_4_0.dll"
File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_0.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
Modified: lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- lib/openlibraries/installer/openlibraries_sdk.nsi 2007-04-23 23:07:38 UTC (rev 102)
+++ lib/openlibraries/installer/openlibraries_sdk.nsi 2007-04-24 22:00:03 UTC (rev 103)
@@ -235,6 +235,8 @@
File "..\src\openimagelib\plugins\gdi+\Multi-threaded Debug DLL\openimagelib_gdi-vc80-d-0_4_0.dll"
File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
File "..\src\openimagelib\plugins\hdr\Multi-threaded Debug DLL\openimagelib_hdr-vc80-d-0_4_0.dll"
+ File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
+ File "..\src\openimagelib\plugins\jpg\Multi-threaded Debug DLL\openimagelib_jpg-vc80-d-0_4_0.dll"
File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-0_4_0.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
@@ -281,6 +283,8 @@
File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_0.dll"
File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
+ File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-0_4_0.dll"
File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_0.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
Modified: lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/utility.cpp 2007-04-23 23:07:38 UTC (rev 102)
+++ lib/openlibraries/src/openimagelib/il/utility.cpp 2007-04-24 22:00:03 UTC (rev 103)
@@ -925,12 +925,15 @@
unsigned char u, v;
+ // TODO: Fix the chroma subsampling logic here
while( height > 1 )
{
if ( a == -1 )
{
while( width > 1 )
{
+ //u = ( *src2 + *( src2 + chroma_pitch ) ) >> 1;
+ //v = ( *src3 + *( src3 + chroma_pitch ) ) >> 1;
u = ( *src2 );
v = ( *src3 );
@@ -949,8 +952,10 @@
if ( width )
{
- u = ( *src2 + *( src2 + chroma_pitch ) ) >> 1;
- v = ( *src3 + *( src3 + chroma_pitch ) ) >> 1;
+ //u = ( *src2 + *( src2 + chroma_pitch ) ) >> 1;
+ //v = ( *src3 + *( src3 + chroma_pitch ) ) >> 1;
+ u = ( *src2 );
+ v = ( *src3 );
yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *src0 ++, *src2 ++, *src3 ++ );
assign3( dst0, rgb[ r ], rgb[ g ], rgb[ b ] );
yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *src1 ++, u, v );
@@ -961,8 +966,10 @@
{
while( width > 1 )
{
- u = ( *src2 + *( src2 + chroma_pitch ) ) >> 1;
- v = ( *src3 + *( src3 + chroma_pitch ) ) >> 1;
+ //u = ( *src2 + *( src2 + chroma_pitch ) ) >> 1;
+ //v = ( *src3 + *( src3 + chroma_pitch ) ) >> 1;
+ u = ( *src2 );
+ v = ( *src3 );
yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *src0 ++, *src2, *src3 );
assign4( dst0, rgb[ r ], rgb[ g ], rgb[ b ], rgb[ a ] );
@@ -979,8 +986,10 @@
if ( width )
{
- u = ( *src2 + *( src2 + chroma_pitch ) ) >> 1;
- v = ( *src3 + *( src3 + chroma_pitch ) ) >> 1;
+ //u = ( *src2 + *( src2 + chroma_pitch ) ) >> 1;
+ //v = ( *src3 + *( src3 + chroma_pitch ) ) >> 1;
+ u = ( *src2 );
+ v = ( *src3 );
yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *src0 ++, *src2 ++, *src3 ++ );
assign4( dst0, rgb[ r ], rgb[ g ], rgb[ b ], rgb[ a ] );
yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *src1 ++, u, v );
@@ -1996,7 +2005,7 @@
size_type orig_width = width / 2;
- while( height -- )
+ while( height )
{
width = orig_width;
dst = dptr;
@@ -2026,6 +2035,8 @@
sptr[ 1 ] += src_pitch[ 1 ];
sptr[ 2 ] += src_pitch[ 2 ];
}
+
+ height --;
}
}
Modified: lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-04-23 23:07:38 UTC (rev 102)
+++ lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-04-24 22:00:03 UTC (rev 103)
@@ -57,8 +57,6 @@
pixels += pitch;
}
- ( *info->mem->free_pool )( ( j_common_ptr ) info, JPOOL_IMAGE );
-
jpeg_finish_decompress( info );
jpeg_destroy_decompress( info );
}
@@ -131,7 +129,11 @@
#endif
#ifdef HAVE_JPEGHDR
- il::image_type_ptr image = il::allocate( L"r32g32b32f", info.cinfo.output_width, info.cinfo.output_height );
+ il::image_type_ptr image;
+ if( jpeghdr_decompress_ishdr( &info ) )
+ image = il::allocate( L"r32g32b32f", info.cinfo.output_width, info.cinfo.output_height );
+ else
+ image = il::allocate( L"r8g8b8", info.cinfo.output_width, info.cinfo.output_height );
#else
il::image_type_ptr image = il::allocate( L"r8g8b8", info.output_width, info.output_height );
#endif
@@ -155,10 +157,9 @@
bool store_jpg( const boost::filesystem::path& path, il::image_type_ptr img )
{
- int i;
struct jpeg_compress_struct cinfo;
struct jpeg_error_mgr jerr;
- unsigned char *line;
+
FILE *out = Fopen_s( path.native_directory_string( ), "wb" );
il::image_type_ptr image = il::convert( img, L"r8g8b8" );
@@ -166,7 +167,7 @@
if ( out != NULL )
{
- line = image->data( );
+ il::image_type::pointer line = image->data( );
cinfo.err = jpeg_std_error( &jerr );
jpeg_create_compress( &cinfo );
jpeg_stdio_dest( &cinfo, out );
@@ -178,7 +179,7 @@
jpeg_set_defaults( &cinfo );
jpeg_set_quality( &cinfo, 50, TRUE );
jpeg_start_compress( &cinfo, TRUE );
- for ( i = 0 ; i < image->height( ); i ++, line += image->pitch( ) )
+ for ( int i = 0 ; i < image->height( ); i ++, line += image->pitch( ) )
jpeg_write_scanlines( &cinfo, &line, 1 );
jpeg_finish_compress( &cinfo );
fclose( out );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-24 22:56:53
|
Revision: 104
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=104&view=rev
Author: glslang
Date: 2007-04-24 15:56:51 -0700 (Tue, 24 Apr 2007)
Log Message:
-----------
+ conformant copyright changes
Modified Paths:
--------------
lib/openlibraries/src/openassetlib/al/al_plugin.cpp
lib/openlibraries/src/openassetlib/al/guid.cpp
lib/openlibraries/src/openassetlib/py/asset.cpp
lib/openlibraries/src/openassetlib/py/guid.cpp
lib/openlibraries/src/openassetlib/py/openassetlib.cpp
lib/openlibraries/src/openassetlib/py/plugin.cpp
lib/openlibraries/src/openassetlib/py/py.cpp
lib/openlibraries/src/openassetlib/py/py.hpp
lib/openlibraries/src/openassetlib/py/python.hpp
lib/openlibraries/src/openassetlib/py/set.cpp
lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp
lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp
lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp
lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp
lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp
lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp
lib/openlibraries/src/openobjectlib/plugins/X3D/config.hpp
lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp
lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp
lib/openlibraries/test/openmedialib/store/store.cpp
Modified: lib/openlibraries/src/openassetlib/al/al_plugin.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/al/al_plugin.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/al/al_plugin.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// al_plugin.cpp - Interface to an openassetlib plugin.
//
-// Copyright (C) 2006 Visual Media FX Ltd.
+// Copyright (C) 2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/al/guid.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/al/guid.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/al/guid.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// guid.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/asset.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/asset.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/asset.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// asset.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/guid.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/guid.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/guid.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// asset.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/openassetlib.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/openassetlib.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/openassetlib.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// openassetlib.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/plugin.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/plugin.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/plugin.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// plugin.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/py.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/py.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/py.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// py.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/py.hpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/py.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/py.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// py.hpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/python.hpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/python.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/python.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// python.hpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/set.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/set.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/set.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// set.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// BMP - An BMP plugin to il.
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// BMP - A BMP plugin to il.
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// BMP - A BMP plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// BMP - An BMP plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// TIFF - A TIFF plugin to il.
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// TIFF - A TIFF plugin to il.
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// TIFF - A TIFF plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
@@ -48,46 +48,31 @@
int width, height, depth;
TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &width );
-
TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &height );
-
if( !TIFFGetField( tif, TIFFTAG_IMAGEDEPTH, &depth ) ) depth = 1;
unsigned short config;
-
TIFFGetField( tif, TIFFTAG_PLANARCONFIG, &config );
if( config != PLANARCONFIG_CONTIG )
{
-
TIFFClose( tif );
-
return il::image_type_ptr( );
-
}
-
unsigned short photo;
TIFFGetField( tif, TIFFTAG_PHOTOMETRIC, &photo );
if( config != PHOTOMETRIC_MINISBLACK && photo != PHOTOMETRIC_RGB )
{
-
TIFFClose( tif );
-
return il::image_type_ptr( );
-
}
-
unsigned short bpp, components;
-
TIFFGetField( tif, TIFFTAG_BITSPERSAMPLE, &bpp );
-
TIFFGetField( tif, TIFFTAG_SAMPLESPERPIXEL, &components );
-
-
il::image_type_ptr im = tiff_image_type_to_image_type( components, width, height );
if( !im )
return il::image_type_ptr( );
@@ -100,15 +85,12 @@
int tile_width, tile_height, tile_depth;
TIFFGetField( tif, TIFFTAG_TILEWIDTH, &tile_width );
-
TIFFGetField( tif, TIFFTAG_TILELENGTH, &tile_height );
if( !TIFFGetField( tif, TIFFTAG_TILEDEPTH, &tile_depth ) )
-
tile_depth = 1;
std::vector<unsigned char> buf( TIFFTileSize( tif ) );
-
for( int k = 0; k < depth; k += tile_depth )
{
for( int j = 0; j < height; j += tile_height )
@@ -126,9 +108,7 @@
}
}
}
-
}
-
else
{
unsigned int rows;
@@ -138,7 +118,6 @@
for( int i = 0; i < height * depth; i += rows )
{
tstrip_t strip = TIFFComputeStrip( tif, i, 0 );
-
TIFFReadEncodedStrip( tif, strip, data + i * im->pitch( ), strip_size );
}
}
Modified: lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// TIFF - A TIFF plugin to il.
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openobjectlib/plugins/X3D/config.hpp
===================================================================
--- lib/openlibraries/src/openobjectlib/plugins/X3D/config.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openobjectlib/plugins/X3D/config.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// X3D - An X3D plugin to sg.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// openpluginlib - A plugin interface to openlibraries.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-24 22:56:51 UTC (rev 104)
@@ -293,10 +293,6 @@
>
</File>
<File
- RelativePath=".\content_handler_libxml.hpp"
- >
- </File>
- <File
RelativePath=".\content_handler_msxml.hpp"
>
</File>
@@ -373,11 +369,11 @@
>
</File>
<File
- RelativePath=".\property.hpp"
+ RelativePath=".\pcos\property.hpp"
>
</File>
<File
- RelativePath=".\pcos\property.hpp"
+ RelativePath=".\property.hpp"
>
</File>
<File
Modified: lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp
===================================================================
--- lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// il - A image library representation.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/test/openmedialib/store/store.cpp
===================================================================
--- lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// ml - A media library representation.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-05-12 16:33:36
|
Revision: 118
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=118&view=rev
Author: glslang
Date: 2007-05-12 09:33:26 -0700 (Sat, 12 May 2007)
Log Message:
-----------
+ OFX bindings clip preferences action improvements
Modified Paths:
--------------
lib/openlibraries/installer/openlibraries_sdk.nsi
lib/openlibraries/src/openimagelib/il/Makefile.am
lib/openlibraries/src/openimagelib/il/basic_image.hpp
lib/openlibraries/src/openimagelib/il/compression_traits.hpp
lib/openlibraries/src/openimagelib/il/float_traits.hpp
lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
lib/openlibraries/src/openimagelib/il/rgb_traits.hpp
lib/openlibraries/src/openimagelib/il/traits.hpp
lib/openlibraries/src/openimagelib/il/yuv_traits.hpp
lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
Removed Paths:
-------------
lib/openlibraries/src/openimagelib/il/noise_traits.hpp
Modified: lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- lib/openlibraries/installer/openlibraries_sdk.nsi 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/installer/openlibraries_sdk.nsi 2007-05-12 16:33:26 UTC (rev 118)
@@ -126,7 +126,6 @@
File ..\src\openimagelib\il\config.hpp
File ..\src\openimagelib\il\float_traits.hpp
File ..\src\openimagelib\il\il.hpp
- File ..\src\openimagelib\il\noise_traits.hpp
File ..\src\openimagelib\il\openimagelib_plugin.hpp
File ..\src\openimagelib\il\rgb_traits.hpp
File ..\src\openimagelib\il\traits.hpp
Modified: lib/openlibraries/src/openimagelib/il/Makefile.am
===================================================================
--- lib/openlibraries/src/openimagelib/il/Makefile.am 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/src/openimagelib/il/Makefile.am 2007-05-12 16:33:26 UTC (rev 118)
@@ -14,7 +14,6 @@
float_traits.hpp \
il.hpp \
il.cpp \
- noise_traits.hpp \
openimagelib_plugin.hpp \
rgb_traits.hpp \
traits.hpp \
@@ -39,7 +38,6 @@
config.hpp \
float_traits.hpp \
il.hpp \
- noise_traits.hpp \
openimagelib_plugin.hpp \
rgb_traits.hpp \
traits.hpp \
Modified: lib/openlibraries/src/openimagelib/il/basic_image.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/basic_image.hpp 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/src/openimagelib/il/basic_image.hpp 2007-05-12 16:33:26 UTC (rev 118)
@@ -181,6 +181,7 @@
size_type depth( ) const { return depth_; }
size_type count( ) const { return count_; }
+ size_type block_size( ) const { return block_size_; }
iterator begin( ) { return planes_.begin( ); }
const_iterator begin( ) const { return planes_.begin( ); }
@@ -193,9 +194,12 @@
bool is_cubemap( ) const { return cubemap_; }
bool is_volume( ) const { return volume_; }
std::wstring pf( ) const { return pf_; }
-
+
+ virtual bool is_float( ) const { return false; }
+
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const = 0;
+ virtual size_type bitdepth( ) const = 0;
// Default method that works for most single plane images
virtual void allocplanes( planes &planes )
@@ -446,6 +450,8 @@
size_type depth( ) const { return structure_->depth( ); }
size_type count( ) const { return structure_->count( ); }
+ size_type block_size( ) const { return structure_->block_size( ); }
+ size_type bitdepth( ) const { return structure_->bitdepth( ); }
bool is_flipped( ) const { return flipped_; }
void set_flipped( bool flipped ) { flipped_ = flipped; crop_sync( ); }
@@ -468,6 +474,7 @@
public:
bool is_cubemap( ) const { return structure_->is_cubemap( ); }
bool is_volume( ) const { return structure_->is_volume( ); }
+ bool is_float( ) const { return structure_->is_float( ); }
std::wstring pf( ) const { return structure_->pf( ); }
public:
Modified: lib/openlibraries/src/openimagelib/il/compression_traits.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/compression_traits.hpp 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/src/openimagelib/il/compression_traits.hpp 2007-05-12 16:33:26 UTC (rev 118)
@@ -41,6 +41,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::dds_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual dxt1* clone( size_type w, size_type h )
{ return new dxt1( *this, w, h ); }
@@ -77,6 +80,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::dds_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual dxt3* clone( size_type w, size_type h )
{ return new dxt3( *this, w, h ); }
@@ -113,6 +119,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::dds_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual dxt5* clone( size_type w, size_type h )
{ return new dxt5( *this, w, h ); }
Modified: lib/openlibraries/src/openimagelib/il/float_traits.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/float_traits.hpp 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/src/openimagelib/il/float_traits.hpp 2007-05-12 16:33:26 UTC (rev 118)
@@ -43,6 +43,11 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
+
+ virtual bool is_float( ) const { return true; }
virtual rgbe* clone( size_type w, size_type h )
{ return new rgbe( *this, w, h ); }
@@ -78,7 +83,12 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 16; }
+ virtual bool is_float( ) const { return true; }
+
virtual r16g16b16f* clone( size_type w, size_type h )
{ return new r16g16b16f( *this, w, h ); }
};
@@ -113,7 +123,12 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 16; }
+ virtual bool is_float( ) const { return true; }
+
virtual b16g16r16f* clone( size_type w, size_type h )
{ return new b16g16r16f( *this, w, h ); }
};
@@ -148,7 +163,12 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
-
+
+ virtual size_type bitdepth( ) const
+ { return 16; }
+
+ virtual bool is_float( ) const { return true; }
+
virtual r16g16b16a16f* clone( size_type w, size_type h )
{ return new r16g16b16a16f( *this, w, h ); }
};
@@ -183,7 +203,12 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( float ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 32; }
+ virtual bool is_float( ) const { return true; }
+
virtual r32g32b32f* clone( size_type w, size_type h )
{ return new r32g32b32f( *this, w, h ); }
};
@@ -218,6 +243,11 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( float ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 32; }
+
+ virtual bool is_float( ) const { return true; }
virtual r32g32b32a32f* clone( size_type w, size_type h )
{ return new r32g32b32a32f( *this, w, h ); }
Modified: lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-05-12 16:33:26 UTC (rev 118)
@@ -239,10 +239,6 @@
>
</File>
<File
- RelativePath=".\noise_traits.hpp"
- >
- </File>
- <File
RelativePath=".\openimagelib_plugin.hpp"
>
</File>
Deleted: lib/openlibraries/src/openimagelib/il/noise_traits.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/noise_traits.hpp 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/src/openimagelib/il/noise_traits.hpp 2007-05-12 16:33:26 UTC (rev 118)
@@ -1,15 +0,0 @@
-
-// il - A image library representation.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef NOISE_TRAITS_INC_
-#define NOISE_TRAITS_INC_
-
-namespace olib { namespace openimagelib { namespace il {
-
-} } }
-
-#endif
Modified: lib/openlibraries/src/openimagelib/il/rgb_traits.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/rgb_traits.hpp 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/src/openimagelib/il/rgb_traits.hpp 2007-05-12 16:33:26 UTC (rev 118)
@@ -42,6 +42,9 @@
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+ virtual size_type bitdepth( ) const
+ { return 8; }
+
virtual b8g8r8* clone( size_type w, size_type h )
{ return new b8g8r8( *this, w, h ); }
};
@@ -77,6 +80,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual r8g8b8* clone( size_type w, size_type h )
{ return new r8g8b8( *this, w, h ); }
@@ -119,6 +125,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual r8g8b8p* clone( size_type w, size_type h )
{ return new r8g8b8p( *this, w, h ); }
@@ -182,6 +191,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual r8g8b8a8p* clone( size_type w, size_type h )
{ return new r8g8b8a8p( *this, w, h ); }
@@ -242,6 +254,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual b8g8r8a8* clone( size_type w, size_type h )
{ return new b8g8r8a8( *this, w, h ); }
@@ -278,6 +293,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual a8b8g8r8* clone( size_type w, size_type h )
{ return new a8b8g8r8( *this, w, h ); }
@@ -313,6 +331,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual r8g8b8a8* clone( size_type w, size_type h )
{ return new r8g8b8a8( *this, w, h ); }
@@ -351,6 +372,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual l8* clone( size_type w, size_type h )
{ return new l8( *this, w, h ); }
@@ -389,6 +413,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual l8a8* clone( size_type w, size_type h )
{ return new l8a8( *this, w, h ); }
@@ -430,6 +457,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual l8a8p* clone( size_type w, size_type h )
{ return new l8a8p( *this, w, h ); }
@@ -489,6 +519,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 12; }
virtual l12a12p* clone( size_type w, size_type h )
{ return new l12a12p( *this, w, h ); }
@@ -548,6 +581,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 16; }
virtual l16a16p* clone( size_type w, size_type h )
{ return new l16a16p( *this, w, h ); }
@@ -602,6 +638,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual a8r8g8b8* clone( size_type w, size_type h )
{ return new a8r8g8b8( *this, w, h ); }
@@ -644,6 +683,9 @@
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+ virtual size_type bitdepth( ) const
+ { return 10; }
+
virtual r10g10b10* clone( size_type w, size_type h )
{ return new r10g10b10( *this, w, h ); }
@@ -699,7 +741,10 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
-
+
+ virtual size_type bitdepth( ) const
+ { return 10; }
+
virtual r10g10b10a10* clone( size_type w, size_type h )
{ return new r10g10b10a10( *this, w, h ); }
@@ -756,6 +801,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 10; }
virtual r10g10b10p* clone( size_type w, size_type h )
{ return new r10g10b10p( *this, w, h ); }
@@ -819,6 +867,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 10; }
virtual r10g10b10a10p* clone( size_type w, size_type h )
{ return new r10g10b10a10p( *this, w, h ); }
@@ -884,6 +935,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 12; }
virtual r12g12b12* clone( size_type w, size_type h )
{ return new r12g12b12( *this, w, h ); }
@@ -940,6 +994,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 12; }
virtual r12g12b12a12* clone( size_type w, size_type h )
{ return new r12g12b12a12( *this, w, h ); }
@@ -997,6 +1054,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 12; }
virtual r12g12b12p* clone( size_type w, size_type h )
{ return new r12g12b12p( *this, w, h ); }
@@ -1060,6 +1120,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 12; }
virtual r12g12b12a12p* clone( size_type w, size_type h )
{ return new r12g12b12a12p( *this, w, h ); }
@@ -1125,6 +1188,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 16; }
virtual r16g16b16* clone( size_type w, size_type h )
{ return new r16g16b16( *this, w, h ); }
@@ -1181,6 +1247,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 16; }
virtual r16g16b16a16* clone( size_type w, size_type h )
{ return new r16g16b16a16( *this, w, h ); }
@@ -1238,6 +1307,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 16; }
virtual r16g16b16p* clone( size_type w, size_type h )
{ return new r16g16b16p( *this, w, h ); }
@@ -1301,6 +1373,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return bs * sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( 1, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 16; }
virtual r16g16b16a16p* clone( size_type w, size_type h )
{ return new r16g16b16a16p( *this, w, h ); }
@@ -1368,6 +1443,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual r8g8b8log* clone( size_type w, size_type h )
{ return new r8g8b8log( *this, w, h ); }
@@ -1425,6 +1503,9 @@
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+ virtual size_type bitdepth( ) const
+ { return 10; }
+
virtual r10g10b10log* clone( size_type w, size_type h )
{ return new r10g10b10log( *this, w, h ); }
@@ -1480,6 +1561,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 12; }
virtual r12g12b12log* clone( size_type w, size_type h )
{ return new r12g12b12log( *this, w, h ); }
@@ -1536,6 +1620,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 16; }
virtual r16g16b16log* clone( size_type w, size_type h )
{ return new r16g16b16log( *this, w, h ); }
@@ -1592,6 +1679,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 8; }
virtual r8g8b8a8log* clone( size_type w, size_type h )
{ return new r8g8b8a8log( *this, w, h ); }
@@ -1648,6 +1738,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 10; }
virtual r10g10b10a10log* clone( size_type w, size_type h )
{ return new r10g10b10a10log( *this, w, h ); }
@@ -1704,6 +1797,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 12; }
virtual r12g12b12a12log* clone( size_type w, size_type h )
{ return new r12g12b12a12log( *this, w, h ); }
@@ -1760,6 +1856,9 @@
public:
virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+ virtual size_type bitdepth( ) const
+ { return 16; }
virtual r16g16b16a16log* clone( size_type w, size_type h )
{ return new r16g16b16a16log( *this, w, h ); }
Modified: lib/openlibraries/src/openimagelib/il/traits.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/traits.hpp 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/src/openimagelib/il/traits.hpp 2007-05-12 16:33:26 UTC (rev 118)
@@ -11,7 +11,6 @@
#include <openimagelib/il/rgb_traits.hpp>
#include <openimagelib/il/compression_traits.hpp>
#include <openimagelib/il/float_traits.hpp>
-#include <openimagelib/il/noise_traits.hpp>
#include <openimagelib/il/yuv_traits.hpp>
#endif
Modified: lib/openlibraries/src/openimagelib/il/yuv_traits.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/yuv_traits.hpp 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/src/openimagelib/il/yuv_traits.hpp 2007-05-12 16:33:26 UTC (rev 118)
@@ -44,6 +44,9 @@
return detail::rgb_Allocate_size<T>( )( bs, width, height, depth );
}
+ virtual size_type bitdepth( ) const
+ { return 8; }
+
virtual yuv444* clone( size_type w, size_type h )
{
return new yuv444( *this, w, h );
@@ -85,6 +88,9 @@
return detail::rgb_Allocate_size<T>( )( bs, width, height, depth );
}
+ virtual size_type bitdepth( ) const
+ { return 8; }
+
virtual yuv422* clone( size_type w, size_type h )
{
return new yuv422( *this, w, h );
@@ -132,6 +138,9 @@
return detail::rgb_Allocate_size<T>( )( bs, width, height, depth );
}
+ virtual size_type bitdepth( ) const
+ { return 8; }
+
virtual yuv422p* clone( size_type w, size_type h )
{
return new yuv422p( *this, w, h );
@@ -244,6 +253,9 @@
return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ) / 2;
}
+ virtual size_type bitdepth( ) const
+ { return 8; }
+
virtual yuv420p* clone( size_type w, size_type h )
{
return new yuv420p( *this, w, h );
@@ -355,6 +367,9 @@
return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ) / 2;
}
+ virtual size_type bitdepth( ) const
+ { return 8; }
+
virtual yuv411* clone( size_type w, size_type h )
{
return new yuv411( *this, w, h );
@@ -455,6 +470,9 @@
return detail::rgb_Allocate_size<T>( )( bs, width, height, depth ) / 2;
}
+ virtual size_type bitdepth( ) const
+ { return 8; }
+
virtual yuv411p* clone( size_type w, size_type h )
{
return new yuv411p( *this, w, h );
Modified: lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
===================================================================
--- lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-05-10 20:38:14 UTC (rev 117)
+++ lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-05-12 16:33:26 UTC (rev 118)
@@ -1448,11 +1448,11 @@
virtual property_container_ptr get_property_set( )
{ return &image_props_; }
- bool set_image( il::image_type_ptr im )
+ bool set_image( il::image_type_ptr im, const pl::string& depth )
{
- pcos::int_vec bounds_and_rod( 4 );
- bounds_and_rod[ 0 ] = 0;
- bounds_and_rod[ 1 ] = 0;
+ image_effect_prop_pixel_depth_ = depth;
+
+ pcos::int_vec bounds_and_rod( 4, 0 );
bounds_and_rod[ 2 ] = im->width( );
bounds_and_rod[ 3 ] = im->height( );
@@ -1473,7 +1473,7 @@
image_props_.append( image_prop_type_ = pl::string( kOfxTypeImage ) );
image_props_.append( image_effect_prop_pixel_depth_ = pl::string( kOfxBitDepthNone ) );
- image_props_.append( image_effect_prop_components_ = pl::string( kOfxImageComponentNone ) );
+ image_props_.append( image_effect_prop_components_ = pl::string( kOfxImageComponentRGBA ) );
image_props_.append( image_effect_prop_pre_multiplication_ = pl::string( kOfxImageUnPreMultiplied ) );
image_props_.append( image_effect_prop_render_scale_ = render_scale );
image_props_.append( image_prop_pixel_aspect_ratio_ = 1.0 );
@@ -1734,9 +1734,22 @@
virtual property_container_ptr get_property_set( ) { return &clip_instance_props_; }
- void set_image( il::image_type_ptr im ) { im_.set_image( im ), img_ = im; }
- property_container_ptr get_image_property_set( ) { return im_.get_property_set( ); }
- il::image_type_ptr get_image( ) { return img_; }
+ void set_image( il::image_type_ptr im )
+ {
+ pl::string depth;
+
+ im->bitdepth( ) == 8 ? depth = pl::string( kOfxBitDepthByte ) :
+ im->bitdepth( ) == 32 ? depth = pl::string( kOfxBitDepthFloat ) : depth = pl::string( kOfxBitDepthShort );
+
+ clip_instance_prop_unmapped_pixel_depth_ = depth;
+ clip_instance_prop_pixel_depth_ = depth;
+
+ im_.set_image( im, depth );
+ img_ = im;
+ }
+
+ property_container_ptr get_image_property_set( ) { return im_.get_property_set( ); }
+ il::image_type_ptr get_image( ) { return img_; }
private:
void set_clip_instance_properties( clip_descriptor& cd )
@@ -1755,7 +1768,7 @@
clip_instance_props_.append( clip_instance_prop_pixel_depth_ = pl::string( kOfxBitDepthNone ) );
clip_instance_props_.append( clip_instance_prop_components_ = pl::string( kOfxImageComponentNone ) );
clip_instance_props_.append( clip_instance_prop_unmapped_pixel_depth_ = pl::string( kOfxBitDepthNone ) );
- clip_instance_props_.append( clip_instance_prop_unmapped_components_ = pl::string( kOfxImageComponentNone ) );
+ clip_instance_props_.append( clip_instance_prop_unmapped_components_ = pl::string( kOfxImageComponentRGBA ) );
clip_instance_props_.append( clip_instance_prop_premultiplication_ = pl::string( kOfxImageOpaque ) );
clip_instance_props_.append( clip_instance_prop_pixel_aspect_ratio_ = 1.0 );
clip_instance_props_.append( clip_instance_prop_frame_rate_ = 0.0 );
@@ -2107,7 +2120,7 @@
// create instance from descriptor.
image_effect_instance_.init( image_effect_descriptor_ );
- // create any overlay instances if exist.
+ // create any overlay instances...
if( ( interact_main_ = image_effect_descriptor_.overlay_interact( ) ) != 0 )
{
interact_main_( kOfxActionDescribe, &overlay_interact_descriptor_, 0, 0 );
@@ -2146,10 +2159,8 @@
il::image_type_ptr src = result->get_image( );
il::image_type_ptr dst;
- if( apply_clip_prefs_ )
- apply_clip_prefs_filter_ctx( src, dst );
- else
- dst = il::allocate( src->pf( ), src->width( ), src->height( ) );
+ if( context_ == FILTER )
+ convert_to_filter_ctx( src, dst );
pcos::property_container render_in_args;
pcos::property_container render_out_args;
@@ -2333,26 +2344,43 @@
}
private:
- void apply_clip_prefs_filter_ctx( il::image_type_ptr& src, il::image_type_ptr& dst )
+ void convert_to_filter_ctx( il::image_type_ptr& src, il::image_type_ptr& dst )
{
- pl::string source_depth = clip_preferences_prop_depth_source_.value<pl::string>( );
- pl::string output_depth = clip_preferences_prop_depth_output_.value<pl::string>( );
-
- if( !source_depth.empty( ) )
+ if( apply_clip_prefs_ )
{
- if( source_depth == kOfxBitDepthByte ) src = il::convert( src, L"r8g8b8a8" );
- else if( source_depth == kOfxBitDepthShort ) src = il::convert( src, L"r16g16b16a16" );
- else if( source_depth == kOfxBitDepthFloat ) src = il::convert( src, L"r32g32b32a32f" );
- }
+ pl::string source_depth = clip_preferences_prop_depth_source_.value<pl::string>( );
+ pl::string output_depth = clip_preferences_prop_depth_output_.value<pl::string>( );
- if( !output_depth.empty( ) )
- {
- if( output_depth == kOfxBitDepthByte ) dst = il::allocate( L"r8g8b8a8", src->width( ), src->height( ) );
- else if( output_depth == kOfxBitDepthShort ) dst = il::allocate( L"r16g16b16a16", src->width( ), src->height( ) );
- else if( output_depth == kOfxBitDepthFloat ) dst = il::allocate( L"r32g32b32a32f", src->width( ), src->height( ) );
+ if( !source_depth.empty( ) )
+ {
+ if( source_depth == kOfxBitDepthByte ) src = il::convert( src, L"r8g8b8a8" );
+ else if( source_depth == kOfxBitDepthShort ) src = il::convert( src, L"r16g16b16a16" );
+ else if( source_depth == kOfxBitDepthFloat ) src = il::convert( src, L"r32g32b32a32f" );
+ }
+
+ if( !output_depth.empty( ) )
+ {
+ if( output_depth == kOfxBitDepthByte ) dst = il::allocate( L"r8g8b8a8", src->width( ), src->height( ) );
+ else if( output_depth == kOfxBitDepthShort ) dst = il::allocate( L"r16g16b16a16", src->width( ), src->height( ) );
+ else if( output_depth == kOfxBit...
[truncated message content] |
|
From: <gl...@us...> - 2007-05-19 17:38:24
|
Revision: 127
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=127&view=rev
Author: glslang
Date: 2007-05-19 10:38:22 -0700 (Sat, 19 May 2007)
Log Message:
-----------
+ installer updates
+ merge (partial) with VM olibs
Modified Paths:
--------------
lib/openlibraries/installer/openlibraries_runtime.nsi
lib/openlibraries/installer/openlibraries_sdk.nsi
lib/openlibraries/src/openimagelib/il/utility.cpp
lib/openlibraries/src/openimagelib/il/utility.hpp
lib/openlibraries/src/openimagelib/il/yuv_traits.hpp
lib/openlibraries/src/openmedialib/ml/utilities.hpp
Removed Paths:
-------------
lib/openlibraries/installer/msxml4.msi
Deleted: lib/openlibraries/installer/msxml4.msi
===================================================================
(Binary files differ)
Modified: lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================
--- lib/openlibraries/installer/openlibraries_runtime.nsi 2007-05-19 16:37:10 UTC (rev 126)
+++ lib/openlibraries/installer/openlibraries_runtime.nsi 2007-05-19 17:38:22 UTC (rev 127)
@@ -79,9 +79,6 @@
SetOverwrite on
- SetOutPath $INSTDIR
- File "msxml4.msi"
-
SetOutPath $INSTDIR\bin
File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_0.dll"
File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_0.dll"
@@ -198,14 +195,6 @@
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "DisplayName" "OpenLibraries"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString" "$INSTDIR\uninst-openlibraries.exe"
- SetDetailsPrint textonly
- DetailPrint "Installing MSXML4..."
- SetDetailsPrint listonly
-
- ExecWait 'MsiExec.exe /qn /x{2AEBE10C-D819-4EBF-BC60-03BF2327D340}' ; uninstall MSXML4 if it's there
- ExecWait 'MsiExec.exe /qn /x{35343FF7-939B-401A-87B3-FF90A5123D88}' ; uninstall MSXML4 SP1 if it's there
- ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml4.msi"'
-
SectionEnd
Section -post
Modified: lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- lib/openlibraries/installer/openlibraries_sdk.nsi 2007-05-19 16:37:10 UTC (rev 126)
+++ lib/openlibraries/installer/openlibraries_sdk.nsi 2007-05-19 17:38:22 UTC (rev 127)
@@ -79,9 +79,6 @@
SetOverwrite on
- SetOutPath $INSTDIR
- File "msxml4.msi"
-
SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openpluginlib\pl
File ..\src\openpluginlib\pl\allocatorstringstorage.h
File ..\src\openpluginlib\pl\bind_info.hpp
@@ -368,15 +365,7 @@
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "DisplayName" "OpenLibraries"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString" "$INSTDIR\uninst-openlibraries.exe"
-
- SetDetailsPrint textonly
- DetailPrint "Installing MSXML4..."
- SetDetailsPrint listonly
- ExecWait 'MsiExec.exe /qn /x{2AEBE10C-D819-4EBF-BC60-03BF2327D340}' ; uninstall MSXML4 if it's there
- ExecWait 'MsiExec.exe /qn /x{35343FF7-939B-401A-87B3-FF90A5123D88}' ; uninstall MSXML4 SP1 if it's there
- ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml4.msi"'
-
SectionEnd
Section -post
Modified: lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/utility.cpp 2007-05-19 16:37:10 UTC (rev 126)
+++ lib/openlibraries/src/openimagelib/il/utility.cpp 2007-05-19 17:38:22 UTC (rev 127)
@@ -73,44 +73,6 @@
lut[ i ] = static_cast<unsigned short>( floorf( val + 0.5f ) );
}
}
-
- void float2rgbe( float red, float green, float blue, unsigned char rgbe[ 4 ] )
- {
- float v = red;
- if( v < green ) v = green;
- if( v < blue ) v = blue;
-
- if( v < ( std::numeric_limits<float>::min )( ) )
- {
- rgbe[ 0 ] = rgbe[ 1 ] = rgbe[ 2 ] = rgbe[ 3 ] = 0;
- }
- else
- {
- int exponent;
- v = frexp( v, &exponent ) * 256.0f / v;
-
- rgbe[ 0 ] = static_cast<unsigned char>( red * v );
- rgbe[ 1 ] = static_cast<unsigned char>( green * v );
- rgbe[ 2 ] = static_cast<unsigned char>( blue * v );
- rgbe[ 3 ] = static_cast<unsigned char>( exponent + 128 );
- }
- }
-
- void rgbe2float( unsigned char rgbe[ 4 ], float& red, float& green, float& blue )
- {
- if( rgbe[ 3 ] )
- {
- float f = ldexp( 1.0f, rgbe[ 3 ] - ( 128 + 8 ) );
-
- red = rgbe[ 0 ] * f;
- green = rgbe[ 1 ] * f;
- blue = rgbe[ 2 ] * f;
- }
- else
- {
- red = green = blue = 0.0f;
- }
- }
}
// The following private functions are a bit rough and shouldn't be exposed publicly
@@ -153,7 +115,7 @@
typedef image< unsigned char, r16g16b16a16log > r16g16b16a16log_image_type;
typedef image< unsigned char, r32g32b32f > r32g32b32f_image_type;
typedef image< unsigned char, r32g32b32a32f > r32g32b32a32f_image_type;
-typedef image< unsigned char, rgbe > rgbe_image_type;
+typedef image< unsigned char, yuv444p > yuv444p_image_type;
typedef image< unsigned char, yuv444 > yuv444_image_type;
typedef image< unsigned char, yuv422 > yuv422_image_type;
typedef image< unsigned char, yuv422p > yuv422p_image_type;
@@ -233,8 +195,8 @@
dst_img = image_type_ptr( new image_type( r32g32b32f_image_type( width, height, 1 ) ) );
else if( pf == L"r32g32b32a32f" )
dst_img = image_type_ptr( new image_type( r32g32b32a32f_image_type( width, height, 1 ) ) );
- else if( pf == L"rgbe" )
- dst_img = image_type_ptr( new image_type( rgbe_image_type( width, height, 1 ) ) );
+ else if ( pf == L"yuv444p" )
+ dst_img = image_type_ptr( new image_type( yuv444p_image_type( width, height, 1 ) ) );
else if ( pf == L"yuv444" )
dst_img = image_type_ptr( new image_type( yuv444_image_type( width, height, 1 ) ) );
else if ( pf == L"yuv422" )
@@ -398,234 +360,263 @@
return result;
}
-static image_type_ptr rgb_to_yuv444( const image_type_ptr &src_img, const std::wstring &format, int bytes, int r, int g, int b )
+static image_type_ptr yuvp_to_yuvp( const image_type_ptr &src_img, const std::wstring &format )
{
- size_type width = src_img->width( );
- size_type height = src_img->height( );
-
image_type_ptr dst_img = allocate( src_img, format );
if ( dst_img != 0 )
{
- int y, u, v;
+ for ( int plane = 0; plane < 3; plane ++ )
+ {
+ size_type src_width = src_img->width( plane );
+ size_type src_height = src_img->height( plane );
- const_pointer src = src_img->data( );
- size_type src_pitch = src_img->pitch( ) - src_img->linesize( );
- pointer dst = dst_img->data( );
- size_type dst_pitch = dst_img->pitch( ) - dst_img->linesize( );
+ size_type dst_width = dst_img->width( plane );
+ size_type dst_height = dst_img->height( plane );
- size_type orig_width = width;
+ const_pointer src = src_img->data( plane );
+ pointer dst = dst_img->data( plane );
- while( height -- )
- {
- width = orig_width;
+ size_type src_pitch = src_img->pitch( plane );
+ size_type dst_pitch = dst_img->pitch( plane );
+ size_type dst_rem = dst_pitch - dst_width;
- while( width -- )
+ if ( dst_width == src_width && dst_height == src_height )
{
- rgb24_to_yuv444( y, u, v, *( src + r ), *( src + g ), *( src + b ) );
- src += bytes;
- *dst ++ = ( unsigned char )y;
- *dst ++ = ( unsigned char )u;
- *dst ++ = ( unsigned char )v;
+ while( dst_height -- )
+ {
+ memcpy( dst, src, dst_width );
+ dst += dst_pitch;
+ src += src_pitch;
+ }
}
+ else
+ {
+ size_type x_factor = ( src_width << 8 ) / dst_width;
+ size_type y_factor = ( src_height << 8 ) / dst_height;
- dst += dst_pitch;
- src += src_pitch;
+ for ( size_type y = 0; y < dst_height; y ++ )
+ {
+ const_pointer line = src + ( ( y * y_factor ) >> 8 ) * src_pitch;
+
+ for ( size_type x = 0; x < dst_width; x ++ )
+ *dst ++ = line[ ( x * x_factor ) >> 8 ];
+
+ dst += dst_rem;
+ }
+ }
}
}
return dst_img;
}
-static image_type_ptr yuv444_to_rgb( const image_type_ptr &src_img, const std::wstring &format, int r, int g, int b, int a )
+static image_type_ptr yuvp_to_rgb( const image_type_ptr &src_img, const std::wstring &format, int r, int g, int b, int a )
{
- size_type width = src_img->width( );
- size_type height = src_img->height( );
-
image_type_ptr dst_img = allocate( src_img, format );
if ( dst_img != 0 )
{
- int rgb[ 4 ] = { 255, 255, 255, 255 };
+ size_type dst_width = dst_img->width( );
+ size_type dst_height = dst_img->height( );
+
+ size_type chroma_width = src_img->width( 1 );
+ size_type chroma_height = src_img->height( 1 );
- const_pointer src = src_img->data( );
- size_type src_pitch = src_img->pitch( ) - src_img->linesize( );
+ size_type x_factor = ( chroma_width << 8 ) / dst_width;
+ size_type y_factor = ( chroma_height << 8 ) / dst_height;
+
pointer dst = dst_img->data( );
- size_type dst_pitch = dst_img->pitch( ) - dst_img->linesize( );
+ size_type dst_rem = dst_img->pitch( ) - dst_img->linesize( );
- size_type orig_width = width;
+ int rgb[ 4 ] = { 255, 255, 255, 255 };
+ int uv_offset;
- while( height -- )
+ for ( int y = 0; y < dst_height; y ++ )
{
- while( width -- )
+ const_pointer Y = src_img->data( 0 ) + ( y * src_img->pitch( 0 ) );
+ const_pointer U = src_img->data( 1 ) + ( ( y * y_factor ) >> 8 ) * src_img->pitch( 1 );
+ const_pointer V = src_img->data( 2 ) + ( ( y * y_factor ) >> 8 ) * src_img->pitch( 2 );
+
+ if ( a == -1 )
{
- yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *src, *( src + 1 ), *( src + 2 ) );
- src += 3;
- *dst ++ = ( unsigned char )rgb[ r ];
- *dst ++ = ( unsigned char )rgb[ g ];
- *dst ++ = ( unsigned char )rgb[ b ];
- if ( a != -1 ) *dst ++ = ( unsigned char )rgb[ a ];
+ for ( int x = 0; x < dst_width; x ++ )
+ {
+ uv_offset = ( x * x_factor ) >> 8;
+ yuv444_to_rgb24( rgb[ r ], rgb[ g ], rgb[ b ], *Y ++, U[ uv_offset ], V[ uv_offset ] );
+ *dst ++ = ( unsigned char )( rgb[ 0 ] );
+ *dst ++ = ( unsigned char )( rgb[ 1 ] );
+ *dst ++ = ( unsigned char )( rgb[ 2 ] );
+ }
}
+ else
+ {
+ for ( int x = 0; x < dst_width; x ++ )
+ {
+ uv_offset = ( x * x_factor ) >> 8;
+ yuv444_to_rgb24( rgb[ r ], rgb[ g ], rgb[ b ], *Y ++, U[ uv_offset ], V[ uv_offset ] );
+ *dst ++ = ( unsigned char )( rgb[ 0 ] );
+ *dst ++ = ( unsigned char )( rgb[ 1 ] );
+ *dst ++ = ( unsigned char )( rgb[ 2 ] );
+ *dst ++ = ( unsigned char )( rgb[ 3 ] );
+ }
+ }
- dst += dst_pitch;
- src += src_pitch;
- width = orig_width;
+ dst += dst_rem;
}
}
return dst_img;
}
-static image_type_ptr rgb_to_yuv422( const image_type_ptr &src_img, const std::wstring &format, int bytes, int r, int g, int b )
+static image_type_ptr rgb_to_yuvp( const image_type_ptr &src_img, const std::wstring &format, int r, int g, int b, int a )
{
- size_type width = src_img->width( );
- size_type height = src_img->height( );
-
image_type_ptr dst_img = allocate( src_img, format );
if ( dst_img != 0 )
{
- int y[ 2 ], u[ 2 ], v[ 2 ];
+ size_type dst_width = dst_img->width( );
+ size_type dst_height = dst_img->height( );
+
+ size_type chroma_width = dst_img->width( 1 );
+ size_type chroma_height = dst_img->height( 1 );
+ size_type src_width = src_img->width( );
+ size_type src_height = src_img->height( );
+
+ size_type x_factor = ( chroma_width << 8 ) / src_width;
+ size_type y_factor = ( chroma_height << 8 ) / src_height;
+
const_pointer src = src_img->data( );
- size_type src_pitch = src_img->pitch( ) - src_img->linesize( );
- pointer dst = dst_img->data( );
- size_type dst_pitch = dst_img->pitch( ) - dst_img->linesize( );
+ size_type src_rem = src_img->pitch( ) - src_img->linesize( );
- size_type orig_width = width;
+ int uv_offset;
- while( height -- )
+ int yuv[ 3 ];
+ int components = a == -1 ? 3 : 4;
+
+ for ( int y = 0; y < dst_height; y ++ )
{
- width = orig_width;
+ pointer Y = dst_img->data( 0 ) + ( y * dst_img->pitch( 0 ) );
+ pointer U = dst_img->data( 1 ) + ( ( y * y_factor ) >> 8 ) * dst_img->pitch( 1 );
+ pointer V = dst_img->data( 2 ) + ( ( y * y_factor ) >> 8 ) * dst_img->pitch( 2 );
- while( width > 1 )
+ for ( int x = 0; x < dst_width; x ++ )
{
- rgb24_to_yuv444( y[ 0 ], u[ 0 ], v[ 0 ], *( src + r ), *( src + g ), *( src + b ) );
- src += bytes;
- rgb24_to_yuv444( y[ 1 ], u[ 1 ], v[ 1 ], *( src + r ), *( src + g ), *( src + b ) );
- src += bytes;
- *dst ++ = ( unsigned char )y[ 0 ];
- *dst ++ = ( unsigned char )( ( u[ 0 ] + u[ 1 ] ) >> 1 );
- *dst ++ = ( unsigned char )y[ 1 ];
- *dst ++ = ( unsigned char )( ( v[ 0 ] + v[ 1 ] ) >> 1 );
- width -= 2;
+ uv_offset = ( x * x_factor ) >> 8;
+ rgb24_to_yuv444( yuv[ 0 ], yuv[ 1 ], yuv[ 2 ], src[ r ], src[ g ], src[ b ] );
+ *Y ++ = ( unsigned char )yuv[ 0 ];
+ U[ uv_offset ] = ( unsigned char )yuv[ 1 ];
+ V[ uv_offset ] = ( unsigned char )yuv[ 2 ];
+ src += components;
}
- dst += dst_pitch;
- src += src_pitch;
+ src += src_rem;
}
}
return dst_img;
}
-static image_type_ptr yuv422_to_rgb( const image_type_ptr &src_img, const std::wstring &format, int r, int g, int b, int a )
+static image_type_ptr yuvp_to_yuv422( const image_type_ptr &src_img, const std::wstring &format )
{
- size_type width = src_img->width( );
- size_type height = src_img->height( );
-
image_type_ptr dst_img = allocate( src_img, format );
if ( dst_img != 0 )
{
- int rgb[ 4 ] = { 255, 255, 255, 255 };
+ size_type dst_width = dst_img->width( ) / 2;
+ size_type dst_height = dst_img->height( );
+
+ size_type chroma_width = src_img->width( 1 );
+ size_type chroma_height = src_img->height( 1 );
- const_pointer src = src_img->data( );
- size_type src_pitch = src_img->pitch( ) - src_img->linesize( );
+ size_type x_factor = ( chroma_width << 8 ) / dst_width;
+ size_type y_factor = ( chroma_height << 8 ) / dst_height;
+
pointer dst = dst_img->data( );
- size_type dst_pitch = dst_img->pitch( ) - dst_img->linesize( );
+ size_type dst_rem = dst_img->pitch( ) - dst_img->linesize( );
- size_type orig_width = width;
+ int uv_offset;
- while( height -- )
+ for ( int y = 0; y < dst_height; y ++ )
{
- while( width > 1 )
+ const_pointer Y = src_img->data( 0 ) + ( y * src_img->pitch( 0 ) );
+ const_pointer U = src_img->data( 1 ) + ( ( y * y_factor ) >> 8 ) * src_img->pitch( 1 );
+ const_pointer V = src_img->data( 2 ) + ( ( y * y_factor ) >> 8 ) * src_img->pitch( 2 );
+
+ for ( int x = 0; x < dst_width; x ++ )
{
- yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *src, *( src + 1 ), *( src + 3 ) );
- *dst ++ = ( unsigned char )rgb[ r ];
- *dst ++ = ( unsigned char )rgb[ g ];
- *dst ++ = ( unsigned char )rgb[ b ];
- if ( a != -1 ) *dst ++ = ( unsigned char )rgb[ a ];
- src += 2;
- yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *src, *( src - 1 ), *( src + 1 ) );
- *dst ++ = ( unsigned char )rgb[ r ];
- *dst ++ = ( unsigned char )rgb[ g ];
- *dst ++ = ( unsigned char )rgb[ b ];
- if ( a != -1 ) *dst ++ = ( unsigned char )rgb[ a ];
- src += 2;
- width -= 2;
+ uv_offset = ( x * x_factor ) >> 8;
+ *dst ++ = ( unsigned char )( *Y ++ );
+ *dst ++ = ( unsigned char )( U[ uv_offset ] );
+ *dst ++ = ( unsigned char )( *Y ++ );
+ *dst ++ = ( unsigned char )( V[ uv_offset ] );
}
- dst += dst_pitch;
- src += src_pitch;
- width = orig_width;
+ dst += dst_rem;
}
}
return dst_img;
}
-static image_type_ptr yuv444_to_yuv420p( const image_type_ptr &src_img, const std::wstring &format )
+static image_type_ptr yuv422_to_yuvp( const image_type_ptr &src_img, const std::wstring &format )
{
- size_type width = src_img->width( );
- size_type height = src_img->height( );
-
image_type_ptr dst_img = allocate( src_img, format );
if ( dst_img != 0 )
{
- const_pointer src = src_img->data( );
- size_type src_pitch = src_img->pitch( ) - src_img->linesize( );
- size_type pitch = src_img->pitch( );
+ for ( int p = 0; p < 3; p ++ )
+ {
+ size_type dst_width = dst_img->width( p );
+ size_type dst_height = dst_img->height( p );
- pointer dst[ 3 ];
- size_type rem_pitch[ 3 ];
+ pointer dst = dst_img->data( p );
+ size_type dst_rem = dst_img->pitch( p ) - dst_img->linesize( p );
- dst[ 0 ] = dst_img->data( 0 );
- dst[ 1 ] = dst_img->data( 1 );
- dst[ 2 ] = dst_img->data( 2 );
+ size_type src_height = src_img->height( );
- rem_pitch[ 0 ] = dst_img->pitch( 0 ) - dst_img->linesize( 0 );
- rem_pitch[ 1 ] = dst_img->pitch( 1 ) - dst_img->linesize( 1 );
- rem_pitch[ 2 ] = dst_img->pitch( 2 ) - dst_img->linesize( 2 );
+ size_type y_factor = ( src_height << 8 ) / dst_height;
- size_type orig_width = width / 2;
-
- while( height -- )
- {
- width = orig_width;
-
- while( width -- )
+ if ( p == 0 )
{
- if ( height % 2 == 1 )
+ for ( int y = 0; y < dst_height; y ++ )
{
- ( *dst[ 0 ] ++ ) = *src ++;
- ( *dst[ 1 ] ++ ) = ( src[ 0 ] + src[ 3 ] + src[ pitch ] + src[ pitch + 3 ] ) >> 2;
- ( *dst[ 2 ] ++ ) = ( src[ 1 ] + src[ 4 ] + src[ pitch + 1 ] + src[ pitch + 4 ] ) >> 2;
- src += 2;
- ( *dst[ 0 ] ++ ) = *src ++;
- src += 2;
+ const_pointer line = src_img->data( ) + ( y * src_img->pitch( ) );
+
+ for ( int x = 0; x < dst_width; x ++ )
+ {
+ *dst ++ = ( unsigned char )( *line );
+ line += 2;
+ }
+
+ dst += dst_rem;
}
- else
+ }
+ else
+ {
+ int uv_offset = 1 + ( p - 1 ) * 2;
+
+ size_type src_width = src_img->width( );
+ size_type x_factor = ( src_width << 8 ) / dst_width;
+
+ for ( int y = 0; y < dst_height; y ++ )
{
- ( *dst[ 0 ] ++ ) = *src;
- src += 3;
- ( *dst[ 0 ] ++ ) = *src;
- src += 3;
+ const_pointer line = src_img->data( ) + ( ( ( y * y_factor ) >> 8 ) * src_img->pitch( ) );
+
+ for ( int x = 0; x < dst_width; x ++ )
+ *dst ++ = ( unsigned char )( line[ 4 * ( ( x * x_factor ) >> 9 ) + uv_offset ] );
+
+ dst += dst_rem;
}
}
-
- dst[ 0 ] += rem_pitch[ 0 ];
- dst[ 1 ] += rem_pitch[ 1 ];
- dst[ 2 ] += rem_pitch[ 2 ];
- src += src_pitch;
}
}
return dst_img;
}
-static image_type_ptr yuv444_to_yuv422( const image_type_ptr &src_img, const std::wstring &format )
+static image_type_ptr yuv422_to_rgb( const image_type_ptr &src_img, const std::wstring &format, int r, int g, int b, int a )
{
size_type width = src_img->width( );
size_type height = src_img->height( );
@@ -634,111 +625,44 @@
if ( dst_img != 0 )
{
+ int rgb[ 4 ] = { 255, 255, 255, 255 };
+
const_pointer src = src_img->data( );
size_type src_pitch = src_img->pitch( ) - src_img->linesize( );
-
pointer dst = dst_img->data( );
size_type dst_pitch = dst_img->pitch( ) - dst_img->linesize( );
- size_type orig_width = width / 2;
+ size_type orig_width = width;
while( height -- )
{
- width = orig_width;
-
- while( width -- )
+ while( width > 1 )
{
- *dst ++ = src[ 0 ];
- *dst ++ = ( src[ 1 ] + src[ 4 ] ) >> 1;
- *dst ++ = src[ 3 ];
- *dst ++ = ( src[ 2 ] + src[ 5 ] ) >> 1;
- src += 6;
+ yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *src, *( src + 1 ), *( src + 3 ) );
+ *dst ++ = ( unsigned char )rgb[ r ];
+ *dst ++ = ( unsigned char )rgb[ g ];
+ *dst ++ = ( unsigned char )rgb[ b ];
+ if ( a != -1 ) *dst ++ = ( unsigned char )rgb[ a ];
+ src += 2;
+ yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *src, *( src - 1 ), *( src + 1 ) );
+ *dst ++ = ( unsigned char )rgb[ r ];
+ *dst ++ = ( unsigned char )rgb[ g ];
+ *dst ++ = ( unsigned char )rgb[ b ];
+ if ( a != -1 ) *dst ++ = ( unsigned char )rgb[ a ];
+ src += 2;
+ width -= 2;
}
dst += dst_pitch;
src += src_pitch;
- }
- }
-
- return dst_img;
-}
-
-static image_type_ptr yuv422_to_yuv420p( const image_type_ptr &src_img, const std::wstring &format )
-{
- size_type width = src_img->width( );
- size_type height = src_img->height( );
-
- image_type_ptr dst_img = allocate( src_img, format );
-
- if ( dst_img != 0 )
- {
- size_type src_pitch = src_img->pitch( );
- const_pointer src[ 2 ];
- src[ 0 ] = src_img->data( );
- src[ 1 ] = src_img->data( ) + src_pitch;
-
- const_pointer sptr[ 2 ];
- sptr[ 0 ] = src[ 0 ];
- sptr[ 1 ] = src[ 1 ];
-
- pointer dst[ 4 ];
- dst[ 0 ] = dst_img->data( 0 );
- dst[ 1 ] = dst_img->data( 0 ) + dst_img->pitch( 0 );
- dst[ 2 ] = dst_img->data( 1 );
- dst[ 3 ] = dst_img->data( 2 );
-
- size_type dst_pitch[ 4 ];
- dst_pitch[ 0 ] = 2 * dst_img->pitch( 0 );
- dst_pitch[ 1 ] = 2 * dst_img->pitch( 0 );
- dst_pitch[ 2 ] = dst_img->pitch( 1 );
- dst_pitch[ 3 ] = dst_img->pitch( 2 );
-
- pointer dptr[ 4 ];
- dptr[ 0 ] = dst[ 0 ];
- dptr[ 1 ] = dst[ 1 ];
- dptr[ 2 ] = dst[ 2 ];
- dptr[ 3 ] = dst[ 3 ];
-
- // TODO: Fix this for uneven width and/or height
- size_type orig_width = width / 2;
- height /= 2;
-
- while( height -- )
- {
width = orig_width;
-
- src[ 0 ] = sptr[ 0 ];
- src[ 1 ] = sptr[ 1 ];
-
- dst[ 0 ] = dptr[ 0 ];
- dst[ 1 ] = dptr[ 1 ];
- dst[ 2 ] = dptr[ 2 ];
- dst[ 3 ] = dptr[ 3 ];
-
- while( width -- )
- {
- *( dst[ 0 ] ++ ) = *( src[ 0 ] ++ );
- *( dst[ 1 ] ++ ) = *( src[ 1 ] ++ );
- *( dst[ 2 ] ++ ) = ( *( src[ 0 ] ++ ) + *( src[ 1 ] ++ ) ) >> 1;
- *( dst[ 0 ] ++ ) = *( src[ 0 ] ++ );
- *( dst[ 1 ] ++ ) = *( src[ 1 ] ++ );
- *( dst[ 3 ] ++ ) = ( *( src[ 0 ] ++ ) + *( src[ 1 ] ++ ) ) >> 1;
- }
-
- sptr[ 0 ] += src_pitch << 1;
- sptr[ 1 ] += src_pitch << 1;
-
- dptr[ 0 ] += dst_pitch[ 0 ];
- dptr[ 1 ] += dst_pitch[ 1 ];
- dptr[ 2 ] += dst_pitch[ 2 ];
- dptr[ 3 ] += dst_pitch[ 3 ];
}
}
return dst_img;
}
-static image_type_ptr rgb_to_yuv422p( const image_type_ptr &src_img, const std::wstring &format, int bytes, int r, int g, int b )
+static image_type_ptr rgb_to_yuv422( const image_type_ptr &src_img, const std::wstring &format, int bytes, int r, int g, int b )
{
size_type width = src_img->width( );
size_type height = src_img->height( );
@@ -751,20 +675,12 @@
const_pointer src = src_img->data( );
size_type src_pitch = src_img->pitch( ) - src_img->linesize( );
+ pointer dst = dst_img->data( );
+ size_type dst_pitch = dst_img->pitch( ) - dst_img->linesize( );
- pointer dst[ 3 ];
- dst[ 0 ] = dst_img->data( 0 );
- dst[ 1 ] = dst_img->data( 1 );
- dst[ 2 ] = dst_img->data( 2 );
-
- size_type dst_pitch[ 3 ];
- dst_pitch[ 0 ] = dst_img->pitch( 0 ) - dst_img->linesize( 0 );
- dst_pitch[ 1 ] = dst_img->pitch( 1 ) - dst_img->linesize( 1 );
- dst_pitch[ 2 ] = dst_img->pitch( 2 ) - dst_img->linesize( 2 );
-
size_type orig_width = width;
- while( height > 1 )
+ while( height -- )
{
width = orig_width;
@@ -774,169 +690,117 @@
src += bytes;
rgb24_to_yuv444( y[ 1 ], u[ 1 ], v[ 1 ], *( src + r ), *( src + g ), *( src + b ) );
src += bytes;
-
- *dst[ 0 ] ++ = ( unsigned char )y[ 0 ];
- *dst[ 0 ] ++ = ( unsigned char )y[ 1 ];
-
- *dst[ 1 ] ++ = ( unsigned char )( ( u[ 0 ] + u[ 1 ] ) >> 1 );
- *dst[ 2 ] ++ = ( unsigned char )( ( v[ 0 ] + v[ 1 ] ) >> 1 );
-
+ *dst ++ = ( unsigned char )y[ 0 ];
+ *dst ++ = ( unsigned char )( ( u[ 0 ] + u[ 1 ] ) >> 1 );
+ *dst ++ = ( unsigned char )y[ 1 ];
+ *dst ++ = ( unsigned char )( ( v[ 0 ] + v[ 1 ] ) >> 1 );
width -= 2;
}
+ dst += dst_pitch;
src += src_pitch;
-
- dst[ 0 ] += dst_pitch[ 0 ];
- dst[ 1 ] += dst_pitch[ 1 ];
- dst[ 2 ] += dst_pitch[ 2 ];
-
- height --;
}
}
return dst_img;
}
-static image_type_ptr yuv422p_to_rgb( const image_type_ptr &src_img, const std::wstring &format, int r, int g, int b, int a )
+static image_type_ptr yuvp_to_yuv444( const image_type_ptr &src_img, const std::wstring &format )
{
- size_type width = src_img->width( );
- size_type height = src_img->height( );
-
image_type_ptr dst_img = allocate( src_img, format );
if ( dst_img != 0 )
{
- int rgb[ 4 ] = { 255, 255, 255, 255 };
+ size_type dst_width = dst_img->width( );
+ size_type dst_height = dst_img->height( );
+
+ size_type chroma_width = src_img->width( 1 );
+ size_type chroma_height = src_img->height( 1 );
- const_pointer src[ 3 ];
- src[ 0 ] = src_img->data( 0 );
- src[ 1 ] = src_img->data( 1 );
- src[ 2 ] = src_img->data( 2 );
+ size_type x_factor = ( chroma_width << 8 ) / dst_width;
+ size_type y_factor = ( chroma_height << 8 ) / dst_height;
- size_type src_pitch[ 3 ];
- src_pitch[ 0 ] = src_img->pitch( 0 ) - src_img->linesize( 0 );
- src_pitch[ 1 ] = src_img->pitch( 1 ) - src_img->linesize( 1 );
- src_pitch[ 2 ] = src_img->pitch( 2 ) - src_img->linesize( 2 );
-
- size_type dst_pitch = dst_img->pitch( ) - dst_img->linesize( );
-
pointer dst = dst_img->data( );
+ size_type dst_rem = dst_img->pitch( ) - dst_img->linesize( );
- size_type orig_width = width;
+ int uv_offset;
- while( height > 1 )
+ for ( int y = 0; y < dst_height; y ++ )
{
- while( width > 1 )
- {
- yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *( src[ 0 ] ), *( src[ 1 ] ), *( src[ 2 ] ) );
- *dst ++ = ( unsigned char )rgb[ r ];
- *dst ++ = ( unsigned char )rgb[ g ];
- *dst ++ = ( unsigned char )rgb[ b ];
- if ( a != -1 ) *dst ++ = ( unsigned char )rgb[ a ];
- src[ 0 ] += 1;
+ const_pointer Y = src_img->data( 0 ) + ( y * src_img->pitch( 0 ) );
+ const_pointer U = src_img->data( 1 ) + ( ( y * y_factor ) >> 8 ) * src_img->pitch( 1 );
+ const_pointer V = src_img->data( 2 ) + ( ( y * y_factor ) >> 8 ) * src_img->pitch( 2 );
- yuv444_to_rgb24( rgb[ 0 ], rgb[ 1 ], rgb[ 2 ], *( src[ 0 ] ), *( src[ 1 ] ), *( src[ 2 ] ) );
- *dst ++ = ( unsigned char )rgb[ r ];
- *dst ++ = ( unsigned char )rgb[ g ];
- *dst ++ = ( unsigned char )rgb[ b ];
- if ( a != -1 ) *dst ++ = ( unsigned char )rgb[ a ];
- src[ 0 ] += 1;
-
- src[ 1 ] += 1;
- src[ 2 ] += 1;
-
- width -= 2;
+ for ( int x = 0; x < dst_width; x ++ )
+ {
+ uv_offset = ( x * x_factor ) >> 8;
+ *dst ++ = ( unsigned char )( *Y ++ );
+ *dst ++ = ( unsigned char )( U[ uv_offset ] );
+ *dst ++ = ( unsigned char )( V[ uv_offset ] );
}
- src[ 0 ] += src_pitch[ 0 ];
- src[ 1 ] += src_pitch[ 1 ];
- src[ 2 ] += src_pitch[ 2 ];
-
- dst += dst_pitch;
-
- width = orig_width;
- height --;
+ dst += dst_rem;
}
}
return dst_img;
}
-static image_type_ptr rgb_to_yuv420p( const image_type_ptr &src_img, const std::wstring &format, int bytes, int r, int g, int b )
+static image_type_ptr yuv444_to_yuvp( const image_type_ptr &src_img, const std::wstring &format )
{
- size_type width = src_img->width( );
- size_type height = src_img->height( );
-
image_type_ptr dst_img = allocate( src_img, format );
if ( dst_img != 0 )
{
- int y[ 4 ], u[ 4 ], v[ 4 ];
+ for ( int p = 0; p < 3; p ++ )
+ {
+ size_type dst_width = dst_img->width( p );
+ size_type dst_height = dst_img->height( p );
- const_pointer src[ 2 ];
- src[ 0 ] = src_img->data( );
- src[ 1 ] = src_img->data( ) + src_img->pitch( );
- size_type src_pitch = 2 * src_img->pitch( ) - src_img->linesize( );
+ pointer dst = dst_img->data( p );
+ size_type dst_rem = dst_img->pitch( p ) - dst_img->linesize( p );
- pointer dst[ 4 ];
- dst[ 0 ] = dst_img->data( 0 );
- dst[ 1 ] = dst_img->data( 0 ) + dst_img->pitch( 0 );
- dst[ 2 ] = dst_img->data( 1 );
- dst[ 3 ] = dst_img->data( 2 );
+ size_type src_height = src_img->height( );
- size_type dst_pitch[ 3 ];
- dst_pitch[ 0 ] = 2 * dst_img->pitch( 0 ) - dst_img->linesize( 0 );
- dst_pitch[ 1 ] = dst_img->pitch( 1 ) - dst_img->linesize( 1 );
- dst_pitch[ 2 ] = dst_img->pitch( 2 ) - dst_img->linesize( 2 );
+ size_type y_factor = ( src_height << 8 ) / dst_height;
- size_type orig_width = width;
-
- while( height > 1 )
- {
- width = orig_width;
-
- while( width > 1 )
+ if ( p == 0 )
{
- rgb24_to_yuv444( y[ 0 ], u[ 0 ], v[ 0 ], *( src[ 0 ] + r ), *( src[ 0 ] + g ), *( src[ 0 ] + b ) );
- src[ 0 ] += bytes;
- rgb24_to_yuv444( y[ 1 ], u[ 1 ], v[ 1 ], *( src[ 0 ] + r ), *( src[ 0 ] + g ), *( src[ 0 ] + b ) );
- src[ 0 ] += bytes;
- rgb24_to_yuv444( y[ 2 ], u[ 2 ], v[ 2 ], *( src[ 1 ] + r ), *( src[ 1 ] + g ), *( src[ 1 ] + b ) );
- src[ 1 ] += bytes;
- rgb24_to_yuv444( y[ 3 ], u[ 3 ], v[ 3 ], *( src[ 1 ] + r ), *( src[ 1 ] + g ), *( src[ 1 ] + b ) );
- src[ 1 ] += bytes;
+ for ( int y = 0; y < dst_height; y ++ )
+ {
+ const_pointer line = src_img->data( ) + ( y * src_img->pitch( ) );
+
+ for ( int x = 0; x < dst_width; x ++ )
+ {
+ *dst ++ = ( unsigned char )( *line );
+ line += 3;
+ }
- *dst[ 0 ] ++ = ( unsigned char )y[ 0 ];
- *dst[ 0 ] ++ = ( unsigned char )y[ 1 ];
- *dst[ 1 ] ++ = ( unsigned char )y[ 2 ];
- *dst[ 1 ] ++ = ( unsigned char )y[ 3 ];
-
- *dst[ 2 ] ++ = ( unsigned char )( ( u[ 0 ] + u[ 1 ] + u[ 2 ] + u[ 3 ] ) >> 2 );
- *dst[ 3 ] ++ = ( unsigned char )( ( v[ 0 ] + v[ 1 ] + v[ 2 ] + v[ 3 ] ) >> 2 );
-
- width -= 2;
+ dst += dst_rem;
+ }
}
+ else
+ {
+ size_type src_width = src_img->width( );
+ size_type x_factor = ( src_width << 8 ) / dst_width;
- src[ 0 ] += src_pitch;
- src[ 1 ] += src_pitch;
+ for ( int y = 0; y < dst_height; y ++ )
+ {
+ const_pointer line = src_img->data( ) + ( ( ( y * y_factor ) >> 8 ) * src_img->pitch( ) );
- dst[ 0 ] += dst_pitch[ 0 ];
- dst[ 1 ] += dst_pitch[ 0 ];
- dst[ 2 ] += dst_pitch[ 1 ];
- dst[ 3 ] += dst_pitch[ 2 ];
+ for ( int x = 0; x < dst_width; x ++ )
+ *dst ++ = ( unsigned char )( line[ 3 * ( ( x * x_factor ) >> 8 ) + p ] );
- height -= 2;
+ dst += dst_rem;
+ }
+ }
}
}
return dst_img;
}
-typedef unsigned char uchar;
-#define assign3( dst, v1, v2, v3 ) *dst ++ = uchar( v1 ); *dst ++ = uchar( v2 ); *dst ++ = uchar( v3 );
-#define assign4( dst, v1, v2, v3, v4 ) *dst ++ = uchar( v1 ); *dst ++ = uchar( v2 ); *dst ++ = uchar( v3 ); *dst ++ = uchar( v4 );
-
-static image_type_ptr yuv420p_to_rgb( const image_type_ptr &src_img, const std::wstring &format, int r, int g, int b, int a )
+s...
[truncated message content] |
|
From: <gl...@us...> - 2007-05-20 17:19:42
|
Revision: 130
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=130&view=rev
Author: glslang
Date: 2007-05-20 10:19:35 -0700 (Sun, 20 May 2007)
Log Message:
-----------
+ remove qim plugin
Modified Paths:
--------------
lib/openlibraries/configure.ac
lib/openlibraries/installer/openlibraries_runtime.nsi
lib/openlibraries/installer/openlibraries_sdk.nsi
lib/openlibraries/openlibraries_vc8.sln
lib/openlibraries/src/openimagelib/plugins/Makefile.am
Removed Paths:
-------------
lib/openlibraries/src/openimagelib/plugins/qim/
Modified: lib/openlibraries/configure.ac
===================================================================
--- lib/openlibraries/configure.ac 2007-05-19 23:40:54 UTC (rev 129)
+++ lib/openlibraries/configure.ac 2007-05-20 17:19:35 UTC (rev 130)
@@ -362,7 +362,6 @@
src/openimagelib/plugins/hdr/Makefile
src/openimagelib/plugins/jpg/Makefile
src/openimagelib/plugins/png/Makefile
-src/openimagelib/plugins/qim/Makefile
src/openimagelib/plugins/quicktime/Makefile
src/openimagelib/plugins/sgi/Makefile
src/openimagelib/plugins/tga/Makefile
Modified: lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================
--- lib/openlibraries/installer/openlibraries_runtime.nsi 2007-05-19 23:40:54 UTC (rev 129)
+++ lib/openlibraries/installer/openlibraries_runtime.nsi 2007-05-20 17:19:35 UTC (rev 130)
@@ -125,8 +125,6 @@
File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_0.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_0.dll"
- File "..\src\openimagelib\plugins\qim\qim_plugin.opl"
- File "..\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-0_4_0.dll"
File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl"
File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-0_4_0.dll"
File "..\src\openmedialib\plugins\glew\glew_plugin.opl"
Modified: lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- lib/openlibraries/installer/openlibraries_sdk.nsi 2007-05-19 23:40:54 UTC (rev 129)
+++ lib/openlibraries/installer/openlibraries_sdk.nsi 2007-05-20 17:19:35 UTC (rev 130)
@@ -237,8 +237,6 @@
File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-0_4_0.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-0_4_0.dll"
- File "..\src\openimagelib\plugins\qim\qim_plugin.opl"
- File "..\src\openimagelib\plugins\qim\Multi-threaded Debug DLL\openimagelib_qim-vc80-d-0_4_0.dll"
File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl"
File "..\src\openmedialib\plugins\avformat\Multi-threaded Debug DLL\openmedialib_avformat-vc80-d-0_4_0.dll"
File "..\src\openmedialib\plugins\glew\glew_plugin.opl"
@@ -285,8 +283,6 @@
File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_0.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_0.dll"
- File "..\src\openimagelib\plugins\qim\qim_plugin.opl"
- File "..\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-0_4_0.dll"
File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl"
File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-0_4_0.dll"
File "..\src\openmedialib\plugins\glew\glew_plugin.opl"
Modified: lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- lib/openlibraries/openlibraries_vc8.sln 2007-05-19 23:40:54 UTC (rev 129)
+++ lib/openlibraries/openlibraries_vc8.sln 2007-05-20 17:19:35 UTC (rev 130)
@@ -155,12 +155,6 @@
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qim", "src\openimagelib\plugins\qim\qim_vc8.vcproj", "{A2C21D3B-0948-4724-8028-C3824213912A}"
- ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.vcproj", "{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}"
ProjectSection(ProjectDependencies) = postProject
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
@@ -514,10 +508,6 @@
{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {A2C21D3B-0948-4724-8028-C3824213912A}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {A2C21D3B-0948-4724-8028-C3824213912A}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {A2C21D3B-0948-4724-8028-C3824213912A}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {A2C21D3B-0948-4724-8028-C3824213912A}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -726,7 +716,6 @@
{972FF7FA-BDBE-400E-BDF6-59C13A6AE74D} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{4A6B0F4F-676E-4A96-A990-62464D923ED2} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{FF23E252-5FD9-4642-9563-1111B12D8EE7} = {D9066C6C-E143-472F-860E-004E481F3E0A}
- {A2C21D3B-0948-4724-8028-C3824213912A} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{291BFF23-61D3-4355-8AA5-C8BF0FE30CB0} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{227A0088-F3AE-4CA7-941C-0283D44F1678} = {D9066C6C-E143-472F-860E-004E481F3E0A}
Modified: lib/openlibraries/src/openimagelib/plugins/Makefile.am
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/Makefile.am 2007-05-19 23:40:54 UTC (rev 129)
+++ lib/openlibraries/src/openimagelib/plugins/Makefile.am 2007-05-20 17:19:35 UTC (rev 130)
@@ -11,9 +11,7 @@
hdr \
jpg \
png \
- qim \
sgi \
tga \
- tiff \
+ tiff \
quicktime
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X