hdrflow-svn

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

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

Revision: 288
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=288&view=rev
Author:   glslang
Date:     2007-09-01 08:21:29 -0700 (Sat, 01 Sep 2007)

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

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

Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp	2007-09-01 14:36:14 UTC (rev 287)
+++ trunk/lib/extras/src/raw/raw.cpp	2007-09-01 15:21:29 UTC (rev 288)
@@ -60,7 +60,7 @@
 		if( dcraw_( static_cast<int>( args.size( ) ), const_cast<char**>( &args[ 0 ] ) ) )
 			return il::image_type_ptr( );
 		
-		pl::string pathname( path.begin( ), path.find_last_of( "." ) );
+		pl::string pathname( path.begin( ), path.begin( ) + path.find_last_of( "." ) );
 		pathname += ".tiff";
 		
 		typedef pl::discovery<query_traits> discovery;


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

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

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

Revision: 289
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=289&view=rev
Author:   glslang
Date:     2007-09-01 09:42:57 -0700 (Sat, 01 Sep 2007)

Log Message:
-----------
+ write 16-bit linear. ideally the parameters needs to be exposed at the app level. just trying some high-quality sensible defaults suitable for compositing

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

Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp	2007-09-01 15:21:29 UTC (rev 288)
+++ trunk/lib/extras/src/raw/raw.cpp	2007-09-01 16:42:57 UTC (rev 289)
@@ -49,11 +49,13 @@
 
 	il::image_type_ptr dcraw( pcos::property_container properties ) // TODO: change to ptr when pcos moves to proper copy semantics
 	{
+		pl::string linear_output = properties.get_property_with_key( pcos::key::from_string( "linear_output" ) ).value<pl::string>( );
 		pl::string tiff = properties.get_property_with_key( pcos::key::from_string( "tiff_output" ) ).value<pl::string>( );
 		pl::string path = properties.get_property_with_key( pcos::key::from_string( "path" ) ).value<pl::string>( );
 		
 		std::vector<const char*> args;
 		args.push_back( "dcraw" );
+		args.push_back( linear_output.c_str( ) );
 		args.push_back( tiff.c_str( ) );
 		args.push_back( path.c_str( ) );
 		
@@ -102,7 +104,7 @@
 		, half_size_( pcos::key::from_string( "half_size" ) )
 		, four_colour_interpolation_( pcos::key::from_string( "four_colour_interpolation" ) )
 		, which_raw_( pcos::key::from_string( "which_raw" ) )
-		, sRGB_output_( pcos::key::from_string( "sRGB_output" ) )
+		, linear_output_( pcos::key::from_string( "linear_output" ) )
 		, tiff_output_( pcos::key::from_string( "tiff_output" ) )
 		, path_( pcos::key::from_string( "path" ) )
 	{
@@ -139,7 +141,7 @@
 		raw_props_.append( half_size_ );
 		raw_props_.append( four_colour_interpolation_ );
 		raw_props_.append( which_raw_ );
-		raw_props_.append( sRGB_output_ );
+		raw_props_.append( linear_output_ = pl::string( "-4" ) );
 		raw_props_.append( tiff_output_ = pl::string( "-T" ) );
 		raw_props_.append( path_ = pl::string( "" ) );
 	}
@@ -164,7 +166,7 @@
 	pcos::property half_size_;
 	pcos::property four_colour_interpolation_;
 	pcos::property which_raw_;
-	pcos::property sRGB_output_;
+	pcos::property linear_output_;
 	pcos::property tiff_output_;
 	pcos::property path_;
 };


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

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

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

Revision: 434
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=434&view=rev
Author:   glslang
Date:     2008-03-31 13:01:13 -0700 (Mon, 31 Mar 2008)

Log Message:
-----------
Build fix

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

Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp	2008-03-31 19:51:26 UTC (rev 433)
+++ trunk/lib/extras/src/raw/raw.cpp	2008-03-31 20:01:13 UTC (rev 434)
@@ -73,7 +73,7 @@
 			return il::image_type_ptr( );
 
 		pl::string output = fs::path( path.c_str( ), fs::native ).leaf( );
-		output = output_prefix + "/" + pl::string( output.begin( ), output.rfind( '.' ) ) + ".ppm";
+		output = output_prefix + pl::string( "/" ) + pl::string( 0, output.rfind( '.' ) ) + pl::string( ".ppm" );
 
 		typedef pl::discovery<query_traits> discovery;
 				


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