[Hdrflow-svn] SF.net SVN: hdrflow: [389] trunk/lib
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [389] trunk/lib
|
From: <gl...@us...> - 2007-12-30 16:50:01
|
Revision: 389
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=389&view=rev
Author: glslang
Date: 2007-12-30 08:49:57 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
+ removes unneeded const
+ some stubs for luts and hd photo
Modified Paths:
--------------
trunk/lib/extras/extras_vc8.sln
trunk/lib/extras/src/noise/noise.cpp
trunk/lib/extras/src/panoramic/panoramic.cpp
trunk/lib/extras/src/ppm/ppm_plugin.cpp
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/ml/filter.hpp
trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_input.h
trunk/lib/openlibraries/src/openmedialib/py/ml.cpp
Added Paths:
-----------
trunk/lib/extras/src/lut/
trunk/lib/extras/src/lut/lut.cpp
trunk/lib/extras/src/lut/lut_vc8.vcproj
trunk/lib/extras/src/wic/
trunk/lib/extras/src/wic/wic.cpp
trunk/lib/extras/src/wic/wic_vc8.vcproj
Modified: trunk/lib/extras/extras_vc8.sln
===================================================================
--- trunk/lib/extras/extras_vc8.sln 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/extras/extras_vc8.sln 2007-12-30 16:49:57 UTC (rev 389)
@@ -28,6 +28,14 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "readers", "src\imf\mfn\readers_vc8.vcproj", "{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LUTs", "LUTs", "{078F108D-642B-417D-99C6-F05C8266C57E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lut", "src\lut\lut_vc8.vcproj", "{80F6C766-D2FB-4744-AAAD-0DC99094DCDD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WIC", "WIC", "{4861599B-D7E9-4C5B-83FE-2ECF7484C18E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wic", "src\wic\wic_vc8.vcproj", "{DA08A396-4003-4A9F-85DC-45A270300CD1}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -58,6 +66,14 @@
{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {80F6C766-D2FB-4744-AAAD-0DC99094DCDD}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {80F6C766-D2FB-4744-AAAD-0DC99094DCDD}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {80F6C766-D2FB-4744-AAAD-0DC99094DCDD}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {80F6C766-D2FB-4744-AAAD-0DC99094DCDD}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {DA08A396-4003-4A9F-85DC-45A270300CD1}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {DA08A396-4003-4A9F-85DC-45A270300CD1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {DA08A396-4003-4A9F-85DC-45A270300CD1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {DA08A396-4003-4A9F-85DC-45A270300CD1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -69,11 +85,15 @@
{CE7A290A-13C0-424E-A02A-96CDC6B0E6BE} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
{4E0BD6BF-2B4D-4BF8-BEB7-3BFF57D627BC} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
{0CED7D48-905C-4C67-96B9-668B7728ED10} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
+ {078F108D-642B-417D-99C6-F05C8266C57E} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
+ {4861599B-D7E9-4C5B-83FE-2ECF7484C18E} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8} = {675FBBBA-6681-49E3-AAC6-FE371310DA63}
{927446CD-3483-4CCF-B581-F0896DD4A550} = {E0C3CF4A-5F43-4BBC-B7A9-6D4CDB225CD9}
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373} = {D133B05E-F174-4CDA-8FF4-C45C139CFACD}
{9A2197B4-ABC1-4047-A81B-15E9D228C108} = {CE7A290A-13C0-424E-A02A-96CDC6B0E6BE}
{95CD0C43-860C-467B-9995-E6A4E0F8519B} = {4E0BD6BF-2B4D-4BF8-BEB7-3BFF57D627BC}
{061A3FF5-B3C6-4CDC-A018-5B985C234CD6} = {0CED7D48-905C-4C67-96B9-668B7728ED10}
+ {80F6C766-D2FB-4744-AAAD-0DC99094DCDD} = {078F108D-642B-417D-99C6-F05C8266C57E}
+ {DA08A396-4003-4A9F-85DC-45A270300CD1} = {4861599B-D7E9-4C5B-83FE-2ECF7484C18E}
EndGlobalSection
EndGlobal
Added: trunk/lib/extras/src/lut/lut.cpp
===================================================================
--- trunk/lib/extras/src/lut/lut.cpp (rev 0)
+++ trunk/lib/extras/src/lut/lut.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -0,0 +1,93 @@
+
+// lut - LUTs image generation
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.hdrflow.com.
+
+#ifdef HAVE_CONFIG_H
+#include <openlibraries_global_config.hpp>
+#endif
+
+#ifdef WIN32
+#define _USE_MATH_DEFINES
+#include <cmath>
+#endif
+
+#include <openmedialib/ml/openmedialib_plugin.hpp>
+
+namespace pl = olib::openpluginlib;
+namespace il = olib::openimagelib::il;
+namespace ml = olib::openmedialib::ml;
+namespace pcos = olib::openpluginlib::pcos;
+
+namespace hdrflow {
+
+class ML_PLUGIN_DECLSPEC gamma_input : public ml::input_type
+{
+public:
+ explicit gamma_input( )
+ : prop_width_( pcos::key::from_string( "width" ) )
+ , prop_height_( pcos::key::from_string( "height" ) )
+ , prop_bitdepth_( pcos::key::from_string( "bitdepth" ) )
+ , prop_is_float_( pcos::key::from_string( "is_float" ) )
+ { }
+
+ virtual ~gamma_input( ) { }
+
+ virtual pl::wstring get_uri( ) const { return L"gamma:"; }
+ virtual pl::wstring get_mime_type( ) const { return L""; }
+
+
+
+private:
+ pcos::property prop_width_;
+ pcos::property prop_height_;
+ pcos::property prop_bitdepth_;
+ pcos::property prop_is_float_;
+};
+
+class ML_PLUGIN_DECLSPEC lut_plugin : public ml::openmedialib_plugin
+{
+public:
+ virtual ml::input_type_ptr input( const pl::wstring& request )
+ {
+ return ml::input_type_ptr( );
+ }
+};
+
+}
+
+extern "C"
+{
+ ML_PLUGIN_DECLSPEC bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ ML_PLUGIN_DECLSPEC bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ ML_PLUGIN_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new hdrflow::lut_plugin;
+ return true;
+ }
+
+ ML_PLUGIN_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+ {
+ delete static_cast<hdrflow::lut_plugin*>( plug );
+ }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Property changes on: trunk/lib/extras/src/lut/lut.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/extras/src/lut/lut_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/lut/lut_vc8.vcproj (rev 0)
+++ trunk/lib/extras/src/lut/lut_vc8.vcproj 2007-12-30 16:49:57 UTC (rev 389)
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="lut"
+ ProjectGUID="{80F6C766-D2FB-4744-AAAD-0DC99094DCDD}"
+ RootNamespace="lut"
+ 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)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ML_PLUGIN_EXPORTS;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"
+ OutputFile="$(OutDir)\hdrflow_extras_lut-vc80-d-0_1_0.dll"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
+ 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)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ML_PLUGIN_EXPORTS;HAVE_FLEX_STRING"
+ ExceptionHandling="2"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
+ OutputFile="$(OutDir)\hdrflow_extras_lut-vc80-r-0_1_0.dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ 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=".\lut.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>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/lib/extras/src/lut/lut_vc8.vcproj
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/lib/extras/src/noise/noise.cpp
===================================================================
--- trunk/lib/extras/src/noise/noise.cpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/extras/src/noise/noise.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -66,7 +66,7 @@
{ }
public:
- const pl::wstring get_uri( ) const { return L"panoramic:"; }
+ virtual pl::wstring get_uri( ) const { return L"panoramic:"; }
ml::frame_type_ptr fetch( )
{
Modified: trunk/lib/extras/src/panoramic/panoramic.cpp
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic.cpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/extras/src/panoramic/panoramic.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -76,7 +76,7 @@
}
public:
- const pl::wstring get_uri( ) const { return L"panoramic:"; }
+ virtual pl::wstring get_uri( ) const { return L"panoramic:"; }
ml::frame_type_ptr fetch( )
{
Modified: trunk/lib/extras/src/ppm/ppm_plugin.cpp
===================================================================
--- trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -11,6 +11,10 @@
# define PPM_DECLSPEC __attribute__( ( visibility( "default" ) ) )
#endif
+#ifdef HAVE_CONFIG_H
+#include <openlibraries_global_config.hpp>
+#endif
+
#include <openimagelib/il/openimagelib_plugin.hpp>
namespace il = olib::openimagelib::il;
Added: trunk/lib/extras/src/wic/wic.cpp
===================================================================
--- trunk/lib/extras/src/wic/wic.cpp (rev 0)
+++ trunk/lib/extras/src/wic/wic.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -0,0 +1,121 @@
+
+// wic - Windows Image Component plugin
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.hdrflow.com.
+
+#ifdef WIN32
+# define WIC_DECLSPEC __declspec( dllexport )
+#else
+# define WIC_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include <openlibraries_global_config.hpp>
+#endif
+
+#include <wincodec.h>
+#include <wincodecsdk.h>
+
+#include <openpluginlib/pl/utf8_utils.hpp>
+
+#include <openimagelib/il/openimagelib_plugin.hpp>
+
+namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
+
+namespace hdrflow {
+
+namespace
+{
+ il::image_type_ptr GUID_to_pf( WICPixelFormatGUID guid, UINT width, UINT height )
+ {
+ return il::image_type_ptr( );
+ }
+
+ il::image_type_ptr load_wic( const pl::string& uri )
+ {
+# define SAFE_RELEASE( p ) { if( p ) { p->Release( ); p = NULL; } }
+
+ il::image_type_ptr im;
+
+ IWICImagingFactory* wic_factory = NULL;
+ IWICBitmapDecoder* decoder = NULL;
+ IWICBitmapFrameDecode* frame = NULL;
+
+ HRESULT hr = CoCreateInstance( CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, IID_IWICImagingFactory, ( LPVOID* ) &wic_factory );
+ if( FAILED( hr ) )
+ goto error;
+
+ hr = wic_factory->CreateDecoderFromFilename( pl::to_wstring( uri ).c_str( ), NULL, GENERIC_READ, WICDecodeMetadataCacheOnDemand, &decoder );
+ if( FAILED( hr ) )
+ goto error;
+
+ hr = decoder->GetFrame( 0, &frame );
+ if( FAILED( hr ) )
+ goto error;
+
+ IWICBitmapSource* source = ( IWICBitmapSource* ) frame;
+ UINT width;
+ UINT height;
+ WICPixelFormatGUID pixelformat;
+
+ source->GetSize( &width, &height );
+ source->GetPixelFormat( &pixelformat );
+
+ im = GUID_to_pf( pixelformat, width, height );
+
+ error:
+ SAFE_RELEASE( decoder );
+ SAFE_RELEASE( wic_factory );
+ SAFE_RELEASE( frame );
+
+ return im;
+
+# undef SAFE_RELEASE
+ }
+}
+
+struct WIC_DECLSPEC wic_plugin : public il::openimagelib_plugin
+{
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_wic( uri ); }
+
+ virtual bool store( const pl::string&, il::image_type_ptr )
+ { return false; }
+};
+
+}
+
+extern "C"
+{
+ WIC_DECLSPEC bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ WIC_DECLSPEC bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ WIC_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new hdrflow::wic_plugin;
+ return true;
+ }
+
+ WIC_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<hdrflow::wic_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Property changes on: trunk/lib/extras/src/wic/wic.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/extras/src/wic/wic_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/wic/wic_vc8.vcproj (rev 0)
+++ trunk/lib/extras/src/wic/wic_vc8.vcproj 2007-12-30 16:49:57 UTC (rev 389)
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="wic"
+ ProjectGUID="{DA08A396-4003-4A9F-85DC-45A270300CD1}"
+ RootNamespace="wic"
+ 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)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1";C:\Program Files\Microsoft SDKs\Windows\v6.0\Include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WIC_EXPORTS;HAVE_FLEX_STRING"
+ MinimalRebuild="true"
+ ExceptionHandling="2"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="false"
+ 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="windowscodecs.lib"
+ OutputFile="$(OutDir)\hdrflow_extras_wic-vc80-d-0_1_0.dll"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)";C:\Program Files\Microsoft SDKs\Windows\v6.0\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)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1";C:\Program Files\Microsoft SDKs\Windows\v6.0\Include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIC_EXPORTS;HAVE_FLEX_STRING"
+ ExceptionHandling="2"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
+ AdditionalDependencies="windowscodecs.lib"
+ OutputFile="$(OutDir)\hdrflow_extras_wic-vc80-r-0_1_0.dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)";C:\Program Files\Microsoft SDKs\Windows\v6.0\lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ 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=".\wic.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>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/lib/extras/src/wic/wic_vc8.vcproj
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -355,7 +355,7 @@
properties( ).append( prop_maxval_ = ( std::numeric_limits<float>::max )( ) );
}
- virtual const opl::wstring get_uri( ) const { return L"tm_linear"; }
+ virtual opl::wstring get_uri( ) const { return L"tm_linear"; }
virtual frame_type_ptr fetch( )
{
@@ -392,7 +392,7 @@
properties( ).append( prop_knee_high_ = 5.0f );
}
- virtual const opl::wstring get_uri( ) const { return L"tm_ilm_exr"; }
+ virtual opl::wstring get_uri( ) const { return L"tm_ilm_exr"; }
virtual frame_type_ptr fetch( )
{
@@ -428,7 +428,7 @@
properties( ).append( prop_ldmax_ = 100.0f );
}
- virtual const opl::wstring get_uri( ) const { return L"tm_ferwerda"; }
+ virtual opl::wstring get_uri( ) const { return L"tm_ferwerda"; }
virtual frame_type_ptr fetch( )
{
Modified: trunk/lib/openlibraries/src/openmedialib/ml/filter.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/filter.hpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/ml/filter.hpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -62,9 +62,9 @@
// implementation of these methods should be sufficient for the majority of cases.
// Basic information
- virtual const openpluginlib::wstring get_uri( ) const = 0;
+ virtual openpluginlib::wstring get_uri( ) const = 0;
- virtual const openpluginlib::wstring get_mime_type( ) const
+ virtual openpluginlib::wstring get_mime_type( ) const
{ return slots_[ 0 ] ? slots_[ 0 ]->get_mime_type( ) : L""; }
// Audio/Visual
Modified: trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/input.hpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/ml/input.hpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -83,8 +83,8 @@
void register_callback( input_callback_ptr callback ) { callback_ = callback; }
// Basic information
- virtual const openpluginlib::wstring get_uri( ) const = 0;
- virtual const openpluginlib::wstring get_mime_type( ) const = 0;
+ virtual openpluginlib::wstring get_uri( ) const = 0;
+ virtual openpluginlib::wstring get_mime_type( ) const = 0;
// Audio/Visual
virtual int get_frames( ) const = 0;
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -14,6 +14,10 @@
#include <windows.h>
#endif // WIN32
+#ifndef INT64_C
+#define INT64_C(x) x ## LL
+#endif // INT64_C
+
#include <iostream>
#include <cstdlib>
#include <vector>
@@ -27,7 +31,6 @@
#include <boost/thread/condition.hpp>
#include <boost/thread/recursive_mutex.hpp>
-
extern "C" {
#include <avformat.h>
}
@@ -1724,8 +1727,8 @@
}
// Basic information
- virtual const opl::wstring get_uri( ) const { return uri_; }
- virtual const opl::wstring get_mime_type( ) const { return mime_type_; }
+ virtual opl::wstring get_uri( ) const { return uri_; }
+ virtual opl::wstring get_mime_type( ) const { return mime_type_; }
virtual bool has_video( ) const { return prop_video_index_.value< int >( ) != -1 && video_indexes_.size( ) > 0; }
virtual bool has_audio( ) const { return prop_audio_index_.value< int >( ) != -1 && audio_indexes_.size( ) > 0; }
@@ -1956,7 +1959,7 @@
free(out_buffer_);
}
- virtual const opl::wstring get_uri( ) const { return L"resampler"; }
+ virtual opl::wstring get_uri( ) const { return L"resampler"; }
void cache( int pos, input_type_ptr input )
{
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.cpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -102,8 +102,8 @@
virtual ~colour_input( ) { }
// Basic information
- virtual const opl::wstring get_uri( ) const { return L"colour:"; }
- virtual const opl::wstring get_mime_type( ) const { return L""; }
+ virtual opl::wstring get_uri( ) const { return L"colour:"; }
+ virtual opl::wstring get_mime_type( ) const { return L""; }
// Audio/Visual
virtual int get_frames( ) const { return prop_out_.value< int >( ); }
@@ -210,8 +210,8 @@
virtual ~pusher_input( ) { }
// Basic information
- virtual const opl::wstring get_uri( ) const { return L"pusher:"; }
- virtual const opl::wstring get_mime_type( ) const { return L""; }
+ virtual opl::wstring get_uri( ) const { return L"pusher:"; }
+ virtual opl::wstring get_mime_type( ) const { return L""; }
// Audio/Visual
virtual int get_frames( ) const { return int( queue_.size( ) ); }
@@ -281,7 +281,7 @@
properties( ).append( prop_v_ = 128 );
}
- virtual const opl::wstring get_uri( ) const { return L"chroma"; }
+ virtual opl::wstring get_uri( ) const { return L"chroma"; }
virtual frame_type_ptr fetch( )
{
@@ -344,7 +344,7 @@
properties( ).append( prop_channels_ = 2 );
}
- virtual const opl::wstring get_uri( ) const { return L"conform"; }
+ virtual opl::wstring get_uri( ) const { return L"conform"; }
virtual frame_type_ptr fetch( )
{
@@ -434,7 +434,7 @@
properties( ).append( prop_rh_ = 1.0 );
}
- virtual const opl::wstring get_uri( ) const { return L"crop"; }
+ virtual opl::wstring get_uri( ) const { return L"crop"; }
virtual frame_type_ptr fetch( )
{
@@ -582,7 +582,7 @@
properties( ).append( prop_interp_ = opl::wstring( L"bilinear" ) );
}
- virtual const opl::wstring get_uri( ) const { return L"composite"; }
+ virtual opl::wstring get_uri( ) const { return L"composite"; }
virtual const size_t slot_count( ) const { return 2; }
@@ -950,7 +950,7 @@
properties( ).append( prop_saturation_ = 1.0 );
}
- virtual const opl::wstring get_uri( ) const { return L"correction"; }
+ virtual opl::wstring get_uri( ) const { return L"correction"; }
virtual frame_type_ptr fetch( )
{
@@ -1110,7 +1110,7 @@
prop_active_.set( 0 );
}
- virtual const opl::wstring get_uri( ) const { return L"threader"; }
+ virtual opl::wstring get_uri( ) const { return L"threader"; }
void update_active( )
{
@@ -1290,7 +1290,7 @@
return map_source_to_dest( src_frames_ );
}
- virtual const opl::wstring get_uri( ) const { return L"frame_rate"; }
+ virtual opl::wstring get_uri( ) const { return L"frame_rate"; }
virtual void seek( const int position, const bool relative = false )
{
@@ -1465,7 +1465,7 @@
return frames < 0 ? - frames : frames;
}
- virtual const opl::wstring get_uri( ) const { return L"clip"; }
+ virtual opl::wstring get_uri( ) const { return L"clip"; }
virtual void seek( const int position, const bool relative = false )
{
@@ -1565,7 +1565,7 @@
{
}
- virtual const opl::wstring get_uri( ) const { return L"deinterlace"; }
+ virtual opl::wstring get_uri( ) const { return L"deinterlace"; }
virtual frame_type_ptr fetch( )
{
@@ -1592,7 +1592,7 @@
{
}
- virtual const opl::wstring get_uri( ) const { return L"lerp"; }
+ virtual opl::wstring get_uri( ) const { return L"lerp"; }
virtual frame_type_ptr fetch( )
{
@@ -1651,7 +1651,7 @@
{
public:
bezier_filter( ) : lerp_filter( ) { }
- virtual const opl::wstring get_uri( ) const { return L"bezier"; }
+ virtual opl::wstring get_uri( ) const { return L"bezier"; }
protected:
typedef struct
@@ -1771,7 +1771,7 @@
properties( ).append( prop_colourspace_ = opl::wstring( L"r8g8b8" ) );
}
- virtual const opl::wstring get_uri( ) const { return L"visualise"; }
+ virtual opl::wstring get_uri( ) const { return L"visualise"; }
virtual frame_type_ptr fetch( )
{
@@ -1955,7 +1955,7 @@
virtual const size_t slot_count( ) const { return size_t( prop_slots_.value< int >( ) ); }
- virtual const opl::wstring get_uri( ) const { return L"playlist"; }
+ virtual opl::wstring get_uri( ) const { return L"playlist"; }
virtual int get_frames( ) const
{
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -2147,7 +2147,7 @@
plug_->mainEntry( kOfxActionUnload, 0, 0, 0 );
}
- virtual const opl::wstring get_uri( ) const
+ virtual opl::wstring get_uri( ) const
{ return pl::to_wstring( plug_->pluginIdentifier ); }
virtual frame_type_ptr fetch( )
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -256,8 +256,8 @@
}
// Basic information
- virtual const pl::wstring get_uri( ) const { return resource_; }
- virtual const pl::wstring get_mime_type( ) const { return L""; }
+ virtual pl::wstring get_uri( ) const { return resource_; }
+ virtual pl::wstring get_mime_type( ) const { return L""; }
virtual bool has_video( ) const { return files_.size( ) > 0; }
virtual bool has_audio( ) const { return false; }
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_input.h
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_input.h 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_input.h 2007-12-30 16:49:57 UTC (rev 389)
@@ -123,8 +123,8 @@
virtual bool is_seekable( ) const { return true; }
- virtual const opl::wstring get_uri( ) const { return uri_; }
- virtual const opl::wstring get_mime_type( ) const { return mime_type_; }
+ virtual opl::wstring get_uri( ) const { return uri_; }
+ virtual opl::wstring get_mime_type( ) const { return mime_type_; }
virtual double fps( ) const
{
Modified: trunk/lib/openlibraries/src/openmedialib/py/ml.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/ml.cpp 2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/py/ml.cpp 2007-12-30 16:49:57 UTC (rev 389)
@@ -30,14 +30,14 @@
if ( method ) method( );
}
- virtual const openpluginlib::wstring get_uri( ) const
+ virtual openpluginlib::wstring get_uri( ) const
{
py::override method = get_override( "get_uri" );
if ( method ) return method( );
return openpluginlib::wstring( L"" );
}
- virtual const openpluginlib::wstring get_mime_type( ) const
+ virtual openpluginlib::wstring get_mime_type( ) const
{
py::override method = get_override( "get_mime_type" );
if ( method ) return method( );
@@ -139,7 +139,7 @@
if ( method ) method( );
}
- virtual const openpluginlib::wstring get_uri( ) const
+ virtual openpluginlib::wstring get_uri( ) const
{
py::override method = get_override( "get_uri" );
if ( method ) return method( );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
