[Hdrflow-svn] SF.net SVN: hdrflow: [430] trunk

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

Revision: 430
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=430&view=rev
Author:   glslang
Date:     2008-03-08 11:53:37 -0800 (Sat, 08 Mar 2008)

Log Message:
-----------
Fixes tiff float loader

Modified Paths:
--------------
    trunk/hdrflow_runtime.nsi
    trunk/hdrflow_sdk.nsi
    trunk/lib/extras/src/imf/mfn/mfn.cpp
    trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl
    trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl
    trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl

Modified: trunk/hdrflow_runtime.nsi
===================================================================
--- trunk/hdrflow_runtime.nsi	2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/hdrflow_runtime.nsi	2008-03-08 19:53:37 UTC (rev 430)
@@ -92,6 +92,8 @@
   SetOutPath $INSTDIR\DLLs
   File "lib\openlibraries\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
   File "lib\openlibraries\Multi-threaded Release DLL\*.opl"
+  File "lib\extras\Multi-threaded Release DLL\*-vc80-r-*.dll"
+  File "lib\extras\Multi-threaded Release DLL\*.opl"
 
   ; dependencies
   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
@@ -111,6 +113,7 @@
   File "C:\Boost\lib\boost_thread-vc80-mt-1_34_1.dll"
   File "C:\Boost\lib\boost_iostreams-vc80-mt-1_34_1.dll"
   File "C:\Windows\System32\glew32.dll"
+  File "C:\libtiff\bin\libtiff.dll"
   
   ; Python
   SetOutPath $INSTDIR\python
@@ -162,7 +165,8 @@
   
 SectionEnd
 
-Section "Windows CRT DLLs" ms_crt_dlls
+Section "Windows CRT DLLs" -
+SectionIn RO
 
   SectionIn 1
   SetOutPath $INSTDIR
@@ -184,6 +188,7 @@
 SectionEnd
 
 Section "MSXML6 SP1"
+SectionIn RO
 
   SectionIn 1
   SetOutPath $INSTDIR

Modified: trunk/hdrflow_sdk.nsi
===================================================================
--- trunk/hdrflow_sdk.nsi	2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/hdrflow_sdk.nsi	2008-03-08 19:53:37 UTC (rev 430)
@@ -173,6 +173,7 @@
   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
   File "C:\zlib\lib\zlib1.dll"
+  File "C:\libtiff\bin\libtiff.dll"
 
   ; Python
   SetOutPath $INSTDIR\python

Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp	2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp	2008-03-08 19:53:37 UTC (rev 430)
@@ -67,7 +67,10 @@
 		input_ = ml::create_input( resource );
 
 		if( !input_ )
+		{
+			MGlobal::displayInfo( "HDRFlow: Internal Error: unable to create input. Please report to su...@cr...." );
 			return MS::kFailure;
+		}
 	}
 
 #ifndef NDEBUG
@@ -76,7 +79,10 @@
 
 	ml::frame_type_ptr frame = input_->fetch( );
 	if( !frame )
+	{
+		MGlobal::displayInfo( "HDRFlow: Internal Error: unable to fetch image. Please report to su...@cr...." );
 		return MS::kFailure;
+	}
 
 #ifndef NDEBUG
 	MGlobal::displayInfo( "HDRFlow: frame found ..." );
@@ -84,7 +90,10 @@
 
 	il::image_type_ptr im = frame->get_image( );
 	if( !im )
+	{
+		MGlobal::displayInfo( "HDRFlow: Internal Error: unable to get image from frame. Please report to su...@cr...." );
 		return MS::kFailure;
+	}
 
 #ifndef NDEBUG
 	MGlobal::displayInfo( "HDRFlow: image stream found ..." );
@@ -111,7 +120,10 @@
 	input_->seek( idx );
 	ml::frame_type_ptr frame = input_->fetch( );
 	if( !frame )
+	{
+		MGlobal::displayInfo( "HDRFlow: Internal Error: unable to fetch image. Please report to su...@cr...." );
 		return MS::kFailure;
+	}
 
 	il::image_type_ptr im = il::convert( frame->get_image( ), L"r32g32b32a32f" );
 	if( !im )
@@ -154,7 +166,9 @@
 
 MStatus image_reader::close( )
 {
+#ifndef NDEBUG
 	MGlobal::displayInfo( "HDRFlow: closing..." );
+#endif
 
 	input_.reset( );
 	

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl	2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl	2008-03-08 19:53:37 UTC (rev 430)
@@ -2,6 +2,6 @@
 <openlibraries version="1.0">
 	<!-- plugins go here -->
 	<openimagelib name="oil" version="0.2.0">
-		<plugin name="OpenLibraries GDI+ plugin" type="input" in_filter="*.bmp *.gif *.jpg *.jpeg *.png, *.tif *.tiff *.wmf *.emf *.ico" extension='".*\.bmp", ".*\.gif", ".*\.jpg", ".*\.jpeg", ".*\.png", ".*\.tif", ".*\.tiff", ".*\.wmf", ".*\.emf", ".*\.ico"' merit="40" filename='"hdrflowimage_gdi-vc80-d-0_5_0.dll", "hdrflowimage_gdi-vc80-r-0_5_0.dll"'/>
+		<plugin name="OpenLibraries GDI+ plugin" type="input" in_filter="*.bmp *.gif *.jpg *.jpeg *.png, *.wmf *.emf *.ico" extension='".*\.bmp", ".*\.gif", ".*\.jpg", ".*\.jpeg", ".*\.png", ".*\.wmf", ".*\.emf", ".*\.ico"' merit="0" filename='"hdrflowimage_gdi-vc80-d-0_5_0.dll", "hdrflowimage_gdi-vc80-r-0_5_0.dll"'/>
 	</openimagelib>
 </openlibraries>

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl	2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl	2008-03-08 19:53:37 UTC (rev 430)
@@ -2,6 +2,6 @@
 <openlibraries version="1.0">
 	<!-- plugins go here -->
   <openimagelib name="oil" version="0.2.0">
-    <plugin name="OpenLibraries QuickTime plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw *.pict *.text *.gif *.png *.pics *.tiff *.psd *.tif *.bmp *.jpg *.jif *.jpeg *.tga *.qtif *.jp2" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw", ".*\.pict", ".*\.text", ".*\.gif", ".*\.png", ".*\.pics", ".*\.tiff", ".*\.psd", ".*\.tif", ".*\.bmp", ".*\.jpg", ".*\.jif", ".*\.jpeg", ".*\.tga", ".*\.qtif", ".*\.jp2"' merit="40" filename='"libopenimagelib_quicktime.so", "libopenimagelib_quicktime.dylib", "hdrflowimage_quicktime-vc80-d-0_5_0.dll", "hdrflowimage_quicktime-vc80-r-0_5_0.dll"'/>
+    <plugin name="OpenLibraries QuickTime plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw *.pict *.text *.gif *.png *.pics *.psd *.bmp *.jpg *.jif *.jpeg *.tga *.qtif *.jp2" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw", ".*\.pict", ".*\.text", ".*\.gif", ".*\.png", ".*\.pics", ".*\.psd", ".*\.bmp", ".*\.jpg", ".*\.jif", ".*\.jpeg", ".*\.tga", ".*\.qtif", ".*\.jp2"' merit="0" filename='"libopenimagelib_quicktime.so", "libopenimagelib_quicktime.dylib", "hdrflowimage_quicktime-vc80-d-0_5_0.dll", "hdrflowimage_quicktime-vc80-r-0_5_0.dll"'/>
   </openimagelib>
 </openlibraries>

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl	2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl	2008-03-08 19:53:37 UTC (rev 430)
@@ -2,7 +2,7 @@
 <openlibraries version="1.0">
 	<!-- plugins go here -->
 	<openmedialib name="oml" version="0.1.0">
-		<plugin name="OpenLibraries oil plugin" type="input" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*", ".*\.hdr/sequence:.*", ".*\.cr2/sequence:.*", ".*\.raw/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "hdrflowmedia_oil-vc80-d-0_5_0.dll", "hdrflowmedia_oil-vc80-r-0_5_0.dll"'/>
+		<plugin name="OpenLibraries oil plugin" type="input" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*", ".*\.hdr/sequence:.*", ".*\.cr2/sequence:.*", ".*\.raw/sequence:.*", ".*\.ppm/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "hdrflowmedia_oil-vc80-d-0_5_0.dll", "hdrflowmedia_oil-vc80-r-0_5_0.dll"'/>
 		<plugin name="OpenLibraries oil plugin" type="output" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "hdrflowmedia_oil-vc80-d-0_5_0.dll", "hdrflowmedia_oil-vc80-r-0_5_0.dll"'/>
 	</openmedialib>
 </openlibraries>


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