[Hdrflow-svn] SF.net SVN: hdrflow: [322] trunk/lib/extras/src

[<gl...@us...>]

Revision: 322
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=322&view=rev
Author:   glslang
Date:     2007-09-30 04:16:29 -0700 (Sun, 30 Sep 2007)

Log Message:
-----------
+ build fixes

Modified Paths:
--------------
    trunk/lib/extras/src/ppm/ppm_plugin.cpp
    trunk/lib/extras/src/raw/raw.cpp

Modified: trunk/lib/extras/src/ppm/ppm_plugin.cpp
===================================================================
--- trunk/lib/extras/src/ppm/ppm_plugin.cpp	2007-09-29 20:54:22 UTC (rev 321)
+++ trunk/lib/extras/src/ppm/ppm_plugin.cpp	2007-09-30 11:16:29 UTC (rev 322)
@@ -68,10 +68,10 @@
 
 struct PPM_DECLSPEC ppm_plugin : public il::openimagelib_plugin
 {
-	virtual il::image_type_ptr load( pl::stream_ptr stream )
-	{ return load_ppm( stream ); }
+	virtual il::image_type_ptr load( const pl::string& uri )
+	{ return load_ppm( 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/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp	2007-09-29 20:54:22 UTC (rev 321)
+++ trunk/lib/extras/src/raw/raw.cpp	2007-09-30 11:16:29 UTC (rev 322)
@@ -79,7 +79,7 @@
 		{
 			il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
 			if( plug )
-				return plug->load( pl::make_stream( output_path, std::ios::in ) );
+				return plug->load( output_path );
 		}
 		
 		return il::image_type_ptr( );
@@ -116,13 +116,13 @@
 		set_raw_properties( );
 	}
 
-	virtual il::image_type_ptr load( pl::stream_ptr stream )
+	virtual il::image_type_ptr load( const pl::string& uri )
 	{
-		raw_props_.get_property_with_key( pcos::key::from_string( "path" ) ) = stream->path( );
+		raw_props_.get_property_with_key( pcos::key::from_string( "path" ) ) = uri;
 		return dcraw( raw_props_ );
 	}
 	
-	virtual bool store( pl::stream_ptr, il::image_type_ptr )
+	virtual bool store( const pl::string&, il::image_type_ptr )
 	{ return false; }
 
 private:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.