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

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

Revision: 257
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=257&view=rev
Author:   glslang
Date:     2007-08-19 08:38:29 -0700 (Sun, 19 Aug 2007)

Log Message:
-----------
+ opl awareness of framework embedded plugins

Modified Paths:
--------------
    trunk/app/HDRFlow/PlugInsPreferencesController.mm
    trunk/lib/extras/src/imf/imf.cpp
    trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
    trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp

Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm	2007-08-19 11:35:49 UTC (rev 256)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm	2007-08-19 15:38:29 UTC (rev 257)
@@ -63,7 +63,7 @@
 	[ self initNodeMetadata: @"Image" library: @"openimagelib" type: @"" ];
 	[ self initNodeMetadata: @"Media" library: @"openmedialib" type: @"" ];
 	[ self initNodeMetadata: @"Effects" library: @"openeffectslib" type: @"" ];
-	[ self initNodeMetadata: @"OFX" library: @"" type: @"ofx" ];
+	[ self initNodeMetadata: @"OFX" library: @"OFX" type: @"ofx" ];
 }
 
 - ( void ) initNodeMetadata: ( NSString* ) name library: ( NSString* ) library type: ( NSString* ) type

Modified: trunk/lib/extras/src/imf/imf.cpp
===================================================================
--- trunk/lib/extras/src/imf/imf.cpp	2007-08-19 11:35:49 UTC (rev 256)
+++ trunk/lib/extras/src/imf/imf.cpp	2007-08-19 15:38:29 UTC (rev 257)
@@ -15,27 +15,27 @@
 
 // Mandatory entry points
 
-char* program	= "Wavefront";
-char* version	= IMF_PROTOCOL_CURRENT;
-char* type		= "image";
-char* imageKey	= "com.cryogenicgraphics.dpx";
-char* imageName = "HDRFlow DPX";
-char* imageExtension	= ".dpx";
-char* imageFormatString	= "%s.%04.4d%s";
-char* imageNameSyntax	= "Name.####.Ext";
-int	  imageAddExtension	= TRUE;
-int	  imageUsage		= IMF_C_GENERIC;
-int	  imageOrientation	= IMF_C_ORIENT_BOT_LEFT;
-int	  imageNumberOfLuts	= 0;
-U_INT imageBitsPerLut	= 0x00000000;
-int   imageNumberOfChannels	= 4;
-U_INT		imageBitsPerChannel	= 0x00000080;
-int		imageNumberOfMattes	= 1;
-U_INT		imageBitsPerMatte	= 0x00000080;
-int		imageNumberOfZChannels	= 0;
-U_INT		imageBitsPerZChannel	= 0x00000000;
-int		imageSupportsActiveWindow= FALSE;
-U_INT		imageAccess		= IMF_C_READ_RANDOM | IMF_C_WRITE;
+char* program					= "Wavefront";
+char* version					= IMF_PROTOCOL_CURRENT;
+char* type						= "image";
+char* imageKey					= "com.cryogenicgraphics.dpx";
+char* imageName					= "HDRFlow DPX";
+char* imageExtension			= ".dpx";
+char* imageFormatString			= "%s.%04.4d%s";
+char* imageNameSyntax			= "Name.####.Ext";
+int	  imageAddExtension			= TRUE;
+int	  imageUsage				= IMF_C_GENERIC;
+int	  imageOrientation			= IMF_C_ORIENT_BOT_LEFT;
+int	  imageNumberOfLuts			= 0;
+U_INT imageBitsPerLut			= 0x00000000;
+int   imageNumberOfChannels		= 4;
+U_INT imageBitsPerChannel		= 0x00000080;
+int	  imageNumberOfMattes		= 0;
+U_INT imageBitsPerMatte			= 0x00000000;
+int	  imageNumberOfZChannels	= 0;
+U_INT imageBitsPerZChannel		= 0x00000000;
+int	  imageSupportsActiveWindow	= FALSE;
+U_INT imageAccess				= IMF_C_READ_RANDOM | IMF_C_WRITE;
 
 int imageInit( void )
 {

Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp	2007-08-19 11:35:49 UTC (rev 256)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp	2007-08-19 15:38:29 UTC (rev 257)
@@ -12,6 +12,10 @@
 #include <shlobj.h>
 #endif
 
+#ifdef __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
 #include <algorithm>
 #include <cassert>
 #include <functional>
@@ -147,12 +151,16 @@
 				{
 #		ifdef WIN32
 					el_reg.insert( plugins_path( ) );
-#		else
+#		elif !defined HAVE_UMBRELLAFRAMEWORK
 					el_reg.insert( OPENIMAGELIB_PLUGINS );
 					el_reg.insert( OPENMEDIALIB_PLUGINS );
 					el_reg.insert( OPENOBJECTLIB_PLUGINS );
 					el_reg.insert( OPENASSETLIB_PLUGINS );
 					el_reg.insert( OPENEFFECTSLIB_PLUGINS );
+#		elif defined __APPLE__ && defined HAVE_UMBRELLAFRAMEWORK
+					el_reg.insert( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowImage.framework/Resources" );
+					el_reg.insert( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowMedia.framework/Resources" );
+					el_reg.insert( "/Library/Frameworks/HDRFlow.framework/Frameworks/HDRFlowEffects.framework/Resources" );
 #		endif
 				}
 				

Modified: trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp	2007-08-19 11:35:49 UTC (rev 256)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp	2007-08-19 15:38:29 UTC (rev 257)
@@ -157,7 +157,7 @@
 							item.category = to_wstring( plugin->pluginApi );
 							item.context = plugin;
 							
-							db_.insert( container::value_type( L"openeffectslib", item ) );
+							db_.insert( container::value_type( L"OFX", item ) );
 						}
 					}
 				}


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