Thread: [Hdrflow-svn] SF.net SVN: hdrflow: [139] trunk/lib/openlibraries/src/openimagelib
Status: Pre-Alpha
Brought to you by:
glslang
From: <gl...@us...> - 2007-05-23 20:41:16
|
Revision: 139 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=139&view=rev Author: glslang Date: 2007-05-23 13:40:55 -0700 (Wed, 23 May 2007) Log Message: ----------- + code cleanups + virtual address space of 3GB on win Modified Paths: -------------- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj trunk/lib/openlibraries/src/openimagelib/py/il.cpp Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj =================================================================== --- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138) +++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-05-23 20:40:55 UTC (rev 139) @@ -202,20 +202,6 @@ </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=".\il.cpp" - > - </File> - <File - RelativePath=".\utility.cpp" - > - </File> - </Filter> - <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" @@ -267,6 +253,20 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > </Filter> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\il.cpp" + > + </File> + <File + RelativePath=".\utility.cpp" + > + </File> + </Filter> </Files> <Globals> </Globals> Modified: trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-05-23 19:36:34 UTC (rev 138) +++ trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-05-23 20:40:55 UTC (rev 139) @@ -22,6 +22,8 @@ virtual bool store( const boost::filesystem::path& path, const image_type_ptr& image ) = 0; }; +typedef boost::shared_ptr<openimagelib_plugin> openimagelib_plugin_ptr; + } } } #endif Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138) +++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-05-23 20:40:55 UTC (rev 139) @@ -64,6 +64,7 @@ <Tool Name="VCLinkerTool" IgnoreImportLibrary="true" + AdditionalOptions="/LARGEADDRESSAWARE" ShowProgress="0" OutputFile="$(OutDir)\openimagelib_dpx-vc80-d-0_4_0.dll" LinkIncremental="2" Modified: trunk/lib/openlibraries/src/openimagelib/py/il.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/py/il.cpp 2007-05-23 19:36:34 UTC (rev 138) +++ trunk/lib/openlibraries/src/openimagelib/py/il.cpp 2007-05-23 20:40:55 UTC (rev 139) @@ -7,7 +7,6 @@ #include <openpluginlib/py/python.hpp> #include <openimagelib/il/openimagelib_plugin.hpp> -#include <openimagelib/plugins/tga/tga_plugin.hpp> #include <openimagelib/py/py.hpp> namespace fs = boost::filesystem; @@ -19,7 +18,7 @@ il::image_type_ptr load_image( const opl::opl_ptr& ptr, const std::string& path ) { - boost::shared_ptr<il::openimagelib_plugin> plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( ptr ); + il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( ptr ); if( !plug ) return il::image_type_ptr( ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-07-04 20:23:50
|
Revision: 173 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=173&view=rev Author: glslang Date: 2007-07-04 13:23:48 -0700 (Wed, 04 Jul 2007) Log Message: ----------- + more shared_ptr correctness Modified Paths: -------------- trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp Modified: trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-07-04 20:23:48 UTC (rev 173) @@ -20,7 +20,7 @@ struct IL_DECLSPEC openimagelib_plugin : public olib::openpluginlib::openplugin { virtual image_type_ptr load( openpluginlib::stream_ptr stream ) = 0; - virtual bool store( openpluginlib::stream_ptr stream, const image_type_ptr& image ) = 0; + virtual bool store( openpluginlib::stream_ptr stream, image_type_ptr image ) = 0; }; typedef boost::shared_ptr<openimagelib_plugin> openimagelib_plugin_ptr; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -90,7 +90,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return il::image_type_ptr( ); } - virtual bool store( pl::stream_ptr stream, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr stream, il::image_type_ptr ) { return false; } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -21,7 +21,7 @@ virtual il::image_type_ptr load( pl::stream_ptr ) { return il::image_type_ptr( ); } - virtual bool store( pl::stream_ptr, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr, il::image_type_ptr ) { return false; } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -205,7 +205,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_dds( stream ); } - virtual bool store( pl::stream_ptr, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr, il::image_type_ptr ) { return false; } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -839,7 +839,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_dpx( stream ); } - virtual bool store( pl::stream_ptr stream, const il::image_type_ptr& im ) + virtual bool store( pl::stream_ptr stream, il::image_type_ptr im ) { return store_dpx( stream, im ); } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -61,7 +61,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_exr( stream ); } - virtual bool store( pl::stream_ptr, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr, il::image_type_ptr ) { return false; } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -150,7 +150,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_image( stream ); } - virtual bool store( pl::stream_ptr, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr, il::image_type_ptr ) { return false; } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -271,7 +271,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_hdr( stream ); } - virtual bool store( pl::stream_ptr stream, const il::image_type_ptr& im ) + virtual bool store( pl::stream_ptr stream, il::image_type_ptr im ) { return store_hdr( stream, im ); } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -295,7 +295,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_jpg( stream ); } - virtual bool store( pl::stream_ptr stream, const il::image_type_ptr& im ) + virtual bool store( pl::stream_ptr stream, il::image_type_ptr im ) { return store_jpg( stream, im ); } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -102,7 +102,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_png( stream ); } - virtual bool store( pl::stream_ptr, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr, il::image_type_ptr ) { return false; } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -76,7 +76,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_psd( stream ); } - virtual bool store( pl::stream_ptr, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr, il::image_type_ptr ) { return false; } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -118,7 +118,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_quicktime( stream ); } - virtual bool store( pl::stream_ptr stream, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr stream, il::image_type_ptr ) { return false; } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -267,7 +267,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_sgi( stream ); } - virtual bool store( pl::stream_ptr, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr, il::image_type_ptr ) { return false; } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -225,7 +225,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_tga( stream ); } - virtual bool store( pl::stream_ptr, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr, il::image_type_ptr ) { return false; } }; Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-07-04 06:52:17 UTC (rev 172) +++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-07-04 20:23:48 UTC (rev 173) @@ -124,7 +124,7 @@ virtual il::image_type_ptr load( pl::stream_ptr stream ) { return load_tiff( stream ); } - virtual bool store( pl::stream_ptr, const il::image_type_ptr& ) + virtual bool store( pl::stream_ptr, il::image_type_ptr ) { return false; } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2008-01-08 23:14:59
|
Revision: 399 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=399&view=rev Author: glslang Date: 2008-01-08 15:14:58 -0800 (Tue, 08 Jan 2008) Log Message: ----------- + rec709 transfer function Modified Paths: -------------- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp 2008-01-06 11:09:50 UTC (rev 398) +++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp 2008-01-08 23:14:58 UTC (rev 399) @@ -22,4 +22,20 @@ return 1.055f * powf( v, 1.0f / 2.4f ) - 0.055f; } +float to_rec709( float v ) +{ + if( v < 0.018f ) + return v * 4.5f; + else + return 1.099f * powf( v, 0.45f ) - 0.099f; +} + +float from_rec709( float v ) +{ + if( v < 0.081 ) + return v / 4.5f; + else + return powf( ( v + 0.099f) / 1.099f, 1.0f / 0.45f ); +} + } } } Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp 2008-01-06 11:09:50 UTC (rev 398) +++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp 2008-01-08 23:14:58 UTC (rev 399) @@ -11,6 +11,8 @@ namespace olib { namespace openimagelib { namespace il { IL_DECLSPEC float to_sRGB( float v ); +IL_DECLSPEC float to_rec709( float v ); +IL_DECLSPEC float from_rec709( float v ); } } } Modified: trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp 2008-01-06 11:09:50 UTC (rev 398) +++ trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp 2008-01-08 23:14:58 UTC (rev 399) @@ -18,6 +18,8 @@ void py_lut_functions( ) { py::def( "to_sRGB", &il::to_sRGB ); + py::def( "to_rec709", &il::to_rec709 ); + py::def( "from_rec709", &il::from_rec709 ); } } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2008-01-27 14:52:06
|
Revision: 404 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=404&view=rev Author: glslang Date: 2008-01-27 06:52:03 -0800 (Sun, 27 Jan 2008) Log Message: ----------- + better names + update py bindings Modified Paths: -------------- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp 2008-01-27 13:36:47 UTC (rev 403) +++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp 2008-01-27 14:52:03 UTC (rev 404) @@ -47,7 +47,7 @@ return ( powf( 10.0f, ( v - 685.0f ) * ( 0.002f / 0.6f ) ) - dpx_black_offset ) / ( 1.0f - dpx_black_offset ); } -float from_dpxLog_byte_scaled( float v ) +float from_dpxLog_normalised( float v ) { return from_dpxLog( v ) * 1.0f / 1023.0f; } Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp 2008-01-27 13:36:47 UTC (rev 403) +++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp 2008-01-27 14:52:03 UTC (rev 404) @@ -14,7 +14,7 @@ IL_DECLSPEC float to_rec709( float v ); IL_DECLSPEC float from_rec709( float v ); IL_DECLSPEC float from_dpxLog( float v ); -IL_DECLSPEC float from_dpxLog_byte_scaled( float v ); +IL_DECLSPEC float from_dpxLog_normalised( float v ); } } } Modified: trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp =================================================================== --- trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp 2008-01-27 13:36:47 UTC (rev 403) +++ trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp 2008-01-27 14:52:03 UTC (rev 404) @@ -20,6 +20,8 @@ py::def( "to_sRGB", &il::to_sRGB ); py::def( "to_rec709", &il::to_rec709 ); py::def( "from_rec709", &il::from_rec709 ); + py::def( "from_dpxLog", &il::from_dpxLog ); + py::def( "from_dpxLog_normalised", &il::from_dpxLog_normalised ); } } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |