[Hdrflow-svn] SF.net SVN: hdrflow: [191] trunk/app/HDRFlow

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

Revision: 191
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=191&view=rev
Author:   glslang
Date:     2007-07-17 14:32:29 -0700 (Tue, 17 Jul 2007)

Log Message:
-----------
+beauty fixes

Modified Paths:
--------------
    trunk/app/HDRFlow/ScriptEngine.cpp
    trunk/app/HDRFlow/Scripts/bootstrap.py
    trunk/app/HDRFlow/ViewportOpenGLView.h
    trunk/app/HDRFlow/ViewportOpenGLView.m

Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp	2007-07-16 21:47:28 UTC (rev 190)
+++ trunk/app/HDRFlow/ScriptEngine.cpp	2007-07-17 21:32:29 UTC (rev 191)
@@ -47,9 +47,8 @@
 
 	try
 	{
-		py::handle<> handle;
-		if( !( handle = 
-				py::handle<>( py::allow_null( PyRun_String( str.c_str( ), Py_eval_input, main_namespace.ptr( ), main_namespace.ptr( ) ) ) ) ) )
+		py::handle<> handle( py::allow_null( PyRun_String( str.c_str( ), Py_eval_input, main_namespace.ptr( ), main_namespace.ptr( ) ) ) );
+		if( !handle ) 
 		{
 			// clear all errors so the call below has a chance to succeed.
 			PyErr_Clear( );

Modified: trunk/app/HDRFlow/Scripts/bootstrap.py
===================================================================
--- trunk/app/HDRFlow/Scripts/bootstrap.py	2007-07-16 21:47:28 UTC (rev 190)
+++ trunk/app/HDRFlow/Scripts/bootstrap.py	2007-07-17 21:32:29 UTC (rev 191)
@@ -5,7 +5,9 @@
 # Released under the GPL.
 # For more information, see http://www.cryogenicgraphics.com/hdrflow.
 
+import platform
 import sys
+import os.path
 
 sys.path.append( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowPlugin.framework/PlugIns" )
 sys.path.append( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowImage.framework/PlugIns" )
@@ -15,3 +17,15 @@
 import HDRFlowImage
 import HDRFlowMedia
 
+if platform.system( ) == "Linux":
+	try:
+		import dl
+		sys.setdlopenflags( dl.RTLD_NOW | dl.RTLD_GLOBAL )
+	except:
+		sys.setdlopenflags( 257 )
+		
+if platform.system( ) == "Darwin":
+	HDRFlowPlugin.init( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowImage.framework/PlugIns" )
+	HDRFlowPlugin.init( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowMedia.framework/PlugIns" )
+else:
+	HDRFlowPlugin.init( )

Modified: trunk/app/HDRFlow/ViewportOpenGLView.h
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.h	2007-07-16 21:47:28 UTC (rev 190)
+++ trunk/app/HDRFlow/ViewportOpenGLView.h	2007-07-17 21:32:29 UTC (rev 191)
@@ -18,4 +18,6 @@
 - ( void ) drawRect: ( NSRect ) theRect;
 - ( void ) update;
 
+- ( BOOL ) fullscreen;
+
 @end

Modified: trunk/app/HDRFlow/ViewportOpenGLView.m
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.m	2007-07-16 21:47:28 UTC (rev 190)
+++ trunk/app/HDRFlow/ViewportOpenGLView.m	2007-07-17 21:32:29 UTC (rev 191)
@@ -75,4 +75,9 @@
 		;
 }
 
+- ( BOOL ) fullscreen
+{
+	return NO;
+}
+
 @end


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