[Hdrflow-svn] SF.net SVN: hdrflow: [355] trunk/lib/openlibraries/src/openimagelib/plugins /exr/exr_plugin.cpp

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

Revision: 355
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=355&view=rev
Author:   glslang
Date:     2007-10-12 13:56:05 -0700 (Fri, 12 Oct 2007)

Log Message:
-----------
+ reverts back bad checkin

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp	2007-10-12 20:53:22 UTC (rev 354)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp	2007-10-12 20:56:05 UTC (rev 355)
@@ -5,9 +5,8 @@
 // Released under the LGPL.
 // For more information, see http://www.openlibraries.org.
 
-//#include <ImfRgbaFile.h>
-#include <ImfInputFile.h>
-//#include <ImfOutputFile.h>
+#include <ImfRgbaFile.h>
+#include <ImfCRgbaFile.h>
 #include <ImfArray.h>
 
 #include <openimagelib/il/openimagelib_plugin.hpp>
@@ -23,15 +22,9 @@
 	{ delete im; }
 
 	il::image_type_ptr load_exr( const pl::string& uri )
-	{printf("EXR IMAGE FILE %s\n", uri.c_str());
-		try
-		{
-			Imf::InputFile file( uri.c_str( ) );
-		}
-		catch( ... )
-		{
-		}
-/*
+	{
+		Imf::RgbaInputFile file( uri.c_str( ) );
+		
 		Imath::Box2i dw = file.header( ).dataWindow( );
 		int width  = dw.max.x - dw.min.x + 1;
 		int height = dw.max.y - dw.min.y + 1;
@@ -59,8 +52,7 @@
 			texels += ( im->pitch( ) - im->linesize( ) ) * sizeof( float );
 		}
 
-		return im;*/
-		return il::image_type_ptr( );
+		return im;
 	}
 }
 


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