[Hdrflow-svn] SF.net SVN: hdrflow: [318] trunk/lib/openlibraries
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [318] trunk/lib/openlibraries
|
From: <gl...@us...> - 2007-09-28 23:24:27
|
Revision: 318
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=318&view=rev
Author: glslang
Date: 2007-09-28 16:24:17 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
+ removes pl::stream from the interface. still used internally
Modified Paths:
--------------
trunk/lib/openlibraries/src/openassetlib/al/al.cpp
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
trunk/lib/openlibraries/src/openimagelib/py/il.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/appearance.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp
Modified: trunk/lib/openlibraries/src/openassetlib/al/al.cpp
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/al.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openassetlib/al/al.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -630,7 +630,7 @@
if(!plugin)
continue;
- oil::il::image_type_ptr image = boost::shared_dynamic_cast<oil::il::openimagelib_plugin>(plugin)->load( opl::make_stream( filepath, std::ios::in ));
+ oil::il::image_type_ptr image = boost::shared_dynamic_cast<oil::il::openimagelib_plugin>(plugin)->load( filepath );
if(image)
{
asset->set("width", image->width());
Modified: trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -19,8 +19,8 @@
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, image_type_ptr image ) = 0;
+ virtual image_type_ptr load( const openpluginlib::string& uri ) = 0;
+ virtual bool store( const openpluginlib::string& uri, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -87,10 +87,10 @@
class IL_DECLSPEC lightmap3D_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
+ virtual il::image_type_ptr load( const pl::string& )
{ return il::image_type_ptr( ); }
- virtual bool store( pl::stream_ptr stream, il::image_type_ptr )
+ virtual bool store( const pl::string&, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -18,10 +18,10 @@
struct IL_DECLSPEC bmp_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr )
+ virtual il::image_type_ptr load( const pl::string& )
{ return il::image_type_ptr( ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -202,10 +202,10 @@
struct IL_DECLSPEC dds_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_dds( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_dds( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -836,11 +836,11 @@
struct IL_DECLSPEC dpx_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_dpx( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_dpx( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr stream, il::image_type_ptr im )
- { return store_dpx( stream, im ); }
+ virtual bool store( const pl::string& uri, il::image_type_ptr im )
+ { return store_dpx( pl::make_stream( uri, std::ios::out ), im ); }
};
} } }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -21,9 +21,9 @@
void destroy( il::image_type* im )
{ delete im; }
- il::image_type_ptr load_exr( pl::stream_ptr stream )
+ il::image_type_ptr load_exr( const pl::string& uri )
{
- Imf::RgbaInputFile file( stream->path( ).c_str( ) );
+ Imf::RgbaInputFile file( uri.c_str( ) );
Imath::Box2i dw = file.header( ).dataWindow( );
int width = dw.max.x - dw.min.x + 1;
@@ -58,10 +58,10 @@
struct IL_DECLSPEC exr_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_exr( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_exr( uri ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -79,9 +79,9 @@
}
}
- il::image_type_ptr load_image( pl::stream_ptr stream )
+ il::image_type_ptr load_image( const pl::string& uri )
{
- Gdiplus::Bitmap bitmap( ( pl::to_wstring( stream->path( ) ) ).c_str( ) );
+ Gdiplus::Bitmap bitmap( pl::to_wstring( uri ).c_str( ) );
Gdiplus::BitmapData bitmapData;
Gdiplus::Rect rect( 0, 0, bitmap.GetWidth( ), bitmap.GetHeight( ) );
@@ -147,10 +147,10 @@
class IL_DECLSPEC gdi_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_image( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_image( uri ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -277,11 +277,11 @@
struct IL_DECLSPEC hdr_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_hdr( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_hdr( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr stream, il::image_type_ptr im )
- { return store_hdr( stream, im ); }
+ virtual bool store( const pl::string& uri, il::image_type_ptr im )
+ { return store_hdr( pl::make_stream( uri, std::ios::out ), im ); }
};
} } }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -292,11 +292,11 @@
class IL_DECLSPEC jpg_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_jpg( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_jpg( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr stream, il::image_type_ptr im )
- { return store_jpg( stream, im ); }
+ virtual bool store( const pl::string& uri, il::image_type_ptr im )
+ { return store_jpg( pl::make_stream( uri, std::ios::out ), im ); }
};
} } }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -39,10 +39,10 @@
}
}
- il::image_type_ptr load_png( pl::stream_ptr stream )
+ il::image_type_ptr load_png( const pl::string& uri )
{
// TODO: some proper exception handling is needed.
- FILE* infile = fopen( stream->path( ).c_str( ), "rb" );
+ FILE* infile = fopen( uri.c_str( ), "rb" );
if( infile == NULL ) return il::image_type_ptr( );
png_byte sig[ 8 ];
@@ -99,10 +99,10 @@
struct IL_DECLSPEC png_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_png( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_png( uri ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -73,10 +73,10 @@
class IL_DECLSPEC psd_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_psd( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_psd( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -29,13 +29,13 @@
void destroy( il::image_type* im )
{ delete im; }
- il::image_type_ptr load_quicktime( pl::stream_ptr stream )
+ il::image_type_ptr load_quicktime( const pl::string& uri )
{
OSStatus err;
FSSpec fsspec;
#ifdef WIN32
- err = NativePathNameToFSSpec( const_cast<char*>( stream->path( ).c_str( ) ), &fsspec, kErrorIfFileNotFound );
+ err = NativePathNameToFSSpec( const_cast<char*>( uri.c_str( ) ), &fsspec, kErrorIfFileNotFound );
#else
FSRef ref;
err = FSPathMakeRef( ( const UInt8* ) stream->path( ).c_str( ), &ref, 0 );
@@ -117,10 +117,10 @@
struct IL_DECLSPEC qt_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_quicktime( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_quicktime( uri ); }
- virtual bool store( pl::stream_ptr stream, il::image_type_ptr )
+ virtual bool store( const pl::string& uri, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -256,10 +256,10 @@
class IL_DECLSPEC sgi_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_sgi( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_sgi( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -222,10 +222,10 @@
class IL_DECLSPEC tga_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_tga( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_tga( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, 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-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -40,9 +40,9 @@
return il::image_type_ptr( );
}
- il::image_type_ptr load_tiff( pl::stream_ptr stream )
+ il::image_type_ptr load_tiff( const pl::string& uri )
{
- TIFF* tif = TIFFOpen( stream->path( ).c_str( ), "r" );
+ TIFF* tif = TIFFOpen( uri.c_str( ), "r" );
if( tif == NULL )
return il::image_type_ptr( );
@@ -146,10 +146,10 @@
class IL_DECLSPEC tiff_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_tiff( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_tiff( uri ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string& uri, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/py/il.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/il.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/py/il.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -22,7 +22,7 @@
if( !plug )
return il::image_type_ptr( );
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image )
return il::image_type_ptr( );
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -328,7 +328,7 @@
if ( full != last_image_name_ )
{
last_image_name_ = full;
- last_image_ = plug_->load( pl::make_stream( full, std::ios::in ) );
+ last_image_ = plug_->load( full );
if ( last_image_ )
last_image_->set_writable( false );
}
@@ -338,7 +338,7 @@
{
if ( bucket_[ index ] == image_type_ptr( ) )
{
- image_type_ptr image = plug_->load( pl::make_stream( full, std::ios::in) );
+ image_type_ptr image = plug_->load( full );
if ( image )
{
bucket_[ index ] = image;
@@ -475,7 +475,7 @@
discovery::const_iterator i = plugins.begin( );
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if ( plug == 0 ) return false;
- return plug->store( pl::make_stream( out, std::ios::out ), image );
+ return plug->store( out.str( ), image );
}
private:
Modified: trunk/lib/openlibraries/src/openobjectlib/sg/appearance.cpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/sg/appearance.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openobjectlib/sg/appearance.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -144,7 +144,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return false;
- im_ = plug->load( opl::make_stream( path.native_file_string( ), std::ios::in ) );
+ im_ = plug->load( path.native_file_string( ) );
if( !im_ ) return false;
if( !opl::is_compressed_format( im_->pf( ).c_str( ) ) && im_->count( ) == 1 && im_->depth( ) == 1 )
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -64,18 +64,18 @@
};
}
-static GLuint download_texture( const boost::filesystem::path& path )
+static GLuint download_texture( const pl::string& path )
{
typedef pl::discovery<query_traits> oil_discovery;
- oil_discovery plugins( query_traits( pl::to_wstring( path.native_file_string( ).c_str( ) ) ) );
+ oil_discovery plugins( query_traits( pl::to_wstring( path.c_str( ) ) ) );
if( plugins.empty( ) ) return 0;
oil_discovery::const_iterator i = plugins.begin( );
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( pl::make_stream( path.native_file_string( ), std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
image = il::conform( image, il::cropped | il::flipped | il::flopped );
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -73,7 +73,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_static_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
GLuint id;
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -75,7 +75,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
glActiveTexture( GL_TEXTURE0 );
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -78,7 +78,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
orig = image;
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -101,7 +101,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
orig = image;
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -74,7 +74,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
image = il::tm_linear( image );
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -98,7 +98,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
image = il::conform( image, il::cropped | il::flipped | il::flopped );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
