[Hdrflow-svn] SF.net SVN: hdrflow: [139] trunk/lib/openlibraries/src/openimagelib

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

Revision: 139
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=139&view=rev
Author:   glslang
Date:     2007-05-23 13:40:55 -0700 (Wed, 23 May 2007)

Log Message:
-----------
+ code cleanups
+ virtual address space of 3GB on win

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp
    trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/py/il.cpp

Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj	2007-05-23 20:40:55 UTC (rev 139)
@@ -202,20 +202,6 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\il.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\utility.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
@@ -267,6 +253,20 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\il.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\utility.cpp"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

Modified: trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp	2007-05-23 19:36:34 UTC (rev 138)
+++ trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp	2007-05-23 20:40:55 UTC (rev 139)
@@ -22,6 +22,8 @@
 	virtual bool			store( const boost::filesystem::path& path, const image_type_ptr& image ) = 0;
 };
 
+typedef boost::shared_ptr<openimagelib_plugin> openimagelib_plugin_ptr;
+
 } } }
 
 #endif

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj	2007-05-23 20:40:55 UTC (rev 139)
@@ -64,6 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				ShowProgress="0"
 				OutputFile="$(OutDir)\openimagelib_dpx-vc80-d-0_4_0.dll"
 				LinkIncremental="2"

Modified: trunk/lib/openlibraries/src/openimagelib/py/il.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/il.cpp	2007-05-23 19:36:34 UTC (rev 138)
+++ trunk/lib/openlibraries/src/openimagelib/py/il.cpp	2007-05-23 20:40:55 UTC (rev 139)
@@ -7,7 +7,6 @@
 
 #include <openpluginlib/py/python.hpp>
 #include <openimagelib/il/openimagelib_plugin.hpp>
-#include <openimagelib/plugins/tga/tga_plugin.hpp>
 #include <openimagelib/py/py.hpp>
 
 namespace fs  = boost::filesystem;
@@ -19,7 +18,7 @@
 
 il::image_type_ptr load_image( const opl::opl_ptr& ptr, const std::string& path )
 {
-	boost::shared_ptr<il::openimagelib_plugin> plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( ptr );
+	il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( ptr );
 	if( !plug )
 		return il::image_type_ptr( );
 


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