[Hdrflow-svn] SF.net SVN: hdrflow: [138] trunk/lib/openlibraries

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

Revision: 138
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=138&view=rev
Author:   glslang
Date:     2007-05-23 12:36:34 -0700 (Wed, 23 May 2007)

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

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
    trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
    trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
    trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
    trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
    trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
    trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
    trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp
    trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
    trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
    trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
    trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
    trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
    trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
    trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
    trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
    trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
    trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
    trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
    trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
    trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
    trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
    trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
    trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
    trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
    trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D_vc8.vcproj
    trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed_vc8.vcproj
    trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap_vc8.vcproj
    trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop_vc8.vcproj
    trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2_vc8.vcproj
    trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr_vc8.vcproj
    trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi_vc8.vcproj
    trunk/lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap_vc8.vcproj
    trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj
    trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj
    trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/multipass_draw_vc8.vcproj
    trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/noise_volume_vc8.vcproj
    trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/obj_draw_vc8.vcproj
    trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/texture_draw_vc8.vcproj
    trunk/lib/openlibraries/test/openpluginlib/discovery/discovery_vc8.vcproj
    trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate_vc8.vcproj
    trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/gpu_timer_query_vc8.vcproj
    trunk/lib/openlibraries/test/openpluginlib/initialization/initialization_vc8.vcproj
    trunk/lib/openlibraries/test/openpluginlib/pcos/key/key_vc8.vcproj
    trunk/lib/openlibraries/test/openpluginlib/pcos/property/property_vc8.vcproj
    trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/property_container_vc8.vcproj
    trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/subject-observer_vc8.vcproj
    trunk/lib/openlibraries/test/openpluginlib/rdtsc/rdtsc_vc8.vcproj
    trunk/lib/openlibraries/test/openpluginlib/sleep/sleep_vc8.vcproj

Removed Paths:
-------------
    trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp
    trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp
    trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp
    trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp
    trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga.cpp
    trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.hpp
    trunk/lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp
    trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp
    trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp

Modified: trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openassetlib_al-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)\src\openobjectlib\sg\$(ConfigurationName)"
@@ -148,6 +149,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)/openassetlib_al-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)\src\openobjectlib\sg\$(ConfigurationName)"

Modified: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -65,6 +65,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="sqlite-vc71-d-3_2_7.lib"
 				OutputFile="$(OutDir)\openassetlib_sqlite-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -147,6 +148,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="sqlite-vc71-r-3_2_7.lib"
 				OutputFile="$(OutDir)\openassetlib_sqlite-vc80-r-0_4_0.dll"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -64,6 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
 				OutputFile="$(OutDir)\openassetlib.pyd"
 				LinkIncremental="2"
@@ -146,6 +147,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
 				OutputFile="$(OutDir)\openassetlib.pyd"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -65,6 +65,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="Half_dll_d.lib IlmImf_dll_d.lib Iex_dll_d.lib"
 				OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -148,6 +149,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="Half_dll.lib IlmImf_dll.lib Iex_dll.lib"
 				OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-r-0_4_0.dll"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -71,6 +71,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)/openimagelib_il-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;"
@@ -159,6 +160,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)/openimagelib_il-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_3D_lightmap-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -150,6 +151,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_3D_lightmap-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -69,6 +69,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="gdiplus.lib"
 				OutputFile="$(OutDir)/openimagelib_bmp-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -157,6 +158,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="gdiplus.lib"
 				OutputFile="$(OutDir)/openimagelib_bmp-vc80-r-0_4_0.dll"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -109,15 +109,16 @@
 
 	il::image_type_ptr ddsd_pixelformat_to_image_type( DDSURFACEDESC2 ddsd )
 	{
-		#define MAKEFOURCC( ch0, ch1, ch2, ch3 )							\
+#		ifndef MAKEFOURCC
+#		define MAKEFOURCC( ch0, ch1, ch2, ch3 )							\
 				( ( unsigned long ) ( unsigned char ) ( ch0 )			|	\
 				( ( unsigned long ) ( unsigned char ) ( ch1 ) << 8  )	|	\
 				( ( unsigned long ) ( unsigned char ) ( ch2 ) << 16 )	|	\
 				( ( unsigned long ) ( unsigned char ) ( ch3 ) << 24 ) )
+#		endif
+#		define DDPF_FOURCC 		0x00000004
+#		define DDSCAPS2_CUBEMAP 0x00000200	
 
-		#define DDPF_FOURCC 		0x00000004
-		#define DDSCAPS2_CUBEMAP 	0x00000200	
-
 		if( ddsd.ddpfPixelFormat.dwFlags & DDPF_FOURCC )
 		{
 			typedef il::image<unsigned char, il::dxt1> dxt1_image_type;

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_dds-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -151,6 +152,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_dds-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="Half_dll_d.lib IlmImf_dll_d.lib Iex_dll_d.lib"
 				OutputFile="$(OutDir)\openimagelib_exr-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -149,6 +150,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="Half_dll.lib IlmImf_dll.lib Iex_dll.lib"
 				OutputFile="$(OutDir)\openimagelib_exr-vc80-r-0_4_0.dll"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="gdiplus.lib"
 				OutputFile="$(OutDir)\openimagelib_gdi-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -149,6 +150,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="gdiplus.lib"
 				OutputFile="$(OutDir)\openimagelib_gdi-vc80-r-0_4_0.dll"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -69,6 +69,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_hdr-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -153,6 +154,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_hdr-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -69,6 +69,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
 				OutputFile="$(OutDir)/openimagelib_jpg-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -158,6 +159,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
 				OutputFile="$(OutDir)/openimagelib_jpg-vc80-r-0_4_0.dll"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="libpng13.lib zdll.lib"
 				OutputFile="$(OutDir)\openimagelib_png-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -151,6 +152,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="libpng13.lib zdll.lib"
 				OutputFile="$(OutDir)\openimagelib_png-vc80-r-0_4_0.dll"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_psd-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -149,6 +150,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_psd-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="qtmlClient.lib"
 				OutputFile="$(OutDir)\openimagelib_quicktime-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -150,6 +151,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="qtmlClient.lib"
 				OutputFile="$(OutDir)\openimagelib_quicktime-vc80-r-0_4_0.dll"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am	2007-05-23 19:36:34 UTC (rev 138)
@@ -8,15 +8,11 @@
 lib_LTLIBRARIES = libopenimagelib_sgi.la
 
 libopenimagelib_sgi_la_SOURCES = \
-	config.hpp			\
-	sgi.cpp				\
-	sgi_plugin.hpp		\
 	sgi_plugin.cpp
 
 libopenimagelib_sgi_la_CXXFLAGS = \
 	$(OLIB_CXXFLAGS) \
-	$(BOOST_INCLUDE_PATH) \
-	# end
+	$(BOOST_INCLUDE_PATH)
 
 libopenimagelib_sgi_la_LIBADD = 	\
 	$(BOOST_FILESYSTEM_LIBS)

Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -1,25 +0,0 @@
-
-// SGI - A SGI plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef SGI_CONFIG_INC_
-#define SGI_CONFIG_INC_
-
-#ifdef WIN32
-	#ifdef SGI_EXPORTS
-		#define SGI_DECLSPEC __declspec( dllexport )
-	#else
-		#define SGI_DECLSPEC __declspec( dllimport )
-	#endif // SGI_EXPORTS
-#else
-	#ifdef SGI_EXPORTS
-		#define SGI_DECLSPEC extern
-	#else
-		#define SGI_DECLSPEC
-	#endif // SGI_EXPORTS
-#endif // WIN32
-
-#endif // SGI_CONFIG_INC_

Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -1,33 +0,0 @@
-
-// SGI - An SGI plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/sgi/sgi_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace SGI = olib::openimagelib::plugins::SGI;
-
-extern "C"
-{
-	SGI_DECLSPEC bool openplugin_init( void )
-	{
-		return true;
-	}
-
-	SGI_DECLSPEC bool openplugin_uninit( void )
-	{
-		return true;
-	}
-
-	SGI_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
-	{
-		*plug = new SGI::SGI_plugin;
-		return true;
-	}
-	
-	SGI_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
-	{ delete static_cast<SGI::SGI_plugin*>( plug ); }
-}

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -11,12 +11,13 @@
 
 #include <boost/filesystem/fstream.hpp>
 
-#include <openimagelib/plugins/sgi/sgi_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
 
 namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
 namespace fs = boost::filesystem;
 
-namespace olib { namespace openimagelib { namespace plugins { namespace SGI {
+namespace olib { namespace openimagelib { namespace il {
 
 namespace
 {
@@ -277,10 +278,47 @@
 	}
 }
 
-il::image_type_ptr SGI_plugin::load( const fs::path& path )
-{ return load_sgi( path ); }
+class sgi_plugin : public il::openimagelib_plugin
+{
+public:
+	virtual il::image_type_ptr load( const fs::path& path )
+	{ return load_sgi( path ); }
+	
+	virtual bool store( const fs::path&, const il::image_type_ptr& )
+	{ return false; }
+};
 
-bool SGI_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+} } }
 
-} } } }
+extern "C"
+{
+	IL_DECLSPEC bool openplugin_init( void )
+	{
+		return true;
+	}
+
+	IL_DECLSPEC bool openplugin_uninit( void )
+	{
+		return true;
+	}
+
+	IL_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+	{
+		*plug = new il::sgi_plugin;
+		return true;
+	}
+	
+	IL_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+	{ delete static_cast<il::sgi_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+	if( fdwReason == DLL_PROCESS_ATTACH )
+		DisableThreadLibraryCalls( hInstDLL );
+	
+	return TRUE;
+}
+#endif
+

Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -1,27 +0,0 @@
-
-// SGI - A SGI plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef SGI_PLUGIN_INC_
-#define SGI_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/sgi/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace SGI {
-
-class SGI_DECLSPEC SGI_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
-public:
-	virtual il::image_type_ptr	load(  const boost::filesystem::path& path );
-	virtual bool				store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SGI_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -66,6 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_sgi-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -125,7 +126,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SGI_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				EnableEnhancedInstructionSet="0"
@@ -149,6 +150,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_sgi-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -194,10 +196,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\sgi.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\sgi_plugin.cpp"
 				>
 			</File>
@@ -207,14 +205,6 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath=".\config.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\sgi_plugin.hpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am	2007-05-23 19:36:34 UTC (rev 138)
@@ -8,9 +8,6 @@
 lib_LTLIBRARIES = libopenimagelib_tga.la
 
 libopenimagelib_tga_la_SOURCES = 	\
-	config.hpp			\
-	tga.cpp				\
-	tga_plugin.hpp			\
 	tga_plugin.cpp
 
 libopenimagelib_tga_la_CXXFLAGS = 	\

Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -1,25 +0,0 @@
-
-// TGA - An TGA plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef TGA_CONFIG_INC_
-#define TGA_CONFIG_INC_
-
-#ifdef WIN32
-	#ifdef TGA_EXPORTS
-		#define TGA_DECLSPEC __declspec( dllexport )
-	#else
-		#define TGA_DECLSPEC __declspec( dllimport )
-	#endif // TGA_EXPORTS
-#else
-	#ifdef TGA_EXPORTS
-		#define TGA_DECLSPEC extern
-	#else
-		#define TGA_DECLSPEC
-	#endif // TGA_EXPORTS
-#endif // WIN32
-
-#endif // TGA_CONFIG_INC_

Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga.cpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga.cpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -1,33 +0,0 @@
-
-// TGA - An TGA plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/tga/tga_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace TGA = olib::openimagelib::plugins::TGA;
-
-extern "C"
-{
-	TGA_DECLSPEC bool openplugin_init( void )
-	{
-		return true;
-	}
-
-	TGA_DECLSPEC bool openplugin_uninit( void )
-	{
-		return true;
-	}
-
-	TGA_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
-	{
-		*plug = new TGA::TGA_plugin;
-		return true;
-	}
-	
-	TGA_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
-	{ delete static_cast<TGA::TGA_plugin*>( plug ); }
-}

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -7,7 +7,6 @@
 
 #ifdef WIN32
 #include <windows.h>
-#include <gdiplus.h>
 #endif // WIN32
 
 #include <vector>
@@ -16,13 +15,13 @@
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/path.hpp>
 
-#include <openimagelib/plugins/tga/tga_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
 
-namespace fs  = boost::filesystem;
-namespace il  = olib::openimagelib::il;
-namespace opl = olib::openpluginlib;
+namespace fs = boost::filesystem;
+namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
 
-namespace olib { namespace openimagelib { namespace plugins { namespace TGA {
+namespace olib { namespace openimagelib { namespace il {
 
 namespace
 {
@@ -246,11 +245,47 @@
 #undef TGA_TYPE_COLOR_RLE
 #undef TGA_TYPE_GRAY_RLE
 }
-			
-il::image_type_ptr TGA_plugin::load( const fs::path& path )
-{ return load_tga( path ); }
 
-bool TGA_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+class tga_plugin : public il::openimagelib_plugin
+{
+public:
+	virtual il::image_type_ptr load( const fs::path& path )
+	{ return load_tga( path ); }
+	
+	virtual bool store( const fs::path&, const il::image_type_ptr& )
+	{ return false; }
+};
 
-} } } }
+} } }
+
+extern "C"
+{
+	IL_DECLSPEC bool openplugin_init( void )
+	{
+		return true;
+	}
+
+	IL_DECLSPEC bool openplugin_uninit( void )
+	{
+		return true;
+	}
+
+	IL_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+	{
+		*plug = new il::tga_plugin;
+		return true;
+	}
+	
+	IL_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+	{ delete static_cast<il::tga_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+	if( fdwReason == DLL_PROCESS_ATTACH )
+		DisableThreadLibraryCalls( hInstDLL );
+	
+	return TRUE;
+}
+#endif

Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.hpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.hpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -1,27 +0,0 @@
-
-// TGA - A TGA plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef TGA_PLUGIN_INC_
-#define TGA_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/tga/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace TGA {
-
-class TGA_DECLSPEC TGA_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
-public:
-	virtual il::image_type_ptr	load(  const boost::filesystem::path& path );
-	virtual bool				store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TGA_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
@@ -67,6 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_tga-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -126,7 +127,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TGA_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -151,6 +152,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openimagelib_tga-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -196,10 +198,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\tga.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\tga_plugin.cpp"
 				>
 			</File>
@@ -209,14 +207,6 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath=".\config.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tga_plugin.hpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am	2007-05-23 19:36:34 UTC (rev 138)
@@ -10,9 +10,6 @@
 lib_LTLIBRARIES = libopenimagelib_tiff.la
 
 libopenimagelib_tiff_la_SOURCES = 	\
-	config.hpp			\
-	tiff.cpp			\
-	tiff_plugin.hpp		\
 	tiff_plugin.cpp
 
 libopenimagelib_tiff_la_CXXFLAGS = 	\

Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -1,25 +0,0 @@
-
-// TIFF - A TIFF plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef TIFF_CONFIG_INC_
-#define TIFF_CONFIG_INC_
-
-#ifdef WIN32
-	#ifdef TIFF_EXPORTS
-		#define TIFF_DECLSPEC __declspec( dllexport )
-	#else
-		#define TIFF_DECLSPEC __declspec( dllimport )
-	#endif // TIFF_EXPORTS
-#else
-	#ifdef TIFF_EXPORTS
-		#define TIFF_DECLSPEC extern
-	#else
-		#define TIFF_DECLSPEC
-	#endif // TIFF_EXPORTS
-#endif // WIN32
-
-#endif

Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -1,33 +0,0 @@
-
-// TIFF - A TIFF plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/tiff/tiff_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace TIFF = olib::openimagelib::plugins::TIFF;
-
-extern "C"
-{
-	TIFF_DECLSPEC bool openplugin_init( void )
-	{
-		return true;
-	}
-
-	TIFF_DECLSPEC bool openplugin_uninit( void )
-	{
-		return true;
-	}
-
-	TIFF_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
-	{
-		*plug = new TIFF::TIFF_plugin;
-		return true;
-	}
-	
-	TIFF_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
-	{ delete static_cast<TIFF::TIFF_plugin*>( plug ); }
-}

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -13,28 +13,22 @@
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/path.hpp>
 
-#include <openimagelib/plugins/tiff/tiff_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
 
-namespace fs  = boost::filesystem;
-namespace il  = olib::openimagelib::il;
-namespace opl = olib::openpluginlib;
+namespace fs = boost::filesystem;
+namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
 
-namespace olib { namespace openimagelib { namespace plugins { namespace TIFF {
+namespace olib { namespace openimagelib { namespace il {
 
 namespace
 {
-	void destroy( il::image_type* im )
-	{ delete im; }
-
 	il::image_type_ptr tiff_image_type_to_image_type( unsigned short components, int width, int height )
 	{
-		typedef il::image<unsigned char, il::r8g8b8>	    r8g8b8_image_type;
-		typedef il::image<unsigned char, il::r8g8b8a8>   r8g8b8a8_image_type;
-
 		if( components == 4 )
-			return il::image_type_ptr( new il::image_type( r8g8b8a8_image_type( width, height, 1 ) ), destroy );
+			return il::allocate( L"r8g8b8a8", width, height );
 		else if( components == 3 )
-			return il::image_type_ptr( new il::image_type( r8g8b8_image_type( width, height, 1 ) ), destroy );
+			return il::allocate( L"r8g8b8", width, height );
 
 		return il::image_type_ptr( );
 	}
@@ -128,10 +122,46 @@
 	}
 }
 
-il::image_type_ptr TIFF_plugin::load( const fs::path& path )
-{ return load_tiff( path ); }
+class tiff_plugin : public il::openimagelib_plugin
+{
+public:
+	virtual il::image_type_ptr load( const fs::path& path )
+	{ return load_tiff( path ); }
+	
+	virtual bool store( const fs::path&, const il::image_type_ptr& )
+	{ return false; }
+};
 
-bool TIFF_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+} } }
 
-} } } }
+extern "C"
+{
+	IL_DECLSPEC bool openplugin_init( void )
+	{
+		return true;
+	}
+
+	IL_DECLSPEC bool openplugin_uninit( void )
+	{
+		return true;
+	}
+
+	IL_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+	{
+		*plug = new il::tiff_plugin;
+		return true;
+	}
+	
+	IL_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+	{ delete static_cast<il::tiff_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+	if( fdwReason == DLL_PROCESS_ATTACH )
+		DisableThreadLibraryCalls( hInstDLL );
+	
+	return TRUE;
+}
+#endif

Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp	2007-05-23 19:36:34 UTC (rev 138)
@@ -1,27 +0,0 @@
-
-// TIFF - A TIFF plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef TIFF_PLUGIN_INC_
-#define TIFF_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/tiff/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace TIFF {
-
-class TIFF_DECLSPEC TIFF_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
-public:
-	virtual il::image_type_ptr	load(  const boost::filesystem::path& path );
-	virtual bool				store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34&quot;;C:\libtiff\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIFF_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
@@ -64,6 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="libtiff.lib"
 				OutputFile="$(OutDir)\openimagelib_tiff-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -124,7 +125,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34&quot;;C:\libtiff\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIFF_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -147,6 +148,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="libtiff.lib"
 				OutputFile="$(OutDir)\openimagelib_tiff-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
@@ -193,10 +195,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\tiff.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\tiff_plugin.cpp"
 				>
 			</File>
@@ -206,14 +204,6 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath=".\config.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tiff_plugin.hpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -64,6 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
 				OutputFile="$(OutDir)\openimagelib.pyd"
 				LinkIncremental="2"
@@ -146,6 +147,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
 				OutputFile="$(OutDir)\openimagelib.pyd"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openmedialib_ml-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
@@ -148,6 +149,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openmedialib_ml-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openmedialib_gensys-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)&quot;"
@@ -148,6 +149,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openmedialib_gensys-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)&quot;"

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -65,6 +65,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openmedialib_ofx-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
@@ -146,6 +147,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openmedialib_ofx-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openmedialib_oil-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
@@ -149,6 +150,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\openmedialib_oil-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="CVClient.lib QTMLClient.lib"
 				OutputFile="$(OutDir)\openmedialib_quicktime-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -149,6 +150,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="CVClient.lib QTMLClient.lib"
 				OutputFile="$(OutDir)\openmedialib_quicktime-vc80-r-0_4_0.dll"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
 				OutputFile="$(OutDir)\openmedialib.pyd"
 				LinkIncremental="2"
@@ -149,6 +150,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
 				OutputFile="$(OutDir)\openmedialib.pyd"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -71,6 +71,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)/openobjectlib_x3d-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
@@ -158,6 +159,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)/openobjectlib_x3d-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"

Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -68,6 +68,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)/openobjectlib_obj-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
@@ -153,6 +154,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)/openobjectlib_obj-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"

Modified: trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -72,6 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="false"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="opengl32.lib glu32.lib glew32.lib cg.lib cgGL.lib"
 				OutputFile="$(OutDir)/openobjectlib_sg-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -160,6 +161,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="false"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="opengl32.lib glu32.lib glew32.lib cg.lib cgGL.lib"
 				OutputFile="$(OutDir)/openobjectlib_sg-vc80-r-0_4_0.dll"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="winmm.lib opengl32.lib glew32.lib cg.lib cgGL.lib"
 				OutputFile="$(OutDir)/openpluginlib_pl-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
@@ -153,6 +154,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="winmm.lib opengl32.lib glew32.lib cg.lib cgGL.lib"
 				OutputFile="$(OutDir)/openpluginlib_pl-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
@@ -369,11 +371,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\pcos\property.hpp"
+				RelativePath=".\property.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\property.hpp"
+				RelativePath=".\pcos\property.hpp"
 				>
 			</File>
 			<File

Modified: trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
 				OutputFile="$(OutDir)\openpluginlib.pyd"
 				LinkIncremental="2"
@@ -152,6 +153,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
 				OutputFile="$(OutDir)\openpluginlib.pyd"
 				LinkIncremental="1"

Modified: trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -64,6 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib"
 				GenerateDebugInformation="true"
@@ -144,6 +145,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib"
 				GenerateDebugInformation="true"

Modified: trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj	2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj	2007-05-23 19:36:34 UTC (rev 138)
@@ -64,6 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib"
 				GenerateDebugInformation="true"
@@ -142,6 +143,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib"
 				GenerateDebugInformation="true"

Modified: trunk/lib/o...
 
[truncated message content]