hdrflow-svn Mailing List for HDRFlow (Page 9)
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn — HDRFlow SVN notifications
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(30) |
May
(38) |
Jun
(22) |
Jul
(53) |
Aug
(66) |
Sep
(56) |
Oct
(29) |
Nov
(13) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(16) |
Feb
(22) |
Mar
(12) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gl...@us...> - 2007-08-20 21:24:47
|
Revision: 262
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=262&view=rev
Author: glslang
Date: 2007-08-20 14:24:45 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
+small abstraction
Modified Paths:
--------------
trunk/lib/extras/src/imf/hdr/hdr.cpp
trunk/lib/extras/src/imf/imf_common.cpp
trunk/lib/extras/src/imf/imf_common.hpp
Modified: trunk/lib/extras/src/imf/hdr/hdr.cpp
===================================================================
--- trunk/lib/extras/src/imf/hdr/hdr.cpp 2007-08-20 21:11:39 UTC (rev 261)
+++ trunk/lib/extras/src/imf/hdr/hdr.cpp 2007-08-20 21:24:45 UTC (rev 262)
@@ -20,7 +20,7 @@
int imageInit( void )
{
- return imf::image_init( );
+ return imf::image_init( "HDRFlow Radiance plugin initialised\n" );
}
BOOLEAN imageIsFile( char* fn, FILE* fp )
Modified: trunk/lib/extras/src/imf/imf_common.cpp
===================================================================
--- trunk/lib/extras/src/imf/imf_common.cpp 2007-08-20 21:11:39 UTC (rev 261)
+++ trunk/lib/extras/src/imf/imf_common.cpp 2007-08-20 21:24:45 UTC (rev 262)
@@ -11,9 +11,9 @@
namespace hdrflow { namespace extras { namespace imf {
-int image_init( void )
+int image_init( const std::string& msg )
{
- ERR_printf( ERR__INFO, "HDRFlow DPX plugin initialised\n" );
+ ERR_printf( ERR__INFO, const_cast<char*>( msg.c_str( ) ) );
return TRUE;
}
Modified: trunk/lib/extras/src/imf/imf_common.hpp
===================================================================
--- trunk/lib/extras/src/imf/imf_common.hpp 2007-08-20 21:11:39 UTC (rev 261)
+++ trunk/lib/extras/src/imf/imf_common.hpp 2007-08-20 21:24:45 UTC (rev 262)
@@ -8,6 +8,8 @@
#ifndef IMF_COMMON_INC_
#define IMF_COMMON_INC_
+#include <string>
+
#include <maya/IMF.h>
namespace hdrflow { namespace extras { namespace imf {
@@ -35,7 +37,7 @@
int imageSupportsActiveWindow = FALSE; \
U_INT imageAccess = IMF_C_READ_RANDOM | IMF_C_WRITE;
-int image_init( void );
+int image_init( const std::string& msg );
BOOLEAN image_is_file( char* fn, FILE* fp );
int image_read_open( IMF_OBJECT* imf );
int image_write_open( IMF_OBJECT* imf );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-20 21:11:41
|
Revision: 261
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=261&view=rev
Author: glslang
Date: 2007-08-20 14:11:39 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
+ corrects order of the namespaces
Modified Paths:
--------------
trunk/lib/extras/src/panoramic/panoramic.cpp
trunk/lib/extras/src/raw/raw.cpp
Modified: trunk/lib/extras/src/panoramic/panoramic.cpp
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic.cpp 2007-08-20 21:05:08 UTC (rev 260)
+++ trunk/lib/extras/src/panoramic/panoramic.cpp 2007-08-20 21:11:39 UTC (rev 261)
@@ -20,7 +20,7 @@
namespace ml = olib::openmedialib::ml;
namespace pcos = olib::openpluginlib::pcos;
-namespace extras { namespace hdrflow { namespace pan {
+namespace hdrflow { namespace extras { namespace pan {
namespace
{
@@ -116,19 +116,19 @@
bool openplugin_create_plugin( const char*, pl::openplugin** plug )
{
- *plug = new extras::hdrflow::pan::panoramic_plugin;
+ *plug = new hdrflow::extras::pan::panoramic_plugin;
return true;
}
void openplugin_destroy_plugin( pl::openplugin* plug )
{
- delete static_cast<extras::hdrflow::pan::panoramic_plugin*>( plug );
+ delete static_cast<hdrflow::extras::pan::panoramic_plugin*>( plug );
}
OfxPlugin* OfxGetPlugin( int nth )
{
if( nth == 0 )
- return &extras::hdrflow::pan::panoramic_ofx_plugin;
+ return &hdrflow::extras::pan::panoramic_ofx_plugin;
return 0;
}
Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp 2007-08-20 21:05:08 UTC (rev 260)
+++ trunk/lib/extras/src/raw/raw.cpp 2007-08-20 21:11:39 UTC (rev 261)
@@ -18,7 +18,7 @@
namespace il = olib::openimagelib::il;
namespace pcos = olib::openpluginlib::pcos;
-namespace extras { namespace hdrflow { namespace raw {
+namespace hdrflow { namespace extras { namespace raw {
namespace
{
@@ -99,13 +99,13 @@
bool openplugin_create_plugin( const char*, pl::openplugin** plug )
{
- *plug = new extras::hdrflow::raw::raw_plugin;
+ *plug = new hdrflow::extras::raw::raw_plugin;
return true;
}
void openplugin_destroy_plugin( pl::openplugin* plug )
{
- delete static_cast<extras::hdrflow::raw::raw_plugin*>( plug );
+ delete static_cast<hdrflow::extras::raw::raw_plugin*>( plug );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-20 21:05:10
|
Revision: 260
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=260&view=rev
Author: glslang
Date: 2007-08-20 14:05:08 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
+ common maya plugin files
Modified Paths:
--------------
trunk/lib/extras/configure.ac
Modified: trunk/lib/extras/configure.ac
===================================================================
--- trunk/lib/extras/configure.ac 2007-08-20 21:04:59 UTC (rev 259)
+++ trunk/lib/extras/configure.ac 2007-08-20 21:05:08 UTC (rev 260)
@@ -173,6 +173,7 @@
Makefile
src/Makefile
src/imf/Makefile
+src/imf/hdr/Makefile
src/panoramic/Makefile
src/raw/Makefile
])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-20 21:05:03
|
Revision: 259
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=259&view=rev
Author: glslang
Date: 2007-08-20 14:04:59 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
+ common maya plugin files
Modified Paths:
--------------
trunk/lib/extras/src/imf/Makefile.am
Added Paths:
-----------
trunk/lib/extras/src/imf/hdr/
trunk/lib/extras/src/imf/hdr/Makefile.am
trunk/lib/extras/src/imf/hdr/hdr.cpp
trunk/lib/extras/src/imf/imf_common.cpp
trunk/lib/extras/src/imf/imf_common.hpp
Removed Paths:
-------------
trunk/lib/extras/src/imf/imf.cpp
Modified: trunk/lib/extras/src/imf/Makefile.am
===================================================================
--- trunk/lib/extras/src/imf/Makefile.am 2007-08-19 16:45:38 UTC (rev 258)
+++ trunk/lib/extras/src/imf/Makefile.am 2007-08-20 21:04:59 UTC (rev 259)
@@ -3,25 +3,5 @@
#
#
-libdir = $(EXTRAS_PLUGINPATH)
+SUBDIRS = hdr
-if HAVE_MAYA
-
-lib_LTLIBRARIES = libhdrflow_extras_imf.la
-
-libhdrflow_extras_imf_la_SOURCES = \
- imf.cpp
-
-libhdrflow_extras_imf_la_CXXFLAGS = \
- $(BOOST_INCLUDE_PATH) \
- $(MAYA_CXXFLAGS) \
- -I$(top_buiddir)/../openlibraries/src
-
-libhdrflow_extras_imf_la_LIBADD = \
- $(MAYA_LIBS)
-
-libhdrflow_extras_imf_la_LDFLAGS = \
- $(MAYA_LDFLAGS)
-
-endif
-
Added: trunk/lib/extras/src/imf/hdr/Makefile.am
===================================================================
--- trunk/lib/extras/src/imf/hdr/Makefile.am (rev 0)
+++ trunk/lib/extras/src/imf/hdr/Makefile.am 2007-08-20 21:04:59 UTC (rev 259)
@@ -0,0 +1,29 @@
+
+#
+#
+#
+
+libdir = $(EXTRAS_PLUGINPATH)
+
+if HAVE_MAYA
+
+lib_LTLIBRARIES = libhdrflow_extras_imfhdr.la
+
+libhdrflow_extras_imfhdr_la_SOURCES = \
+ hdr.cpp \
+ ../imf_common.hpp \
+ ../imf_common.cpp
+
+libhdrflow_extras_imfhdr_la_CXXFLAGS = \
+ $(BOOST_INCLUDE_PATH) \
+ $(MAYA_CXXFLAGS) \
+ -I$(top_buiddir)/../openlibraries/src
+
+libhdrflow_extras_imfhdr_la_LIBADD = \
+ $(MAYA_LIBS)
+
+libhdrflow_extras_imfhdr_la_LDFLAGS = \
+ $(MAYA_LDFLAGS)
+
+endif
+
Property changes on: trunk/lib/extras/src/imf/hdr/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/extras/src/imf/hdr/hdr.cpp
===================================================================
--- trunk/lib/extras/src/imf/hdr/hdr.cpp (rev 0)
+++ trunk/lib/extras/src/imf/hdr/hdr.cpp 2007-08-20 21:04:59 UTC (rev 259)
@@ -0,0 +1,43 @@
+
+// imf - Autodesk's Maya import/export image plugin
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#include <cstdio>
+
+#include <imf/imf_common.hpp>
+
+namespace imf = hdrflow::extras::imf;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Mandatory entry points
+IMF_VAR_ENTRY_POINTS( "com.cryogenicgraphics.hdr", "HDRFlow HDR", ".hdr" )
+
+int imageInit( void )
+{
+ return imf::image_init( );
+}
+
+BOOLEAN imageIsFile( char* fn, FILE* fp )
+{
+ return imf::image_is_file( fn, fp );
+}
+
+int imageReadOpen( IMF_OBJECT* imf )
+{
+ return imf::image_read_open( imf );
+}
+
+int imageWriteOpen( IMF_OBJECT* imf )
+{
+ return imf::image_write_open( imf );
+}
+
+#ifdef __cplusplus
+}
+#endif
Property changes on: trunk/lib/extras/src/imf/hdr/hdr.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: trunk/lib/extras/src/imf/imf.cpp
===================================================================
--- trunk/lib/extras/src/imf/imf.cpp 2007-08-19 16:45:38 UTC (rev 258)
+++ trunk/lib/extras/src/imf/imf.cpp 2007-08-20 21:04:59 UTC (rev 259)
@@ -1,68 +0,0 @@
-
-// imf - Autodesk's Maya import/export image plugin
-
-// Copyright (c) 2007 Goncalo N. M. de Carvalho
-// Released under the GPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
-
-#include <cstdio>
-
-#include <maya/IMF.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// 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 = 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 )
-{
- ERR_printf( ERR__INFO, "HDRFlow DPX plugin initialised\n" );
-
- return TRUE;
-}
-
-BOOLEAN imageIsFile( char* fn, FILE* fp )
-{
- return FALSE;
-}
-
-int imageReadOpen( IMF_OBJECT* imf )
-{
- imf__err = IMF_C_READ_ERR;
-
- return FALSE;
-}
-
-int imageWriteOpen( IMF_OBJECT* imf )
-{
- imf__err = IMF_C_WRITE_ERR;
-
- return FALSE;
-}
-
-#ifdef __cplusplus
-}
-#endif
Added: trunk/lib/extras/src/imf/imf_common.cpp
===================================================================
--- trunk/lib/extras/src/imf/imf_common.cpp (rev 0)
+++ trunk/lib/extras/src/imf/imf_common.cpp 2007-08-20 21:04:59 UTC (rev 259)
@@ -0,0 +1,40 @@
+
+// imf - Autodesk's Maya import/export image plugin
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#include <cstdio>
+
+#include <imf/imf_common.hpp>
+
+namespace hdrflow { namespace extras { namespace imf {
+
+int image_init( void )
+{
+ ERR_printf( ERR__INFO, "HDRFlow DPX plugin initialised\n" );
+
+ return TRUE;
+}
+
+BOOLEAN image_is_file( char* fn, FILE* fp )
+{
+ return FALSE;
+}
+
+int image_read_open( IMF_OBJECT* imf )
+{
+ imf__err = IMF_C_READ_ERR;
+
+ return FALSE;
+}
+
+int image_write_open( IMF_OBJECT* imf )
+{
+ imf__err = IMF_C_WRITE_ERR;
+
+ return FALSE;
+}
+
+} } }
Property changes on: trunk/lib/extras/src/imf/imf_common.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/extras/src/imf/imf_common.hpp
===================================================================
--- trunk/lib/extras/src/imf/imf_common.hpp (rev 0)
+++ trunk/lib/extras/src/imf/imf_common.hpp 2007-08-20 21:04:59 UTC (rev 259)
@@ -0,0 +1,45 @@
+
+// imf - Autodesk's Maya import/export image plugin
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifndef IMF_COMMON_INC_
+#define IMF_COMMON_INC_
+
+#include <maya/IMF.h>
+
+namespace hdrflow { namespace extras { namespace imf {
+
+#define IMF_VAR_ENTRY_POINTS( key, name, extension ) \
+ char* program = "Wavefront"; \
+ char* version = IMF_PROTOCOL_CURRENT; \
+ char* type = "image"; \
+ char* imageKey = key; \
+ char* imageName = name; \
+ char* imageExtension = extension; \
+ 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 image_init( void );
+BOOLEAN image_is_file( char* fn, FILE* fp );
+int image_read_open( IMF_OBJECT* imf );
+int image_write_open( IMF_OBJECT* imf );
+
+} } }
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-19 16:45:39
|
Revision: 258
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=258&view=rev
Author: glslang
Date: 2007-08-19 09:45:38 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
+ small UI updates
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-19 15:38:29 UTC (rev 257)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-19 16:45:38 UTC (rev 258)
@@ -3,24 +3,24 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>59 71 356 240 0 0 1440 878 </string>
+ <string>50 60 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>10</key>
- <string>514 465 412 270 0 0 1440 878 </string>
+ <string>434 396 412 270 0 0 1280 778 </string>
<key>12</key>
- <string>423 427 594 345 0 0 1440 878 </string>
+ <string>343 359 594 345 0 0 1280 778 </string>
<key>33</key>
- <string>519 453 401 293 0 0 1440 878 </string>
+ <string>439 385 401 293 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>12</integer>
+ <integer>5</integer>
<integer>10</integer>
<integer>33</integer>
- <integer>5</integer>
- <integer>12</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-19 15:38:30
|
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.
|
|
From: <gl...@us...> - 2007-08-19 11:35:51
|
Revision: 256
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=256&view=rev
Author: glslang
Date: 2007-08-19 04:35:49 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
+ add OFX plugins to openeffectslib
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp 2007-08-19 11:17:16 UTC (rev 255)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp 2007-08-19 11:35:49 UTC (rev 256)
@@ -157,7 +157,7 @@
item.category = to_wstring( plugin->pluginApi );
item.context = plugin;
- db_.insert( container::value_type( L"openmedialib", item ) );
+ db_.insert( container::value_type( L"openeffectslib", item ) );
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-19 11:17:18
|
Revision: 255
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=255&view=rev
Author: glslang
Date: 2007-08-19 04:17:16 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
+ build updates
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-08-19 11:06:26 UTC (rev 254)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-08-19 11:17:16 UTC (rev 255)
@@ -261,6 +261,10 @@
>
</File>
<File
+ RelativePath=".\shlib.cpp"
+ >
+ </File>
+ <File
RelativePath=".\stream.cpp"
>
</File>
@@ -375,11 +379,11 @@
>
</File>
<File
- RelativePath=".\property.hpp"
+ RelativePath=".\pcos\property.hpp"
>
</File>
<File
- RelativePath=".\pcos\property.hpp"
+ RelativePath=".\property.hpp"
>
</File>
<File
@@ -395,6 +399,10 @@
>
</File>
<File
+ RelativePath=".\shlib.hpp"
+ >
+ </File>
+ <File
RelativePath=".\simplestringstorage.h"
>
</File>
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp 2007-08-19 11:06:26 UTC (rev 254)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp 2007-08-19 11:17:16 UTC (rev 255)
@@ -9,10 +9,15 @@
#include <openlibraries_global_config.hpp>
#endif
-#ifdef __APPLE__
+#ifdef WIN32
+#define STRICT
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#elif defined __APPLE__
#include <CoreFoundation/CoreFoundation.h>
#endif
+#include <openpluginlib/pl/utf8_utils.hpp>
#include <openpluginlib/pl/shlib.hpp>
namespace olib { namespace openpluginlib {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-19 11:06:33
|
Revision: 254
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=254&view=rev
Author: glslang
Date: 2007-08-19 04:06:26 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
+ separates shared object functions from main code
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp
trunk/unity.sh
Added Paths:
-----------
trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/shlib.hpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-08-18 19:45:10 UTC (rev 253)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-08-19 11:06:26 UTC (rev 254)
@@ -46,6 +46,8 @@
smallstringopt.h \
stream.hpp \
stream.cpp \
+ shlib.hpp \
+ shlib.cpp \
vectorstringstorage.h \
GL_utility.hpp \
GL_utility.cpp \
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp 2007-08-18 19:45:10 UTC (rev 253)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/registry.cpp 2007-08-19 11:06:26 UTC (rev 254)
@@ -25,6 +25,7 @@
#include <openpluginlib/pl/registry.hpp>
#include <openpluginlib/pl/utf8_utils.hpp>
#include <openpluginlib/pl/opl_importer.hpp>
+#include <openpluginlib/pl/shlib.hpp>
namespace fs = boost::filesystem;
@@ -32,54 +33,7 @@
namespace
{
- // Code replication due to OFX. There are some
- // differences in how OFX plugins are specified.
- // Refactoring is left as an exercise to the reader.
#ifdef WIN32
- typedef HMODULE module_t;
- HMODULE dlopen_( const char* path )
-#elif defined __APPLE__
- typedef CFBundleRef module_t;
- CFBundleRef dlopen_( const char* path )
-#else
- typedef void* module_t;
- void* dlopen_( const char* path )
-#endif
- {
-#ifdef WIN32
- return LoadLibrary( to_wstring( path ).c_str( ) );
-#elif defined __APPLE__
- CFStringRef bundle_str = CFStringCreateWithCString( kCFAllocatorDefault, path, kCFStringEncodingASCII );
- CFURLRef url_ref = CFURLCreateWithFileSystemPath( kCFAllocatorDefault, bundle_str, kCFURLPOSIXPathStyle, true );
-
- CFBundleRef bundle = CFBundleCreate( kCFAllocatorDefault, url_ref );
-
- CFRelease( url_ref );
- CFRelease( bundle_str );
-
- return bundle;
-#else
- return dlopen( path, RTLD_GLOBAL | RTLD_NOW );
-#endif
- }
-
- void* dlsym_( module_t shared, const char* entry_point )
- {
-#ifdef WIN32
- return GetProcAddress( shared, entry_point );
-#elif defined __APPLE__
- CFStringRef entry_str = CFStringCreateWithCString( kCFAllocatorDefault, entry_point, kCFStringEncodingASCII );
-
- void* entry = CFBundleGetFunctionPointerForName( shared, entry_str );
- CFRelease( entry_str );
-
- return entry;
-#else
- return dlsym( shared, entry_point );
-#endif
- }
-
-#ifdef WIN32
// Replicate some of OFX types on Win32 to avoid an include dependency.
// In the unlikely event that they will change then this will have to be
// updated.
Added: trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp (rev 0)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp 2007-08-19 11:06:26 UTC (rev 254)
@@ -0,0 +1,70 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifdef HAVE_CONFIG_H
+#include <openlibraries_global_config.hpp>
+#endif
+
+#ifdef __APPLE__
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+#include <openpluginlib/pl/shlib.hpp>
+
+namespace olib { namespace openpluginlib {
+
+// Code replication due to OFX. There are some
+// differences in how OFX plugins are specified.
+// Refactoring is left as an exercise to the reader.
+
+module_t dlopen_( const char* path )
+{
+#ifdef WIN32
+ return LoadLibrary( to_wstring( path ).c_str( ) );
+#elif defined __APPLE__
+ CFStringRef bundle_str = CFStringCreateWithCString( kCFAllocatorDefault, path, kCFStringEncodingASCII );
+ CFURLRef url_ref = CFURLCreateWithFileSystemPath( kCFAllocatorDefault, bundle_str, kCFURLPOSIXPathStyle, true );
+
+ CFBundleRef bundle = CFBundleCreate( kCFAllocatorDefault, url_ref );
+
+ CFRelease( url_ref );
+ CFRelease( bundle_str );
+
+ return bundle;
+#else
+ return dlopen( path, RTLD_GLOBAL | RTLD_NOW );
+#endif
+}
+
+void* dlsym_( module_t shared, const char* entry_point )
+{
+#ifdef WIN32
+ return GetProcAddress( shared, entry_point );
+#elif defined __APPLE__
+ CFStringRef entry_str = CFStringCreateWithCString( kCFAllocatorDefault, entry_point, kCFStringEncodingASCII );
+
+ void* entry = CFBundleGetFunctionPointerForName( shared, entry_str );
+ CFRelease( entry_str );
+
+ return entry;
+#else
+ return dlsym( shared, entry_point );
+#endif
+}
+
+void dlclose_( module_t module )
+{
+#ifdef WIN32
+ FreeLibrary( module );
+#elif defined __APPLE__
+ CFRelease( module );
+#else
+ dlclose( module );
+#endif
+}
+
+} }
Added: trunk/lib/openlibraries/src/openpluginlib/pl/shlib.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/shlib.hpp (rev 0)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/shlib.hpp 2007-08-19 11:06:26 UTC (rev 254)
@@ -0,0 +1,27 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifndef SHLIB_INC_
+#define SHLIB_INC_
+
+namespace olib { namespace openpluginlib {
+
+#ifdef WIN32
+typedef HMODULE module_t;
+#elif defined __APPLE__
+typedef CFBundleRef module_t;
+#else
+typedef void* module_t;
+#endif
+
+module_t dlopen_( const char* path );
+void* dlsym_( module_t shared, const char* entry_point );
+void dlclose_( module_t module );
+
+} }
+
+#endif
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-18 19:45:10 UTC (rev 253)
+++ trunk/unity.sh 2007-08-19 11:06:26 UTC (rev 254)
@@ -39,7 +39,7 @@
output_directory="."
-openlibraries_configure_options= "--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-pythonversion=2.3 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking --with-glewprefix=/usr/local"
+openlibraries_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-pythonversion=2.3 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking --with-glewprefix=/usr/local"
extras_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking"
while getopts "v:b:efi:o:x:upas" option
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-18 19:45:13
|
Revision: 253
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=253&view=rev
Author: glslang
Date: 2007-08-18 12:45:10 -0700 (Sat, 18 Aug 2007)
Log Message:
-----------
+ skeleton maya plugin
Modified Paths:
--------------
trunk/lib/extras/m4/maya.m4
trunk/lib/extras/src/imf/imf.cpp
Modified: trunk/lib/extras/m4/maya.m4
===================================================================
--- trunk/lib/extras/m4/maya.m4 2007-08-18 14:31:49 UTC (rev 252)
+++ trunk/lib/extras/m4/maya.m4 2007-08-18 19:45:10 UTC (rev 253)
@@ -30,7 +30,7 @@
case $host in
*-apple-darwin*)
MAYA_LDFLAGS="${MAYA_LDFLAGS} -Wl,-executable_path,${with_mayadir}/Maya.app/Contents/MacOS"
- MAYA_LIBS="-Xlinker -lOpenMaya -Xlinker -lOpenMayaUI -Xlinker -lFoundation -Xlinker -framework -Xlinker AGL -Xlinker -framework -Xlinker OpenGL"
+ MAYA_LIBS="-Xlinker -lIMFbase -Xlinker -lOpenMaya -Xlinker -lOpenMayaUI -Xlinker -lFoundation -Xlinker -framework -Xlinker AGL -Xlinker -framework -Xlinker OpenGL"
;;
esac
ac_use_maya=yes
Modified: trunk/lib/extras/src/imf/imf.cpp
===================================================================
--- trunk/lib/extras/src/imf/imf.cpp 2007-08-18 14:31:49 UTC (rev 252)
+++ trunk/lib/extras/src/imf/imf.cpp 2007-08-18 19:45:10 UTC (rev 253)
@@ -0,0 +1,68 @@
+
+// imf - Autodesk's Maya import/export image plugin
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#include <cstdio>
+
+#include <maya/IMF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// 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;
+
+int imageInit( void )
+{
+ ERR_printf( ERR__INFO, "HDRFlow DPX plugin initialised\n" );
+
+ return TRUE;
+}
+
+BOOLEAN imageIsFile( char* fn, FILE* fp )
+{
+ return FALSE;
+}
+
+int imageReadOpen( IMF_OBJECT* imf )
+{
+ imf__err = IMF_C_READ_ERR;
+
+ return FALSE;
+}
+
+int imageWriteOpen( IMF_OBJECT* imf )
+{
+ imf__err = IMF_C_WRITE_ERR;
+
+ return FALSE;
+}
+
+#ifdef __cplusplus
+}
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-18 14:31:50
|
Revision: 252
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=252&view=rev
Author: glslang
Date: 2007-08-18 07:31:49 -0700 (Sat, 18 Aug 2007)
Log Message:
-----------
eol-property to native
Property Changed:
----------------
trunk/lib/extras/m4/maya.m4
Property changes on: trunk/lib/extras/m4/maya.m4
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-18 14:21:11
|
Revision: 251
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=251&view=rev
Author: glslang
Date: 2007-08-18 07:21:09 -0700 (Sat, 18 Aug 2007)
Log Message:
-----------
+build updates
Modified Paths:
--------------
trunk/lib/extras/configure.ac
trunk/lib/extras/src/imf/Makefile.am
Added Paths:
-----------
trunk/lib/extras/m4/maya.m4
Modified: trunk/lib/extras/configure.ac
===================================================================
--- trunk/lib/extras/configure.ac 2007-08-18 12:54:38 UTC (rev 250)
+++ trunk/lib/extras/configure.ac 2007-08-18 14:21:09 UTC (rev 251)
@@ -138,6 +138,8 @@
AC_CHECK_QUICKTIME( )
+AC_CHECK_MAYA( )
+
dnl include paths
INCLUDES='-I$(top_srcdir)/src'
AC_SUBST(INCLUDES)
Added: trunk/lib/extras/m4/maya.m4
===================================================================
--- trunk/lib/extras/m4/maya.m4 (rev 0)
+++ trunk/lib/extras/m4/maya.m4 2007-08-18 14:21:09 UTC (rev 251)
@@ -0,0 +1,52 @@
+
+#
+#
+#
+
+AC_DEFUN([AC_CHECK_MAYA],[
+ AC_ARG_WITH(mayadir, AC_HELP_STRING([--with-mayadir], [Maya directory]),,with_mayadir="${MAYA_DIRECTORY}")
+
+ MAYA_CXXFLAGS="-I${with_mayadir}/devkit/include -D_BOOL -DREQUIRE_IOSTREAM"
+ MAYA_LDFLAGS="-L${with_mayadir}/Maya.app/Contents/MacOS"
+ MAYA_LIBS=""
+
+ case $host in
+ *-apple-darwin*)
+ MAYA_CXXFLAGS="${MAYA_CXXFLAGS} -DMAC_PLUGIN"
+ esac
+
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS ${MAYA_CXXFLAGS}"
+
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS ${MAYA_CXXFLAGS}"
+
+ AC_LANG(C++)
+ AC_CHECK_HEADER(maya/IMF.h,
+ [ac_have_maya="yes" AC_DEFINE(HAVE_MAYA,1,[Define this if you have Maya devkit])],
+ [AC_MSG_WARN([*** Maya development headers not available. Please check your Maya installation ***])])
+
+ if test x$ac_have_maya = "xyes"; then
+ case $host in
+ *-apple-darwin*)
+ MAYA_LDFLAGS="${MAYA_LDFLAGS} -Wl,-executable_path,${with_mayadir}/Maya.app/Contents/MacOS"
+ MAYA_LIBS="-Xlinker -lOpenMaya -Xlinker -lOpenMayaUI -Xlinker -lFoundation -Xlinker -framework -Xlinker AGL -Xlinker -framework -Xlinker OpenGL"
+ ;;
+ esac
+ ac_use_maya=yes
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+ CXXFLAGS="$save_CXXFLAGS"
+
+ AC_SUBST(MAYA_CXXFLAGS)
+ AC_SUBST(MAYA_LDFLAGS)
+ AC_SUBST(MAYA_LIBS)
+ AM_CONDITIONAL(HAVE_MAYA, [test x$ac_use_maya = "xyes"])
+
+ if test x$ac_use_ofx = "xyes"; then
+ ifelse([$1], , :, [$1])
+ else
+ ifelse([$2], , :, [$2])
+ fi
+])
Modified: trunk/lib/extras/src/imf/Makefile.am
===================================================================
--- trunk/lib/extras/src/imf/Makefile.am 2007-08-18 12:54:38 UTC (rev 250)
+++ trunk/lib/extras/src/imf/Makefile.am 2007-08-18 14:21:09 UTC (rev 251)
@@ -5,11 +5,23 @@
libdir = $(EXTRAS_PLUGINPATH)
+if HAVE_MAYA
+
lib_LTLIBRARIES = libhdrflow_extras_imf.la
libhdrflow_extras_imf_la_SOURCES = \
imf.cpp
libhdrflow_extras_imf_la_CXXFLAGS = \
- $(BOOST_INCLUDE_PATH) \
+ $(BOOST_INCLUDE_PATH) \
+ $(MAYA_CXXFLAGS) \
-I$(top_buiddir)/../openlibraries/src
+
+libhdrflow_extras_imf_la_LIBADD = \
+ $(MAYA_LIBS)
+
+libhdrflow_extras_imf_la_LDFLAGS = \
+ $(MAYA_LDFLAGS)
+
+endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-18 12:54:44
|
Revision: 250
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=250&view=rev
Author: glslang
Date: 2007-08-18 05:54:38 -0700 (Sat, 18 Aug 2007)
Log Message:
-----------
+package project for dependencies
Added Paths:
-----------
trunk/HDRFlowDependencies.pmproj
Added: trunk/HDRFlowDependencies.pmproj
===================================================================
(Binary files differ)
Property changes on: trunk/HDRFlowDependencies.pmproj
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-16 21:05:33
|
Revision: 249
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=249&view=rev
Author: glslang
Date: 2007-08-16 14:05:26 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
+build updates
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/app/HDRFlow/Sink.hpp
trunk/app/HDRFlow/Source.hpp
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-16 20:36:02 UTC (rev 248)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-16 21:05:26 UTC (rev 249)
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>10</integer>
<integer>33</integer>
<integer>5</integer>
<integer>12</integer>
- <integer>10</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-16 20:36:02 UTC (rev 248)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-16 21:05:26 UTC (rev 249)
@@ -49,7 +49,6 @@
670E3BEB0C73AE93001D542B /* plusbutton.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = plusbutton.tiff; path = Images/plusbutton.tiff; sourceTree = "<group>"; };
671E22910C41652E00CA1860 /* ScriptEditorController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScriptEditorController.h; sourceTree = "<group>"; };
671E22A20C4166E400CA1860 /* ScriptEditorController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ScriptEditorController.mm; sourceTree = "<group>"; };
- 67399AE90C70F9DD007536EA /* Sink.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Sink.hpp; sourceTree = "<group>"; };
673D04450C522A610096513A /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesController.h; sourceTree = "<group>"; };
673D044F0C522C980096513A /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PreferencesController.m; sourceTree = "<group>"; };
674E44630C3F854A0036A908 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ScriptEditor.nib; sourceTree = "<group>"; };
@@ -62,7 +61,6 @@
67A8A6E40C4181C600DB3F1B /* ScriptEngine.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = ScriptEngine.hpp; sourceTree = "<group>"; };
67A8A6E90C41836600DB3F1B /* Python.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Python.framework; path = /System/Library/Frameworks/Python.framework; sourceTree = "<absolute>"; };
67A8A73D0C4183C500DB3F1B /* ScriptEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptEngine.cpp; sourceTree = "<group>"; };
- 67B58EC60C6FAC2100A1C748 /* Source.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Source.hpp; sourceTree = "<group>"; };
67BD59C70C36BE3600F0F7DF /* HDRFlowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HDRFlowController.h; sourceTree = "<group>"; };
67C064ED0C52231A00E9ED8E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; };
67C0BA220C5B69AF00E0E258 /* Viewer.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Viewer.hpp; sourceTree = "<group>"; };
@@ -117,7 +115,6 @@
677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */,
673D04450C522A610096513A /* PreferencesController.h */,
673D044F0C522C980096513A /* PreferencesController.m */,
- 67B58EC60C6FAC2100A1C748 /* Source.hpp */,
671E22910C41652E00CA1860 /* ScriptEditorController.h */,
671E22A20C4166E400CA1860 /* ScriptEditorController.mm */,
67C3D3170C5361C600136EE8 /* ToolbarHolder.h */,
@@ -165,7 +162,6 @@
29B97317FDCFA39411CA2CEA /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
- 67399AE90C70F9DD007536EA /* Sink.hpp */,
);
name = HDRFlow;
sourceTree = "<group>";
Deleted: trunk/app/HDRFlow/Sink.hpp
===================================================================
--- trunk/app/HDRFlow/Sink.hpp 2007-08-16 20:36:02 UTC (rev 248)
+++ trunk/app/HDRFlow/Sink.hpp 2007-08-16 21:05:26 UTC (rev 249)
@@ -1,26 +0,0 @@
-
-// HDRFlow - A image processing application
-
-// Copyright (c) 2007 Goncalo N. M. de Carvalho
-// Released under the GPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
-
-#ifndef SINK_INC_
-#define SINK_INC_
-
-#include "Cache.hpp"
-
-namespace hdrflow {
-
-class Sink
-{
-public:
- explicit Sink( )
- { }
-};
-
-typedef boost::shared_ptr<Sink> SinkPtr;
-
-}
-
-#endif
Deleted: trunk/app/HDRFlow/Source.hpp
===================================================================
--- trunk/app/HDRFlow/Source.hpp 2007-08-16 20:36:02 UTC (rev 248)
+++ trunk/app/HDRFlow/Source.hpp 2007-08-16 21:05:26 UTC (rev 249)
@@ -1,34 +0,0 @@
-
-// HDRFlow - A image processing application
-
-// Copyright (c) 2007 Goncalo N. M. de Carvalho
-// Released under the GPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
-
-#ifndef SOURCE_INC_
-#define SOURCE_INC_
-
-#include "Cache.hpp"
-
-namespace pl = olib::openpluginlib;
-
-namespace hdrflow {
-
-class Source
-{
-public:
- explicit Source( )
- { }
-
- pl::string uri( ) const;
- void set_uri( const pl::string& uri );
-
-private:
- CachePtr cache_;
-};
-
-typedef boost::shared_ptr<Source> SourcePtr;
-
-}
-
-#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-16 20:36:05
|
Revision: 248
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=248&view=rev
Author: glslang
Date: 2007-08-16 13:36:02 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
+ small ui updates
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/lib/openlibraries/Info.plist.template
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-15 22:46:33 UTC (rev 247)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-16 20:36:02 UTC (rev 248)
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>33</integer>
<integer>5</integer>
<integer>12</integer>
<integer>10</integer>
- <integer>33</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/lib/openlibraries/Info.plist.template
===================================================================
--- trunk/lib/openlibraries/Info.plist.template 2007-08-15 22:46:33 UTC (rev 247)
+++ trunk/lib/openlibraries/Info.plist.template 2007-08-16 20:36:02 UTC (rev 248)
@@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>com.cryogenicgraphics.openlibraries</string>
+ <string>com.cryogenicgraphics.hdrflowfmwk</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-15 22:47:30
|
Revision: 247
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=247&view=rev
Author: glslang
Date: 2007-08-15 15:46:33 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
+ changes to plugins preferences view
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/app/HDRFlow/Images/minusbutton.tiff
trunk/app/HDRFlow/Images/plusbutton.tiff
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-14 21:53:44 UTC (rev 246)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-15 22:46:33 UTC (rev 247)
@@ -7,9 +7,9 @@
<key>IBEditorPositions</key>
<dict>
<key>10</key>
- <string>285 339 412 270 0 0 1440 878 </string>
+ <string>514 465 412 270 0 0 1440 878 </string>
<key>12</key>
- <string>665 397 594 345 0 0 1440 878 </string>
+ <string>423 427 594 345 0 0 1440 878 </string>
<key>33</key>
<string>519 453 401 293 0 0 1440 878 </string>
</dict>
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>5</integer>
+ <integer>12</integer>
<integer>10</integer>
<integer>33</integer>
- <integer>12</integer>
- <integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-14 21:53:44 UTC (rev 246)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-15 22:46:33 UTC (rev 247)
@@ -8,6 +8,8 @@
/* Begin PBXBuildFile section */
67032E9E0C46DB9C00FA55E2 /* HDRFlow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */; };
+ 670E3BEC0C73AE93001D542B /* minusbutton.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 670E3BEA0C73AE93001D542B /* minusbutton.tiff */; };
+ 670E3BED0C73AE93001D542B /* plusbutton.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 670E3BEB0C73AE93001D542B /* plusbutton.tiff */; };
671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 671E22A20C4166E400CA1860 /* ScriptEditorController.mm */; };
673D04500C522C980096513A /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 673D044F0C522C980096513A /* PreferencesController.m */; };
674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 674E44620C3F854A0036A908 /* ScriptEditor.nib */; };
@@ -43,6 +45,8 @@
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
32CA4F630368D1EE00C91783 /* HDRFlow_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDRFlow_Prefix.pch; sourceTree = "<group>"; };
67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HDRFlow.framework; path = /Library/Frameworks/HDRFlow.framework; sourceTree = "<absolute>"; };
+ 670E3BEA0C73AE93001D542B /* minusbutton.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = minusbutton.tiff; path = Images/minusbutton.tiff; sourceTree = "<group>"; };
+ 670E3BEB0C73AE93001D542B /* plusbutton.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = plusbutton.tiff; path = Images/plusbutton.tiff; sourceTree = "<group>"; };
671E22910C41652E00CA1860 /* ScriptEditorController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScriptEditorController.h; sourceTree = "<group>"; };
671E22A20C4166E400CA1860 /* ScriptEditorController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ScriptEditorController.mm; sourceTree = "<group>"; };
67399AE90C70F9DD007536EA /* Sink.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Sink.hpp; sourceTree = "<group>"; };
@@ -211,6 +215,8 @@
67F7A3EC0C52A1F900172987 /* Images */ = {
isa = PBXGroup;
children = (
+ 670E3BEA0C73AE93001D542B /* minusbutton.tiff */,
+ 670E3BEB0C73AE93001D542B /* plusbutton.tiff */,
67CF88A90C53D62E005B6662 /* AdvancedPreferences.tiff */,
67F7A3ED0C52A21600172987 /* GeneralPreferences.tiff */,
67CF88AB0C53EFB8005B6662 /* PlugInsPreferences.tiff */,
@@ -267,6 +273,8 @@
67F7A3EE0C52A21600172987 /* GeneralPreferences.tiff in Resources */,
67CF88AA0C53D62E005B6662 /* AdvancedPreferences.tiff in Resources */,
67CF88AC0C53EFB8005B6662 /* PlugInsPreferences.tiff in Resources */,
+ 670E3BEC0C73AE93001D542B /* minusbutton.tiff in Resources */,
+ 670E3BED0C73AE93001D542B /* plusbutton.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: trunk/app/HDRFlow/Images/minusbutton.tiff
===================================================================
(Binary files differ)
Property changes on: trunk/app/HDRFlow/Images/minusbutton.tiff
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/app/HDRFlow/Images/plusbutton.tiff
===================================================================
(Binary files differ)
Property changes on: trunk/app/HDRFlow/Images/plusbutton.tiff
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-14 21:53:49
|
Revision: 246
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=246&view=rev
Author: glslang
Date: 2007-08-14 14:53:44 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
+build updates
Modified Paths:
--------------
trunk/unity.sh
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-14 21:15:41 UTC (rev 245)
+++ trunk/unity.sh 2007-08-14 21:53:44 UTC (rev 246)
@@ -39,6 +39,9 @@
output_directory="."
+openlibraries_configure_options= "--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-pythonversion=2.3 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking --with-glewprefix=/usr/local"
+extras_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking"
+
while getopts "v:b:efi:o:x:upas" option
do
case $option in
@@ -67,6 +70,14 @@
done
fi
+strip_library_symbols( )
+{
+ if [ "$strip_symbols" -eq 1 ]
+ then
+ strip -x $1
+ fi
+}
+
make_framework_dir( )
{
framework_dir="$output_directory/$1.framework"
@@ -131,7 +142,8 @@
do if [ ! -L $i ]
then ln -sf Versions/Current/$1 $1.framework/$1 &&
cp $i $1.framework/Versions/Current/$1 &&
- install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$1 $1.framework/$1
+ install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$1 $1.framework/$1 &&
+ strip_library_symbols $1.framework/$1
fi
done
}
@@ -144,7 +156,8 @@
for i in $libs
do if [ ! -L $i ]
then cp $i $1.framework/Versions/$framework_version/PlugIns/$1.so &&
- install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$1 $1.framework/$1
+ install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$1 $1.framework/$1 &&
+ strip_library_symbols $1.framework/Versions/$framework_version/PlugIns/$1.so
fi
done
fi
@@ -242,6 +255,7 @@
fi
done
done
+ strip_library_symbols $1.framework/Versions/$framework_version/Libraries/*
}
make_framework_plugins( )
@@ -250,10 +264,11 @@
then plugins=`ls $1/../plugins`
for i in $plugins
do if [ -d $1/../plugins/$i/.libs ]
- then cp -R $1/../plugins/$i/.libs/*.dylib $2.framework/PlugIns
+ then cp -R $1/../plugins/$i/.libs/*.dylib $2.framework/PlugIns
fi
done
fi
+ strip_library_symbols $2.framework/PlugIns/*
}
make_framework_interdeps( )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-14 21:15:42
|
Revision: 245
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=245&view=rev
Author: glslang
Date: 2007-08-14 14:15:41 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
+initial maya plugin
Modified Paths:
--------------
trunk/lib/extras/configure.ac
trunk/lib/extras/src/Makefile.am
Added Paths:
-----------
trunk/lib/extras/src/imf/
trunk/lib/extras/src/imf/Makefile.am
trunk/lib/extras/src/imf/imf.cpp
Modified: trunk/lib/extras/configure.ac
===================================================================
--- trunk/lib/extras/configure.ac 2007-08-13 20:48:45 UTC (rev 244)
+++ trunk/lib/extras/configure.ac 2007-08-14 21:15:41 UTC (rev 245)
@@ -170,6 +170,7 @@
AC_CONFIG_FILES([
Makefile
src/Makefile
+src/imf/Makefile
src/panoramic/Makefile
src/raw/Makefile
])
Modified: trunk/lib/extras/src/Makefile.am
===================================================================
--- trunk/lib/extras/src/Makefile.am 2007-08-13 20:48:45 UTC (rev 244)
+++ trunk/lib/extras/src/Makefile.am 2007-08-14 21:15:41 UTC (rev 245)
@@ -3,4 +3,4 @@
#
#
-SUBDIRS = panoramic raw
+SUBDIRS = panoramic raw imf
Added: trunk/lib/extras/src/imf/Makefile.am
===================================================================
--- trunk/lib/extras/src/imf/Makefile.am (rev 0)
+++ trunk/lib/extras/src/imf/Makefile.am 2007-08-14 21:15:41 UTC (rev 245)
@@ -0,0 +1,15 @@
+
+#
+#
+#
+
+libdir = $(EXTRAS_PLUGINPATH)
+
+lib_LTLIBRARIES = libhdrflow_extras_imf.la
+
+libhdrflow_extras_imf_la_SOURCES = \
+ imf.cpp
+
+libhdrflow_extras_imf_la_CXXFLAGS = \
+ $(BOOST_INCLUDE_PATH) \
+ -I$(top_buiddir)/../openlibraries/src
Property changes on: trunk/lib/extras/src/imf/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/extras/src/imf/imf.cpp
===================================================================
Property changes on: trunk/lib/extras/src/imf/imf.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-13 20:48:47
|
Revision: 244
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=244&view=rev
Author: glslang
Date: 2007-08-13 13:48:45 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
+ small changes to Source
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/app/HDRFlow/Source.hpp
Added Paths:
-----------
trunk/app/HDRFlow/Sink.hpp
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-08-12 22:53:34 UTC (rev 243)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-08-13 20:48:45 UTC (rev 244)
@@ -15,9 +15,9 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>21</integer>
+ <integer>29</integer>
<integer>266</integer>
- <integer>29</integer>
- <integer>21</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-12 22:53:34 UTC (rev 243)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-13 20:48:45 UTC (rev 244)
@@ -45,6 +45,7 @@
67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HDRFlow.framework; path = /Library/Frameworks/HDRFlow.framework; sourceTree = "<absolute>"; };
671E22910C41652E00CA1860 /* ScriptEditorController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScriptEditorController.h; sourceTree = "<group>"; };
671E22A20C4166E400CA1860 /* ScriptEditorController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ScriptEditorController.mm; sourceTree = "<group>"; };
+ 67399AE90C70F9DD007536EA /* Sink.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Sink.hpp; sourceTree = "<group>"; };
673D04450C522A610096513A /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesController.h; sourceTree = "<group>"; };
673D044F0C522C980096513A /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PreferencesController.m; sourceTree = "<group>"; };
674E44630C3F854A0036A908 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ScriptEditor.nib; sourceTree = "<group>"; };
@@ -160,6 +161,7 @@
29B97317FDCFA39411CA2CEA /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
+ 67399AE90C70F9DD007536EA /* Sink.hpp */,
);
name = HDRFlow;
sourceTree = "<group>";
Added: trunk/app/HDRFlow/Sink.hpp
===================================================================
--- trunk/app/HDRFlow/Sink.hpp (rev 0)
+++ trunk/app/HDRFlow/Sink.hpp 2007-08-13 20:48:45 UTC (rev 244)
@@ -0,0 +1,26 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifndef SINK_INC_
+#define SINK_INC_
+
+#include "Cache.hpp"
+
+namespace hdrflow {
+
+class Sink
+{
+public:
+ explicit Sink( )
+ { }
+};
+
+typedef boost::shared_ptr<Sink> SinkPtr;
+
+}
+
+#endif
Modified: trunk/app/HDRFlow/Source.hpp
===================================================================
--- trunk/app/HDRFlow/Source.hpp 2007-08-12 22:53:34 UTC (rev 243)
+++ trunk/app/HDRFlow/Source.hpp 2007-08-13 20:48:45 UTC (rev 244)
@@ -10,6 +10,8 @@
#include "Cache.hpp"
+namespace pl = olib::openpluginlib;
+
namespace hdrflow {
class Source
@@ -18,9 +20,11 @@
explicit Source( )
{ }
+ pl::string uri( ) const;
+ void set_uri( const pl::string& uri );
-
private:
+ CachePtr cache_;
};
typedef boost::shared_ptr<Source> SourcePtr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-12 22:53:36
|
Revision: 243
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=243&view=rev
Author: glslang
Date: 2007-08-12 15:53:34 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
+ add rendering order and source popups to viewer drawer
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlowController.h
trunk/app/HDRFlow/HDRFlowController.mm
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-08-12 21:11:42 UTC (rev 242)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-08-12 22:53:34 UTC (rev 243)
@@ -15,9 +15,9 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>266</integer>
+ <integer>29</integer>
<integer>21</integer>
- <integer>29</integer>
- <integer>266</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h 2007-08-12 21:11:42 UTC (rev 242)
+++ trunk/app/HDRFlow/HDRFlowController.h 2007-08-12 22:53:34 UTC (rev 243)
@@ -19,6 +19,8 @@
{
NSMutableArray* channels;
NSMutableArray* alpha;
+ NSMutableArray* source;
+ NSMutableArray* order;
NSMutableArray* lut;
ScriptEditorController* scriptEditor;
Modified: trunk/app/HDRFlow/HDRFlowController.mm
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.mm 2007-08-12 21:11:42 UTC (rev 242)
+++ trunk/app/HDRFlow/HDRFlowController.mm 2007-08-12 22:53:34 UTC (rev 243)
@@ -51,6 +51,16 @@
[ alpha addObject: [ [ NSString alloc ] initWithString: @"Green" ] ];
[ alpha addObject: [ [ NSString alloc ] initWithString: @"Blue" ] ];
+ source = [ [ NSMutableArray alloc ] init ];
+ [ source addObject: [ [ NSString alloc ] initWithString: @"A" ] ];
+ [ source addObject: [ [ NSString alloc ] initWithString: @"B" ] ];
+ [ source addObject: [ [ NSString alloc ] initWithString: @"AB" ] ];
+
+ order = [ [ NSMutableArray alloc ] init ];
+ [ order addObject: [ [ NSString alloc ] initWithString: @"Top to Bottom" ] ];
+ [ order addObject: [ [ NSString alloc ] initWithString: @"Left to Right" ] ];
+ [ order addObject: [ [ NSString alloc ] initWithString: @"Spiral" ] ];
+
lut = [ [ NSMutableArray alloc ] init ];
[ lut addObject: [ [ NSString alloc ] initWithString: @"sRGB" ] ];
[ lut addObject: [ [ NSString alloc ] initWithString: @"Linear" ] ];
@@ -62,6 +72,9 @@
[ channels release ];
[ alpha release ];
+ [ source release ];
+ [ order release ];
+ [ lut release ];
[ scriptEditor dealloc ];
[ super dealloc ];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-12 21:11:43
|
Revision: 242
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=242&view=rev
Author: glslang
Date: 2007-08-12 14:11:42 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
+ project file rearrangement
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-12 21:10:41 UTC (rev 241)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-12 21:11:42 UTC (rev 242)
@@ -112,6 +112,7 @@
677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */,
673D04450C522A610096513A /* PreferencesController.h */,
673D044F0C522C980096513A /* PreferencesController.m */,
+ 67B58EC60C6FAC2100A1C748 /* Source.hpp */,
671E22910C41652E00CA1860 /* ScriptEditorController.h */,
671E22A20C4166E400CA1860 /* ScriptEditorController.mm */,
67C3D3170C5361C600136EE8 /* ToolbarHolder.h */,
@@ -159,7 +160,6 @@
29B97317FDCFA39411CA2CEA /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
- 67B58EC60C6FAC2100A1C748 /* Source.hpp */,
);
name = HDRFlow;
sourceTree = "<group>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-12 21:10:47
|
Revision: 241
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=241&view=rev
Author: glslang
Date: 2007-08-12 14:10:41 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
+ adds Source node header file. TBD
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/app/HDRFlow/Source.hpp
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-12 20:39:16 UTC (rev 240)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-12 21:10:41 UTC (rev 241)
@@ -57,6 +57,7 @@
67A8A6E40C4181C600DB3F1B /* ScriptEngine.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = ScriptEngine.hpp; sourceTree = "<group>"; };
67A8A6E90C41836600DB3F1B /* Python.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Python.framework; path = /System/Library/Frameworks/Python.framework; sourceTree = "<absolute>"; };
67A8A73D0C4183C500DB3F1B /* ScriptEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptEngine.cpp; sourceTree = "<group>"; };
+ 67B58EC60C6FAC2100A1C748 /* Source.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Source.hpp; sourceTree = "<group>"; };
67BD59C70C36BE3600F0F7DF /* HDRFlowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HDRFlowController.h; sourceTree = "<group>"; };
67C064ED0C52231A00E9ED8E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; };
67C0BA220C5B69AF00E0E258 /* Viewer.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Viewer.hpp; sourceTree = "<group>"; };
@@ -158,6 +159,7 @@
29B97317FDCFA39411CA2CEA /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
+ 67B58EC60C6FAC2100A1C748 /* Source.hpp */,
);
name = HDRFlow;
sourceTree = "<group>";
Added: trunk/app/HDRFlow/Source.hpp
===================================================================
--- trunk/app/HDRFlow/Source.hpp (rev 0)
+++ trunk/app/HDRFlow/Source.hpp 2007-08-12 21:10:41 UTC (rev 241)
@@ -0,0 +1,30 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifndef SOURCE_INC_
+#define SOURCE_INC_
+
+#include "Cache.hpp"
+
+namespace hdrflow {
+
+class Source
+{
+public:
+ explicit Source( )
+ { }
+
+
+
+private:
+};
+
+typedef boost::shared_ptr<Source> SourcePtr;
+
+}
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-12 20:39:18
|
Revision: 240
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=240&view=rev
Author: glslang
Date: 2007-08-12 13:39:16 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
+initial Cache implementation
Modified Paths:
--------------
trunk/app/HDRFlow/Bucket.hpp
trunk/app/HDRFlow/Cache.cpp
trunk/app/HDRFlow/Cache.hpp
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/app/HDRFlow/Bucket.cpp
Deleted: trunk/app/HDRFlow/Bucket.cpp
===================================================================
--- trunk/app/HDRFlow/Bucket.cpp 2007-08-09 22:22:55 UTC (rev 239)
+++ trunk/app/HDRFlow/Bucket.cpp 2007-08-12 20:39:16 UTC (rev 240)
@@ -1,11 +0,0 @@
-
-// HDRFlow - A image processing application
-
-// Copyright (c) 2007 Goncalo N. M. de Carvalho
-// Released under the GPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
-
-#include "Bucket.hpp"
-
-namespace hdrflow {
-}
Modified: trunk/app/HDRFlow/Bucket.hpp
===================================================================
--- trunk/app/HDRFlow/Bucket.hpp 2007-08-09 22:22:55 UTC (rev 239)
+++ trunk/app/HDRFlow/Bucket.hpp 2007-08-12 20:39:16 UTC (rev 240)
@@ -10,14 +10,37 @@
#include <HDRFlow/openlibraries.hpp>
+namespace ml = olib::openmedialib::ml;
+
namespace hdrflow {
class Bucket
{
public:
- explicit Bucket( );
+ explicit Bucket( int position, ml::frame_type_ptr frame )
+ : position_( position )
+ , frame_( frame )
+ { }
+
+ int position( ) const
+ { return position_; }
+ void set_position( int position )
+ { position_ = position; }
+
+ ml::frame_type_ptr frame( ) const
+ { return frame_; }
+ void set_frame( ml::frame_type_ptr frame )
+ { frame_ = frame; }
+
+ bool is_loaded( ) { return frame_ != 0; }
+
+private:
+ int position_;
+ ml::frame_type_ptr frame_;
};
+typedef boost::shared_ptr<Bucket> BucketPtr;
+
}
#endif
Modified: trunk/app/HDRFlow/Cache.cpp
===================================================================
--- trunk/app/HDRFlow/Cache.cpp 2007-08-09 22:22:55 UTC (rev 239)
+++ trunk/app/HDRFlow/Cache.cpp 2007-08-12 20:39:16 UTC (rev 240)
@@ -7,5 +7,59 @@
#include "Cache.hpp"
+namespace pl = olib::openpluginlib;
+namespace ml = olib::openmedialib::ml;
+
namespace hdrflow {
+
+bool Cache::connect( const pl::string& media, bool fill )
+{
+ pl::string in( media + "/sequence: " );
+ input_ = ml::create_input( in );
+ if( input_ == 0 )
+ return false;
+
+ if( fill )
+ {
+ for( int i = 0; i < buckets_.size( ); ++i )
+ {
+ input_->seek( i, false );
+ buckets_.push_back( BucketPtr( new Bucket( i, input_->fetch( ) ) ) );
+ }
+ }
+
+ return true;
}
+
+BucketPtr Cache::reserve_bucket( int position )
+{
+ const_iterator b = find_bucket( position );
+ if( b == buckets_.end( ) )
+ {
+ b = acquire_bucket( );
+ if( b != buckets_.end( ) )
+ {
+ input_->seek( position, false );
+
+ ( *b )->set_position( position );
+ ( *b )->set_frame( input_->fetch( ) );
+ }
+ }
+ else
+ {
+
+ }
+
+ return *b;
+}
+
+int Cache::length( ) const
+{
+ if( input_ )
+ return input_->get_frames( );
+
+ return 0;
+}
+
+
+}
Modified: trunk/app/HDRFlow/Cache.hpp
===================================================================
--- trunk/app/HDRFlow/Cache.hpp 2007-08-09 22:22:55 UTC (rev 239)
+++ trunk/app/HDRFlow/Cache.hpp 2007-08-12 20:39:16 UTC (rev 240)
@@ -8,16 +8,52 @@
#ifndef CACHE_INC_
#define CACHE_INC_
+#include <list>
+
#include <HDRFlow/openlibraries.hpp>
+#include "Bucket.hpp"
+
+namespace pl = olib::openpluginlib;
+namespace ml = olib::openmedialib::ml;
+
namespace hdrflow {
class Cache
{
public:
- explicit Cache( );
+ typedef std::list<BucketPtr> container;
+ typedef container::iterator iterator;
+ typedef container::const_iterator const_iterator;
+ typedef container::reverse_iterator reverse_iterator;
+ typedef container::const_reverse_iterator const_reverse_iterator;
+
+public:
+ explicit Cache( int n )
+ : buckets_( n )
+ { }
+
+ bool connect( const pl::string& media, bool fill = true );
+ void disconnect( );
+ void flush( );
+ void clear( );
+
+ BucketPtr reserve_bucket( int position );
+
+ int length( ) const;
+ bool valid( ) const { return input_ != 0; }
+
+private:
+ const_iterator find_bucket( int position ) const;
+ const_iterator acquire_bucket( );
+
+private:
+ container buckets_;
+ ml::input_type_ptr input_;
};
+typedef boost::shared_ptr<Cache> CachePtr;
+
}
#endif
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-09 22:22:55 UTC (rev 239)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-12 20:39:16 UTC (rev 240)
@@ -11,7 +11,6 @@
671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 671E22A20C4166E400CA1860 /* ScriptEditorController.mm */; };
673D04500C522C980096513A /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 673D044F0C522C980096513A /* PreferencesController.m */; };
674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 674E44620C3F854A0036A908 /* ScriptEditor.nib */; };
- 676191B60C6643570076713C /* Bucket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676191B50C6643570076713C /* Bucket.cpp */; };
676191BF0C6643B20076713C /* Cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676191BE0C6643B20076713C /* Cache.cpp */; };
677740360C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */; };
678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */; };
@@ -51,7 +50,6 @@
674E44630C3F854A0036A908 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ScriptEditor.nib; sourceTree = "<group>"; };
676191810C663D100076713C /* Cache.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Cache.hpp; sourceTree = "<group>"; };
676191A40C6642CC0076713C /* Bucket.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Bucket.hpp; sourceTree = "<group>"; };
- 676191B50C6643570076713C /* Bucket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Bucket.cpp; sourceTree = "<group>"; };
676191BE0C6643B20076713C /* Cache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Cache.cpp; sourceTree = "<group>"; };
6777402D0C5C0022005FF29D /* PlugInsPreferencesOutlineViewNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlugInsPreferencesOutlineViewNode.h; sourceTree = "<group>"; };
677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PlugInsPreferencesOutlineViewNode.mm; sourceTree = "<group>"; };
@@ -99,7 +97,6 @@
isa = PBXGroup;
children = (
676191A40C6642CC0076713C /* Bucket.hpp */,
- 676191B50C6643570076713C /* Bucket.cpp */,
676191810C663D100076713C /* Cache.hpp */,
676191BE0C6643B20076713C /* Cache.cpp */,
67F6CCF70C285D6C00098F90 /* CustomOpenGLView.h */,
@@ -287,7 +284,6 @@
67C0BED90C5BCD4600E0E258 /* HDRFlowController.mm in Sources */,
67C0BEFB0C5BED8500E0E258 /* PlugInsPreferencesController.mm in Sources */,
677740360C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm in Sources */,
- 676191B60C6643570076713C /* Bucket.cpp in Sources */,
676191BF0C6643B20076713C /* Cache.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-09 22:23:00
|
Revision: 239
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=239&view=rev
Author: glslang
Date: 2007-08-09 15:22:55 -0700 (Thu, 09 Aug 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/extras/src/panoramic/panoramic.cpp
trunk/lib/extras/src/raw/raw.cpp
Modified: trunk/lib/extras/src/panoramic/panoramic.cpp
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic.cpp 2007-08-08 21:44:20 UTC (rev 238)
+++ trunk/lib/extras/src/panoramic/panoramic.cpp 2007-08-09 22:22:55 UTC (rev 239)
@@ -18,7 +18,6 @@
namespace pl = olib::openpluginlib;
namespace il = olib::openimagelib::il;
namespace ml = olib::openmedialib::ml;
-namespace fs = boost::filesystem;
namespace pcos = olib::openpluginlib::pcos;
namespace extras { namespace hdrflow { namespace pan {
@@ -137,14 +136,14 @@
int OfxGetNumberOfPlugins( )
{
return 1;
- }
-
+ }
+}
+
#ifdef WIN32
- BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
- {
- if( fdwReason == DLL_PROCESS_ATTACH )
- DisableThreadLibraryCalls( hInstDLL );
- return TRUE;
- }
-#endif
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+ return TRUE;
}
+#endif
Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp 2007-08-08 21:44:20 UTC (rev 238)
+++ trunk/lib/extras/src/raw/raw.cpp 2007-08-09 22:22:55 UTC (rev 239)
@@ -11,18 +11,18 @@
#include <windows.h>
#endif
-#include <openmedialib/il/openimagelib_plugin.hpp>
+#include <openpluginlib/pl/pcos/property_container.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace pl = olib::openpluginlib;
namespace il = olib::openimagelib::il;
-namespace fs = boost::filesystem;
namespace pcos = olib::openpluginlib::pcos;
namespace extras { namespace hdrflow { namespace raw {
namespace
{
- bool dcraw( property_container properties )
+ bool dcraw( pcos::property_container properties )
{
return true;
}
@@ -54,10 +54,10 @@
, tiff_output_( pcos::key::from_string( "tiff_output" ) )
{ }
- virtual il::image_type_ptr load( const fs::path& path )
+ virtual il::image_type_ptr load( pl::stream_ptr )
{ return il::image_type_ptr( ); }
- virtual bool store( const fs::path&, const il::image_type_ptr& )
+ virtual bool store( pl::stream_ptr, il::image_type_ptr )
{ return false; }
private:
@@ -107,13 +107,14 @@
{
delete static_cast<extras::hdrflow::raw::raw_plugin*>( plug );
}
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
-#ifdef WIN32
- BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
- {
- if( fdwReason == DLL_PROCESS_ATTACH )
- DisableThreadLibraryCalls( hInstDLL );
- return TRUE;
- }
+ return TRUE;
+}
#endif
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-08 21:44:24
|
Revision: 238
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=238&view=rev
Author: glslang
Date: 2007-08-08 14:44:20 -0700 (Wed, 08 Aug 2007)
Log Message:
-----------
+ build updates
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/m4/umbrella_framework.m4
trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
trunk/unity.sh
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/lib/openlibraries/configure.ac 2007-08-08 21:44:20 UTC (rev 238)
@@ -132,6 +132,9 @@
dnl OFX support
AC_CHECK_OFX( )
+dnl Umbrella Framework
+AC_CHECK_UMBRELLA_FRAMEWORK()
+
dnl Boost support
AC_LANG([C++])
AC_CHECK_BOOST( )
Modified: trunk/lib/openlibraries/m4/umbrella_framework.m4
===================================================================
--- trunk/lib/openlibraries/m4/umbrella_framework.m4 2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/lib/openlibraries/m4/umbrella_framework.m4 2007-08-08 21:44:20 UTC (rev 238)
@@ -10,6 +10,7 @@
UMBRELLA_FLAGS=""
+ AC_MSG_CHECKING(if building an umbrella framework)
if test x$enableumbrellaframework = "xyes" ; then
case $host in
*-apple-darwin*)
Modified: trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/Makefile.am 2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/lib/openlibraries/src/umbrella_framework/Makefile.am 2007-08-08 21:44:20 UTC (rev 238)
@@ -5,6 +5,8 @@
libdir = $(OPENMEDIALIB_LIBPATH)
+if HAVE_UMBRELLAFRAMEWORK
+
lib_LTLIBRARIES = libumbrella_framework.la
libumbrella_framework_la_SOURCES = \
@@ -33,4 +35,7 @@
library_include_HEADERS = \
openlibraries.hpp
+
+endif
+
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/unity.sh 2007-08-08 21:44:20 UTC (rev 238)
@@ -96,28 +96,32 @@
header_path_second=`cut -d '/' -f 6 header_temp.$$`
header_path="$header_path_first/$header_path_second"
- cp $1/$i current_header.$$
+ if [ -r $1/$i ]
+ then
+ cp $1/$i current_header.$$
- deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
- for j in $deplist
- do case $j in
- openpluginlib* )
- sed -e "s|$j|HDRFlowPlugin|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
- ;;
- openimagelib* )
- sed -e "s|$j|HDRFlowImage|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
- ;;
- openmedialib* )
- sed -e "s|$j|HDRFlowMedia|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
- ;;
- esac
- done
+ deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
+ for j in $deplist
+ do case $j in
+ openpluginlib* )
+ sed -e "s|$j|HDRFlowPlugin|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ openimagelib* )
+ sed -e "s|$j|HDRFlowImage|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ openmedialib* )
+ sed -e "s|$j|HDRFlowMedia|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ esac
+ done
- sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
- done
-
- rm header_temp.$$
- rm current_header.$$
+ sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
+
+ rm current_header.$$
+ fi
+
+ rm header_temp.$$
+ done
}
make_framework_libs( )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
