hdrflow-svn Mailing List for HDRFlow (Page 3)

Status: Pre-Alpha

Brought to you by: glslang

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

Flat | Threaded

<< < 1 2 3 4 5 .. 16 > >> (Page 3 of 16)

[Hdrflow-svn] SF.net SVN: hdrflow: [412] trunk/lib/extras/extras_vc8.sln

From: <gl...@us...> - 2008-02-10 17:22:51

Revision: 412
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=412&view=rev
Author:   glslang
Date:     2008-02-10 09:22:50 -0800 (Sun, 10 Feb 2008)

Log Message:
-----------
+ build fixes

Modified Paths:
--------------
    trunk/lib/extras/extras_vc8.sln

Modified: trunk/lib/extras/extras_vc8.sln
===================================================================
--- trunk/lib/extras/extras_vc8.sln	2008-02-10 10:19:51 UTC (rev 411)
+++ trunk/lib/extras/extras_vc8.sln	2008-02-10 17:22:50 UTC (rev 412)
@@ -16,8 +16,6 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JP2", "JP2", "{CE7A290A-13C0-424E-A02A-96CDC6B0E6BE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jp2", "src\jp2\jp2_vc8.vcproj", "{9A2197B4-ABC1-4047-A81B-15E9D228C108}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PPM", "PPM", "{4E0BD6BF-2B4D-4BF8-BEB7-3BFF57D627BC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ppm", "src\ppm\ppm_vc8.vcproj", "{95CD0C43-860C-467B-9995-E6A4E0F8519B}"
@@ -50,10 +48,6 @@
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{95CD0C43-860C-467B-9995-E6A4E0F8519B}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{95CD0C43-860C-467B-9995-E6A4E0F8519B}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{95CD0C43-860C-467B-9995-E6A4E0F8519B}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -90,7 +84,6 @@
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8} = {675FBBBA-6681-49E3-AAC6-FE371310DA63}
 		{927446CD-3483-4CCF-B581-F0896DD4A550} = {E0C3CF4A-5F43-4BBC-B7A9-6D4CDB225CD9}
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373} = {D133B05E-F174-4CDA-8FF4-C45C139CFACD}
-		{9A2197B4-ABC1-4047-A81B-15E9D228C108} = {CE7A290A-13C0-424E-A02A-96CDC6B0E6BE}
 		{95CD0C43-860C-467B-9995-E6A4E0F8519B} = {4E0BD6BF-2B4D-4BF8-BEB7-3BFF57D627BC}
 		{061A3FF5-B3C6-4CDC-A018-5B985C234CD6} = {0CED7D48-905C-4C67-96B9-668B7728ED10}
 		{80F6C766-D2FB-4744-AAAD-0DC99094DCDD} = {078F108D-642B-417D-99C6-F05C8266C57E}


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

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

From: <gl...@us...> - 2008-02-10 10:19:53

Revision: 411
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=411&view=rev
Author:   glslang
Date:     2008-02-10 02:19:51 -0800 (Sun, 10 Feb 2008)

Log Message:
-----------
+ enable some plugins

Modified Paths:
--------------
    trunk/lib/openlibraries/installer/hdrflow_runtime.nsi
    trunk/lib/openlibraries/installer/hdrflow_sdk.nsi

Modified: trunk/lib/openlibraries/installer/hdrflow_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_runtime.nsi	2008-02-09 18:46:08 UTC (rev 410)
+++ trunk/lib/openlibraries/installer/hdrflow_runtime.nsi	2008-02-10 10:19:51 UTC (rev 411)
@@ -106,8 +106,8 @@
   File "..\src\openmedialib\py\Multi-threaded Release DLL\HDRFlowMedia.pyd"
   
   SetOutPath $INSTDIR\plugins\release
-  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
+;  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
+;  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
   File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
@@ -124,6 +124,8 @@
   File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
   File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl"
+  File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
   File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
 ;  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"

Modified: trunk/lib/openlibraries/installer/hdrflow_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_sdk.nsi	2008-02-09 18:46:08 UTC (rev 410)
+++ trunk/lib/openlibraries/installer/hdrflow_sdk.nsi	2008-02-10 10:19:51 UTC (rev 411)
@@ -198,12 +198,14 @@
   File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-${VERSION}.dll"
   File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
   File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl"
+  File "..\src\openmedialib\plugins\avformat\Multi-threaded Debug DLL\openmedialib_avformat-vc80-d-${VERSION}.dll"
   File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
   File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-  File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll"
+;  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+;  File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-${VERSION}.dll"
+;  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
+;  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll"
   File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
   File "..\src\openmedialib\plugins\ofx\Multi-threaded Debug DLL\openmedialib_ofx-vc80-d-${VERSION}.dll"
 ;  File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
@@ -216,8 +218,8 @@
   File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-${VERSION}.dll"
   
   SetOutPath $INSTDIR\plugins\release
-  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
+;  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
+;  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
   File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
@@ -234,12 +236,14 @@
   File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
   File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl"
+  File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
   File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
+;  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+;  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
+;  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
+;  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
   File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
 ;  File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"


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

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

From: <gl...@us...> - 2008-02-09 18:46:11

Revision: 410
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=410&view=rev
Author:   glslang
Date:     2008-02-09 10:46:08 -0800 (Sat, 09 Feb 2008)

Log Message:
-----------
+ build fixes

Modified Paths:
--------------
    trunk/lib/openlibraries/openlibraries_iw_vc8.sln
    trunk/lib/openlibraries/openlibraries_vc8.sln
    trunk/lib/openlibraries/src/openimagelib/py/py_vc8.icproj
    trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
    trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
    trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.icproj
    trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
    trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.icproj
    trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj

Modified: trunk/lib/openlibraries/openlibraries_iw_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_iw_vc8.sln	2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/openlibraries_iw_vc8.sln	2008-02-09 18:46:08 UTC (rev 410)
@@ -101,12 +101,6 @@
 		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
 	EndProjectSection
 EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "3D_lightmap", "src\openimagelib\plugins\3D_lightmap\3D_lightmap_vc8.icproj", "{54828EE2-BA89-4700-9E52-24A8A8301880}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
-	EndProjectSection
-EndProject
 Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "bmp", "src\openimagelib\plugins\bmp\bmp_vc8.icproj", "{847EA448-ED49-4A63-822E-6DBC2F760298}"
 	ProjectSection(ProjectDependencies) = postProject
 		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
@@ -149,12 +143,6 @@
 		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
 	EndProjectSection
 EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "psd", "src\openimagelib\plugins\psd\psd_vc8.icproj", "{A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-	EndProjectSection
-EndProject
 Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.icproj", "{123BEE85-5545-49D6-BC1A-B9D07187312A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
@@ -209,52 +197,14 @@
 		{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
 	EndProjectSection
 EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.icproj", "{9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-		{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SG", "SG", "{BD86F550-C573-4A68-955B-6CEDCC8F595D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{9483FC7B-E396-43E6-84ED-EB021AC54252}"
 EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "sg", "src\openobjectlib\sg\sg_vc8.icproj", "{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-	EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "X3D", "src\openobjectlib\plugins\X3D\X3D_vc8.icproj", "{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AL", "AL", "{D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9}"
 EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "al", "src\openassetlib\al\al_vc8.icproj", "{80261E5B-CC18-4844-B0C2-7D8B04671BAE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
-		{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
-	EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "py", "src\openassetlib\py\py_vc8.icproj", "{DCDE03E7-5170-4CB4-ACF5-E788CF12E283}"
-	ProjectSection(ProjectDependencies) = postProject
-		{80261E5B-CC18-4844-B0C2-7D8B04671BAE} = {80261E5B-CC18-4844-B0C2-7D8B04671BAE}
-	EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "sqlite", "src\openassetlib\plugins\sqlite\sqlite_vc8.icproj", "{E18DF63F-8CDB-4377-8C5C-79FCC969E113}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-		{80261E5B-CC18-4844-B0C2-7D8B04671BAE} = {80261E5B-CC18-4844-B0C2-7D8B04671BAE}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{C2EBF114-BFF6-4520-BC11-EB54565B92D6}"
 EndProject
 Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "_2D", "test\openimagelib\GL\_2D\_2D_vc8.icproj", "{EC14269B-467D-4AE7-94B1-F6F4B6280543}"
@@ -317,30 +267,6 @@
 		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
 	EndProjectSection
 EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "multipass_draw", "test\openobjectlib\GL\multipass_draw\multipass_draw_vc8.icproj", "{40ABEE3D-14F3-490A-8919-CEAE879BCF28}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
-	EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "noise_volume", "test\openobjectlib\GL\noise_volume\noise_volume_vc8.icproj", "{BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-	EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "obj_draw", "test\openobjectlib\GL\obj_draw\obj_draw_vc8.icproj", "{68B88FAE-568D-4CED-90F4-3FDA1BCC481D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
-	EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "texture_draw", "test\openobjectlib\GL\texture_draw\texture_draw_vc8.icproj", "{840428EF-8268-4F4D-878C-DAB32E8D5AC8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{B972DCEB-386E-42D2-8C5E-DD2942EC7F63}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{C85EDDFB-1A91-4ABD-8E86-6AFDF0C85CBA}"
@@ -370,17 +296,6 @@
 		{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
 	EndProjectSection
 EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "jpg", "src\openimagelib\plugins\jpg\jpg_vc8.icproj", "{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
-		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
-	EndProjectSection
-EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "obj", "src\openobjectlib\plugins\wavefront\obj_vc8.icproj", "{DDF3D73D-8E68-403E-A5D8-0F3D3231E590}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -443,10 +358,6 @@
 		{4AF3F015-09ED-47CC-A30C-0ECC1C1BB557}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{4AF3F015-09ED-47CC-A30C-0ECC1C1BB557}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{4AF3F015-09ED-47CC-A30C-0ECC1C1BB557}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{54828EE2-BA89-4700-9E52-24A8A8301880}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{54828EE2-BA89-4700-9E52-24A8A8301880}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{54828EE2-BA89-4700-9E52-24A8A8301880}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{54828EE2-BA89-4700-9E52-24A8A8301880}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{847EA448-ED49-4A63-822E-6DBC2F760298}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{847EA448-ED49-4A63-822E-6DBC2F760298}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{847EA448-ED49-4A63-822E-6DBC2F760298}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -475,10 +386,6 @@
 		{6C5F9915-54DD-4C1F-9CD1-6112D80BBE8C}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{6C5F9915-54DD-4C1F-9CD1-6112D80BBE8C}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{6C5F9915-54DD-4C1F-9CD1-6112D80BBE8C}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{123BEE85-5545-49D6-BC1A-B9D07187312A}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{123BEE85-5545-49D6-BC1A-B9D07187312A}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{123BEE85-5545-49D6-BC1A-B9D07187312A}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -511,30 +418,6 @@
 		{1BECC806-7A92-409B-A6F2-1FA6AB42E0A5}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{1BECC806-7A92-409B-A6F2-1FA6AB42E0A5}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{1BECC806-7A92-409B-A6F2-1FA6AB42E0A5}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{80261E5B-CC18-4844-B0C2-7D8B04671BAE}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{80261E5B-CC18-4844-B0C2-7D8B04671BAE}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{80261E5B-CC18-4844-B0C2-7D8B04671BAE}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{80261E5B-CC18-4844-B0C2-7D8B04671BAE}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{DCDE03E7-5170-4CB4-ACF5-E788CF12E283}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{DCDE03E7-5170-4CB4-ACF5-E788CF12E283}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{DCDE03E7-5170-4CB4-ACF5-E788CF12E283}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{DCDE03E7-5170-4CB4-ACF5-E788CF12E283}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{E18DF63F-8CDB-4377-8C5C-79FCC969E113}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{E18DF63F-8CDB-4377-8C5C-79FCC969E113}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{E18DF63F-8CDB-4377-8C5C-79FCC969E113}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{E18DF63F-8CDB-4377-8C5C-79FCC969E113}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{EC14269B-467D-4AE7-94B1-F6F4B6280543}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{EC14269B-467D-4AE7-94B1-F6F4B6280543}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{EC14269B-467D-4AE7-94B1-F6F4B6280543}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -575,22 +458,6 @@
 		{105D3AE5-6D9E-40FC-A0AD-89DC3C795121}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{105D3AE5-6D9E-40FC-A0AD-89DC3C795121}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{105D3AE5-6D9E-40FC-A0AD-89DC3C795121}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{40ABEE3D-14F3-490A-8919-CEAE879BCF28}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{40ABEE3D-14F3-490A-8919-CEAE879BCF28}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{40ABEE3D-14F3-490A-8919-CEAE879BCF28}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{40ABEE3D-14F3-490A-8919-CEAE879BCF28}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{68B88FAE-568D-4CED-90F4-3FDA1BCC481D}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{68B88FAE-568D-4CED-90F4-3FDA1BCC481D}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{68B88FAE-568D-4CED-90F4-3FDA1BCC481D}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{68B88FAE-568D-4CED-90F4-3FDA1BCC481D}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{840428EF-8268-4F4D-878C-DAB32E8D5AC8}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{840428EF-8268-4F4D-878C-DAB32E8D5AC8}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{840428EF-8268-4F4D-878C-DAB32E8D5AC8}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{840428EF-8268-4F4D-878C-DAB32E8D5AC8}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{68A41D6B-F6DB-4A26-9202-22950CC80697}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{68A41D6B-F6DB-4A26-9202-22950CC80697}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{68A41D6B-F6DB-4A26-9202-22950CC80697}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -607,14 +474,6 @@
 		{52CD991C-C495-4EB9-80D2-D9E1F809AA9B}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{52CD991C-C495-4EB9-80D2-D9E1F809AA9B}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{52CD991C-C495-4EB9-80D2-D9E1F809AA9B}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{2B35E24C-CFD8-4658-ADC5-9C831B6181D5}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{2B35E24C-CFD8-4658-ADC5-9C831B6181D5}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{2B35E24C-CFD8-4658-ADC5-9C831B6181D5}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -671,10 +530,6 @@
 		{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -703,10 +558,6 @@
 		{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -739,30 +590,6 @@
 		{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -803,22 +630,6 @@
 		{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -835,12 +646,6 @@
 		{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -888,7 +693,6 @@
 		{B972DCEB-386E-42D2-8C5E-DD2942EC7F63} = {BEF92EC2-7872-48E2-BF6F-3DE4EBA9C037}
 		{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {51ECF4DE-6959-485D-9D68-A055E45393DD}
 		{4AF3F015-09ED-47CC-A30C-0ECC1C1BB557} = {51ECF4DE-6959-485D-9D68-A055E45393DD}
-		{54828EE2-BA89-4700-9E52-24A8A8301880} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{847EA448-ED49-4A63-822E-6DBC2F760298} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{05C95FA3-7755-4F6E-8D87-79CA433A481C} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{70559110-3095-4653-B905-3332F81FB48C} = {D9066C6C-E143-472F-860E-004E481F3E0A}
@@ -896,24 +700,15 @@
 		{D2A54593-9912-4A94-950C-4204994E5AD0} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{82F69659-47F1-44E2-A6AF-7E125BFE333B} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{6C5F9915-54DD-4C1F-9CD1-6112D80BBE8C} = {D9066C6C-E143-472F-860E-004E481F3E0A}
-		{A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{123BEE85-5545-49D6-BC1A-B9D07187312A} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{F29DD922-4E1C-4A7D-B388-FB4FCA97F369} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{FA6FE539-D58B-4963-BC62-F0F5AE9D07A2} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{FF86DCCC-8D8F-4016-B4BC-6699963EEEE1} = {D9066C6C-E143-472F-860E-004E481F3E0A}
-		{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
 		{7A534984-2C4F-43EB-9ED1-F47E0E1C07F5} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
 		{B7855283-738F-4ADF-9C7C-5BFFDD5B537F} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
 		{FC5B483A-2782-4DB8-88FC-CDF767A067D5} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
 		{1BECC806-7A92-409B-A6F2-1FA6AB42E0A5} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
-		{9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
-		{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {BD86F550-C573-4A68-955B-6CEDCC8F595D}
-		{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
-		{DDF3D73D-8E68-403E-A5D8-0F3D3231E590} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
-		{80261E5B-CC18-4844-B0C2-7D8B04671BAE} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
-		{DCDE03E7-5170-4CB4-ACF5-E788CF12E283} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
-		{E18DF63F-8CDB-4377-8C5C-79FCC969E113} = {56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9}
 		{EC14269B-467D-4AE7-94B1-F6F4B6280543} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
 		{5CBC56F0-7DF5-437C-A59D-5ECD4CAF21DC} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
 		{30E45B23-A206-4803-833F-23445A872619} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
@@ -922,10 +717,6 @@
 		{1B8C0271-A3E1-4B9F-A3D2-8AD59994AD8A} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
 		{009731D9-D224-48AB-A8F4-B5C584A0FAEF} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
 		{83613041-D1A9-40E0-92C7-AB9B5B1CF30B} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
-		{BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
-		{68B88FAE-568D-4CED-90F4-3FDA1BCC481D} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
-		{840428EF-8268-4F4D-878C-DAB32E8D5AC8} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
-		{40ABEE3D-14F3-490A-8919-CEAE879BCF28} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
 		{68A41D6B-F6DB-4A26-9202-22950CC80697} = {C85EDDFB-1A91-4ABD-8E86-6AFDF0C85CBA}
 	EndGlobalSection
 EndGlobal

Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln	2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln	2008-02-09 18:46:08 UTC (rev 410)
@@ -101,12 +101,6 @@
 		{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3D_lightmap", "src\openimagelib\plugins\3D_lightmap\3D_lightmap_vc8.vcproj", "{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
-		{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmp", "src\openimagelib\plugins\bmp\bmp_vc8.vcproj", "{261595DD-FB76-4D37-A3C8-0D9625C20D46}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
@@ -149,12 +143,6 @@
 		{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "psd", "src\openimagelib\plugins\psd\psd_vc8.vcproj", "{FF23E252-5FD9-4642-9563-1111B12D8EE7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
-		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.vcproj", "{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
@@ -209,13 +197,6 @@
 		{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
-		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
-		{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SG", "SG", "{BD86F550-C573-4A68-955B-6CEDCC8F595D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{9483FC7B-E396-43E6-84ED-EB021AC54252}"
@@ -389,10 +370,6 @@
 		{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{8EB61E38-3457-4312-B8F9-D29CA73E30B6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{261595DD-FB76-4D37-A3C8-0D9625C20D46}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -421,10 +398,6 @@
 		{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{4A6B0F4F-676E-4A96-A990-62464D923ED2}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{FF23E252-5FD9-4642-9563-1111B12D8EE7}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -457,10 +430,6 @@
 		{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -572,7 +541,6 @@
 		{B972DCEB-386E-42D2-8C5E-DD2942EC7F63} = {BEF92EC2-7872-48E2-BF6F-3DE4EBA9C037}
 		{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {51ECF4DE-6959-485D-9D68-A055E45393DD}
 		{8EB61E38-3457-4312-B8F9-D29CA73E30B6} = {51ECF4DE-6959-485D-9D68-A055E45393DD}
-		{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{261595DD-FB76-4D37-A3C8-0D9625C20D46} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{875CE227-A98F-4711-9496-61BC21DA88B8} = {D9066C6C-E143-472F-860E-004E481F3E0A}
@@ -580,7 +548,6 @@
 		{08D0F0FA-947B-4AAF-90A8-7FBFC5EBD51B} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{972FF7FA-BDBE-400E-BDF6-59C13A6AE74D} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{4A6B0F4F-676E-4A96-A990-62464D923ED2} = {D9066C6C-E143-472F-860E-004E481F3E0A}
-		{FF23E252-5FD9-4642-9563-1111B12D8EE7} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{291BFF23-61D3-4355-8AA5-C8BF0FE30CB0} = {D9066C6C-E143-472F-860E-004E481F3E0A}
 		{227A0088-F3AE-4CA7-941C-0283D44F1678} = {D9066C6C-E143-472F-860E-004E481F3E0A}
@@ -590,7 +557,6 @@
 		{88BCD57E-044F-4427-A407-541BA8A938E6} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
 		{A60E2710-2DA9-4641-AEF6-6488A6264723} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
 		{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
-		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
 		{0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
 		{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
 		{24D622CC-4577-49B0-9224-8BB191236A61} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}

Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.icproj	2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.icproj	2008-02-09 18:46:08 UTC (rev 410)
@@ -4,17 +4,14 @@
 	Version="10.0"
 	Name="py"
 	ProjectGUID="{4AF3F015-09ED-47CC-A30C-0ECC1C1BB557}"
-	RootNamespace="py"
-	Keyword="Win32Proj"
 	VCNestedProjectGUID="{8EB61E38-3457-4312-B8F9-D29CA73E30B6}"
-	VCNestedProjectCRC32="136617910"
-	VCNestedProjectFileName="py_vc8.vcproj">
+	VCNestedProjectCRC32="4102186171"
+	VCNestedProjectFileName="py_vc8.vcproj"
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform 
 			Name="Win32"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration 
 			Name="Multi-threaded Debug DLL|Win32">
@@ -25,62 +22,49 @@
 				ConfigurationType="2"
 				CharacterSet="1"/>
 			<Tool 
-				Name="PreBuildEventTool"/>
-			<Tool 
-				Name="CustomTool"/>
-			<Tool 
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool 
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool 
-				Name="MidlCmplrTool"/>
-			<Tool 
 				Name="CppCmplrTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;C:\Python25\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;HAVE_FLEX_STRING"
-				MinimalRebuild="true"
+				MinimalRebuild="1"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				OpenMP="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="1"
+				DebugInformationFormat="4"
+				OpenMP="1"/>
 			<Tool 
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool 
-				Name="ResCmplrTool"/>
-			<Tool 
-				Name="PreLinkEventTool"/>
-			<Tool 
 				Name="LinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalOptions="/LARGEADDRESSAWARE"
+				DelayImpLib=""
+				IgnoreImportLibrary="1"
 				AdditionalDependencies="boost_python-vc80-mt-gd-1_34_1.lib"
 				OutputFile="$(OutDir)\HDRFlowImage.pyd"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;;C:\Python25\Libs"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
+				GenerateDebugInformation="1"
 				SubSystem="2"
-				TargetMachine="1"/>
+				TargetMachine="1"
+				AdditionalOptions="/LARGEADDRESSAWARE"/>
 			<Tool 
-				Name="VCALinkTool"/>
+				Name="LibrarianTool"/>
 			<Tool 
-				Name="VCManifestTool"/>
+				Name="ResCmplrTool"/>
 			<Tool 
-				Name="VCXDCMakeTool"/>
+				Name="MidlCmplrTool"/>
 			<Tool 
 				Name="BscMakeTool"/>
 			<Tool 
-				Name="VCFxCopTool"/>
+				Name="PreBuildEventTool"/>
 			<Tool 
-				Name="VCAppVerifierTool"/>
+				Name="PreLinkEventTool"/>
 			<Tool 
-				Name="VCWebDeploymentTool"/>
-			<Tool 
 				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
 		</Configuration>
 		<Configuration 
 			Name="Multi-threaded Release DLL|Win32">
@@ -92,94 +76,61 @@
 				CharacterSet="1"
 				WholeProgramOptimization="1"/>
 			<Tool 
-				Name="PreBuildEventTool"/>
-			<Tool 
-				Name="CustomTool"/>
-			<Tool 
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool 
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool 
-				Name="MidlCmplrTool"/>
-			<Tool 
 				Name="CppCmplrTool"
+				WholeProgramOptimization="1"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;C:\Python25\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;HAVE_FLEX_STRING"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				FloatingPointModel="2"
-				OpenMP="true"
+				BufferSecurityCheck="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="1"
+				DebugInformationFormat="3"
+				OpenMP="1"/>
 			<Tool 
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool 
-				Name="ResCmplrTool"/>
-			<Tool 
-				Name="PreLinkEventTool"/>
-			<Tool 
 				Name="LinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalOptions="/LARGEADDRESSAWARE"
+				DelayImpLib=""
+				IgnoreImportLibrary="1"
 				AdditionalDependencies="boost_python-vc80-mt-1_34_1.lib"
 				OutputFile="$(OutDir)\HDRFlowImage.pyd"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;;C:\Python25\Libs"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
+				GenerateDebugInformation="1"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				TargetMachine="1"
+				AdditionalOptions="/LARGEADDRESSAWARE"/>
 			<Tool 
-				Name="VCALinkTool"/>
+				Name="LibrarianTool"/>
 			<Tool 
-				Name="VCManifestTool"/>
+				Name="ResCmplrTool"/>
 			<Tool 
-				Name="VCXDCMakeTool"/>
+				Name="MidlCmplrTool"/>
 			<Tool 
 				Name="BscMakeTool"/>
 			<Tool 
-				Name="VCFxCopTool"/>
+				Name="PreBuildEventTool"/>
 			<Tool 
-				Name="VCAppVerifierTool"/>
+				Name="PreLinkEventTool"/>
 			<Tool 
-				Name="VCWebDeploymentTool"/>
-			<Tool 
 				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</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=".\py.cpp">
-			</File>
-		</Filter>
-		<Filter 
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File 
-				RelativePath=".\py.hpp">
-			</File>
-		</Filter>
-		<Filter 
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
+		<File 
+			RelativePath=".\py.hpp"/>
+		<File 
+			RelativePath=".\il.cpp"/>
+		<File 
+			RelativePath=".\lut_functions.cpp"/>
+		<File 
+			RelativePath=".\py.cpp"/>
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
 

Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj	2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj	2008-02-09 18:46:08 UTC (rev 410)
@@ -68,7 +68,7 @@
 				AdditionalDependencies="boost_python-vc80-mt-gd-1_34_1.lib"
 				OutputFile="$(OutDir)\HDRFlowImage.pyd"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;;C:\Python25\Libs"
+				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -123,6 +123,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;C:\Python25\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;HAVE_FLEX_STRING"
 				ExceptionHandling="2"
@@ -151,7 +152,7 @@
 				AdditionalDependencies="boost_python-vc80-mt-1_34_1.lib"
 				OutputFile="$(OutDir)\HDRFlowImage.pyd"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;;C:\Python25\Libs"
+				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"

Modified: trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp	2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp	2008-02-09 18:46:08 UTC (rev 410)
@@ -27,14 +27,8 @@
 #endif
 
 #ifndef OPENPLUGINLIB_TOOLSET
-#	if defined( _MSC_VER ) && ( _MSC_VER == 1310 ) && !defined( __ICL )
-#		define OPENPLUGINLIB_TOOLSET "vc71"
-
-#	elif defined( _MSC_VER ) && ( _MSC_VER >= 1400 )
+#	if defined( _MSC_VER ) && ( _MSC_VER >= 1400 )
 #		define OPENPLUGINLIB_TOOLSET "vc80"
-
-#	elif defined( __ICL ) && ( __INTEL_COMPILER >= 900 ) && ( _MSC_VER == 1310 )
-#		define OPENPLUGINLIB_TOOLSET "iw-vc71"
 #	endif
 #endif
 

Modified: trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.icproj	2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.icproj	2008-02-09 18:46:08 UTC (rev 410)
@@ -4,17 +4,14 @@
 	Version="10.0"
 	Name="rescaler_bench"
 	ProjectGUID="{52CD991C-C495-4EB9-80D2-D9E1F809AA9B}"
-	RootNamespace="rescaler_bench"
-	Keyword="Win32Proj"
 	VCNestedProjectGUID="{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}"
-	VCNestedProjectCRC32="3480937260"
-	VCNestedProjectFileName="rescaler_bench_vc8.vcproj">
+	VCNestedProjectCRC32="4056980913"
+	VCNestedProjectFileName="rescaler_bench_vc8.vcproj"
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform 
 			Name="Win32"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration 
 			Name="Multi-threaded Debug DLL|Win32">
@@ -25,60 +22,47 @@
 				ConfigurationType="1"
 				CharacterSet="1"/>
 			<Tool 
-				Name="PreBuildEventTool"/>
-			<Tool 
-				Name="CustomTool"/>
-			<Tool 
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool 
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool 
-				Name="MidlCmplrTool"/>
-			<Tool 
 				Name="CppCmplrTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(SolutionDir)\src;&quot;C:\Boost\include\boost-1_34_1&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
-				MinimalRebuild="true"
+				MinimalRebuild="1"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				OpenMP="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="1"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4503"/>
+				DisableSpecificWarnings="4503"
+				OpenMP="1"/>
 			<Tool 
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool 
-				Name="ResCmplrTool"/>
-			<Tool 
-				Name="PreLinkEventTool"/>
-			<Tool 
 				Name="LinkerTool"
-				AdditionalOptions="/LARGEADDRESSAWARE"
+				DelayImpLib=""
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Boost\lib"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName)"
+				GenerateDebugInformation="1"
 				SubSystem="1"
-				TargetMachine="1"/>
+				TargetMachine="1"
+				AdditionalOptions="/LARGEADDRESSAWARE"/>
 			<Tool 
-				Name="VCALinkTool"/>
+				Name="LibrarianTool"/>
 			<Tool 
-				Name="VCManifestTool"/>
+				Name="ResCmplrTool"/>
 			<Tool 
-				Name="VCXDCMakeTool"/>
+				Name="MidlCmplrTool"/>
 			<Tool 
 				Name="BscMakeTool"/>
 			<Tool 
-				Name="VCFxCopTool"/>
+				Name="PreBuildEventTool"/>
 			<Tool 
-				Name="VCAppVerifierTool"/>
+				Name="PreLinkEventTool"/>
 			<Tool 
-				Name="VCWebDeploymentTool"/>
-			<Tool 
 				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
 		</Configuration>
 		<Configuration 
 			Name="Multi-threaded Release DLL|Win32">
@@ -90,86 +74,53 @@
 				CharacterSet="1"
 				WholeProgramOptimization="1"/>
 			<Tool 
-				Name="PreBuildEventTool"/>
-			<Tool 
-				Name="CustomTool"/>
-			<Tool 
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool 
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool 
-				Name="MidlCmplrTool"/>
-			<Tool 
 				Name="CppCmplrTool"
+				WholeProgramOptimization="1"
 				AdditionalIncludeDirectories="$(SolutionDir)\src;&quot;C:\Boost\include\boost-1_34_1&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				FloatingPointModel="2"
-				OpenMP="true"
+				BufferSecurityCheck="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="1"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4503"/>
+				DisableSpecificWarnings="4503"
+				OpenMP="1"/>
 			<Tool 
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool 
-				Name="ResCmplrTool"/>
-			<Tool 
-				Name="PreLinkEventTool"/>
-			<Tool 
 				Name="LinkerTool"
-				AdditionalOptions="/LARGEADDRESSAWARE"
+				DelayImpLib=""
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\Boost\lib"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName)"
+				GenerateDebugInformation="1"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				TargetMachine="1"
+				AdditionalOptions="/LARGEADDRESSAWARE"/>
 			<Tool 
-				Name="VCALinkTool"/>
+				Name="LibrarianTool"/>
 			<Tool 
-				Name="VCManifestTool"/>
+				Name="ResCmplrTool"/>
 			<Tool 
-				Name="VCXDCMakeTool"/>
+				Name="MidlCmplrTool"/>
 			<Tool 
 				Name="BscMakeTool"/>
 			<Tool 
-				Name="VCFxCopTool"/>
+				Name="PreBuildEventTool"/>
 			<Tool 
-				Name="VCAppVerifierTool"/>
+				Name="PreLinkEventTool"/>
 			<Tool 
-				Name="VCWebDeploymentTool"/>
-			<Tool 
 				Name="PostBuildEventTool"/>
+			<Tool 
+				Name="CustomTool"/>
+			<Tool 
+				Name="CustomNodeTool"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</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=".\rescaler_bench.cpp">
-			</File>
-		</Filter>
-		<Filter 
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-		</Filter>
-		<Filter 
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
+		<File 
+			RelativePath=".\rescaler_bench.cpp"/>
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
 

Modified: trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj	2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj	2008-02-09 18:46:08 UTC (rev 410)
@@ -66,7 +66,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/LARGEADDRESSAWARE"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Boost\lib"
+				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -121,6 +121,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="$(SolutionDir)\src;&quot;C:\Boost\include\boost-1_34_1&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
 				ExceptionHandling="2"
@@ -147,7 +148,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/LARGEADDRESSAWARE"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\Boost\lib"
+				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"

Modified: trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.icproj	2008-02-09 13:31:51 UTC (rev 409)
+++ trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.icproj	2008-02-09 18:46:08 UTC (rev 410)
@@ -4,17 +4,14 @@
 	Version="10.0"
 	Name="tm_bench"
 	ProjectGUID="{6217C9BE-C025-48E5-BBB6-258BDF3ED5F3}"
-	RootNamespace="tm_bench"
-	Keyword="Win32Proj"
 	VCNestedProjectGUID="{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
-	VCNestedProjectCRC32="948879944"
-	VCNestedProjectFileName="tm_bench_vc8.vcproj">
+	VCNestedProjectCRC32="3089716335"
+	VCNestedProjectFileName="tm_bench_vc8.vcproj"
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform 
 			Name="Win32"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration 
 			Name="Multi-threaded Debug DLL|Win32">
@@ -25,60 +22,47 @@
 				ConfigurationType="1"
 				CharacterSet="1"/>
 			<Tool 
-				Name="PreBuildEventTool"/>
-			<Tool 
-				Name="CustomTool"/>
-			<Tool 
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool 
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool 
-				Name="MidlCmplrTool"/>
-			<Tool 
 				Name="CppCmplrTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(SolutionDir)\src;&quot;C:\Boost\include\boost-1_34_1&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
-				MinimalRebuild="true"
+				MinimalRebuild="1"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				OpenMP="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="1"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4503"/>
+				DisableSpecificWarnings="4503"
+				OpenMP="1"/>
 			<Tool 
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool 
-				Name="ResCmplrTool"/>
-			<Tool 
-				Name="PreLinkEventTool"/>
-			<Tool 
 				Name="LinkerTool"
-				AdditionalOptions="/LARGEADDRESSAWARE"
+				DelayImpLib=""
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Boost\lib"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openme...
 
[truncated message content]

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

From: <gl...@us...> - 2008-02-09 13:31:56

Revision: 409
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=409&view=rev
Author:   glslang
Date:     2008-02-09 05:31:51 -0800 (Sat, 09 Feb 2008)

Log Message:
-----------
+ build updates (removal of not-needed libs)

Modified Paths:
--------------
    trunk/lib/openlibraries/installer/hdrflow_runtime.nsi
    trunk/lib/openlibraries/installer/hdrflow_sdk.nsi
    trunk/lib/openlibraries/openlibraries_vc8.sln

Modified: trunk/lib/openlibraries/installer/hdrflow_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_runtime.nsi	2008-02-06 22:59:49 UTC (rev 408)
+++ trunk/lib/openlibraries/installer/hdrflow_runtime.nsi	2008-02-09 13:31:51 UTC (rev 409)
@@ -1,5 +1,5 @@
 ;--------------------------------
-;NSIS OpenLibraries Installation Script
+;NSIS HDRFlow Installation Script
 ;--------------------------------
 
 !ifndef VERSION
@@ -13,15 +13,15 @@
 !ifdef OUTFILE
   OutFile "${OUTFILE}"
 !else
-  OutFile openlibraries-${VERSION_DOT}-runtime.exe
+  OutFile hdrflow-${VERSION_DOT}-runtime.exe
 !endif
 
 SetCompressor /SOLID lzma
 
 InstType "Full"
 
-InstallDir $PROGRAMFILES\OpenLibraries
-InstallDirRegKey HKLM Software\OpenLibraries ""
+InstallDir $PROGRAMFILES\HDRFlow
+InstallDirRegKey HKLM Software\HDRFlow ""
 
 ;--------------------------------
 ;Header Files
@@ -34,8 +34,8 @@
 !include "write_env_str.nsh"
 
 ;Names
-Name "OpenLibraries"
-Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
+Name "HDRFlow"
+Caption "HDRFlow (v.${VERSION_DOT}) Setup"
 
 ;Interface Settings
 !define MUI_ABORTWARNING
@@ -47,8 +47,8 @@
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
 ;Pages
-!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION_DOT}) Setup Wizard"
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of OpenLibraries.\r\n\r\n$_CLICK"
+!define MUI_WELCOMEPAGE_TITLE "Welcome to the HDRFlow (v.${VERSION_DOT}) Setup Wizard"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of HDRFlow.\r\n\r\n$_CLICK"
 
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "..\COPYING"
@@ -57,7 +57,7 @@
 !insertmacro MUI_PAGE_INSTFILES
 
 !define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.openlibraries.org/"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.hdrflow.com/"
 
 !insertmacro MUI_PAGE_FINISH
 
@@ -69,10 +69,10 @@
 
 !insertmacro MUI_LANGUAGE "English"
 
-Section "OpenLibraries" SecCore
+Section "HDRFlow" SecCore
 
   SetDetailsPrint textonly
-  DetailPrint "Installing OpenLibraries..."
+  DetailPrint "Installing HDRFlow..."
   SetDetailsPrint listonly
 
   SectionIn 1 2 3 RO
@@ -84,12 +84,10 @@
   File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll"
-  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.dll"
 
   ; dependencies
   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
-  File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
   File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
   File "C:\OpenEXR\bin\Release\Half.dll"
   File "C:\OpenEXR\bin\Release\Iex.dll"
@@ -106,7 +104,6 @@
   File "..\src\openpluginlib\py\Multi-threaded Release DLL\HDRFlowPlugin.pyd"
   File "..\src\openimagelib\py\Multi-threaded Release DLL\HDRFlowImage.pyd"
   File "..\src\openmedialib\py\Multi-threaded Release DLL\HDRFlowMedia.pyd"
-  File "..\src\openassetlib\py\Multi-threaded Release DLL\HDRFlowAsset.pyd"
   
   SetOutPath $INSTDIR\plugins\release
   File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
@@ -121,28 +118,26 @@
   File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
   File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
-  File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
+;  File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
+;  File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
   File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
   File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
   File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
+;  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+;  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
+;  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
+;  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
   File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
-  ;File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
-  ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
-  File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
-  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
-  File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
-  File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
+;  File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
+;  File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
+;  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
   File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
   File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
   
@@ -180,19 +175,19 @@
 ;--------------------------------
 ;Registry
 
-WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion"		"${VERSION_DOT}"
-WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirRelease"	"$INSTDIR\plugins\release"
-WriteRegStr HKLM "Software\OpenLibraries" "KernelsDir"			"$INSTDIR\kernels"
-WriteRegStr HKLM "Software\OpenLibraries" "ShadersDir"			"$INSTDIR\shaders"
+WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion"	"${VERSION_DOT}"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease"	"$INSTDIR\plugins\release"
+WriteRegStr HKLM "Software\HDRFlow" "KernelsDir"		"$INSTDIR\kernels"
+WriteRegStr HKLM "Software\HDRFlow" "ShadersDir"		"$INSTDIR\shaders"
 
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "DisplayName" "OpenLibraries"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString" "$INSTDIR\uninst-openlibraries.exe"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "DisplayName" "HDRFlow"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString" "$INSTDIR\uninst-hdrflow.exe"
   
 SectionEnd
 
 Section -post
 
-	WriteUninstaller $INSTDIR\uninst-openlibraries.exe
+	WriteUninstaller $INSTDIR\uninst-hdrflow.exe
 
 SectionEnd
 
@@ -200,7 +195,7 @@
 ;Descriptions
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "OpenLibraries development and runtime files"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "HDRFlow development and runtime files"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;--------------------------------
@@ -212,8 +207,8 @@
   DetailPrint "Deleting Files..."
   SetDetailsPrint listonly
 
-  DeleteRegKey HKLM "Software\OpenLibraries"
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries"
+  DeleteRegKey HKLM "Software\HDRFlow"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow"
 
   Push "$INSTDIR\bin"
   Call un.RemoveFromPath
@@ -238,11 +233,11 @@
 
  Function .onInit
  
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString"
+  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString"
   StrCmp $R0 "" done
  
   MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "OpenLibraries is already installed. $\n$\nClick `OK` to remove the \
+  "HDRFlow is already installed. $\n$\nClick `OK` to remove the \
   previous version or `Cancel` to cancel this upgrade." \
   IDOK uninst
   Abort
@@ -264,7 +259,7 @@
     goto done
   no_remove_uninstaller:
     MessageBox MB_ICONEXCLAMATION \
-    "Unable to remove previous version of OpenLibraries"
+    "Unable to remove previous version of HDRFlow"
     Abort
   
 done:

Modified: trunk/lib/openlibraries/installer/hdrflow_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_sdk.nsi	2008-02-06 22:59:49 UTC (rev 408)
+++ trunk/lib/openlibraries/installer/hdrflow_sdk.nsi	2008-02-09 13:31:51 UTC (rev 409)
@@ -1,5 +1,5 @@
 ;--------------------------------
-;NSIS OpenLibraries Installation Script
+;NSIS HDRFlow Installation Script
 ;--------------------------------
 
 !ifndef VERSION
@@ -69,7 +69,7 @@
 
 !insertmacro MUI_LANGUAGE "English"
 
-Section "OpenLibraries" SecCore
+Section "HDRFlow" SecCore
 
   SetDetailsPrint textonly
   DetailPrint "Installing HDRFlow SDK..."
@@ -142,15 +142,6 @@
   File ..\src\openmedialib\ml\openmedialib_plugin.hpp
   File ..\src\openmedialib\ml\store.hpp
   File ..\src\openmedialib\ml\utilities.hpp
-   
-  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openassetlib\al
-  File ..\src\openassetlib\al\al.hpp
-  File ..\src\openassetlib\al\al_plugin.hpp
-  File ..\src\openassetlib\al\asset.hpp
-  File ..\src\openassetlib\al\base64_codec.hpp
-  File ..\src\openassetlib\al\config.hpp
-  File ..\src\openassetlib\al\guid.hpp
-  File ..\src\openassetlib\al\set.hpp
 
   SetOutPath $INSTDIR\bin
   File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.dll"
@@ -159,10 +150,6 @@
   File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.dll"
   File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.dll"
-  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll"
-  File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.dll"
-  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.dll"
 
   ; dependencies
   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
@@ -183,7 +170,6 @@
   File "..\src\openpluginlib\py\Multi-threaded Debug DLL\HDRFlowPlugin.pyd"
   File "..\src\openimagelib\py\Multi-threaded Debug DLL\HDRFlowImage.pyd"
   File "..\src\openmedialib\py\Multi-threaded Debug DLL\HDRFlowMedia.pyd"
-  File "..\src\openassetlib\py\Multi-threaded Debug DLL\HDRFlowAsset.pyd"
   
   SetOutPath $INSTDIR\lib
   File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.lib"
@@ -192,10 +178,6 @@
   File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.lib"
   File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.lib"
   File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.lib"
-  File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.lib"
-  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.lib"
-  File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.lib"
-  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.lib"
    
   SetOutPath $INSTDIR\plugins\debug
 ;  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
@@ -230,8 +212,6 @@
 ;  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
 ;  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
 ;  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll"
-  File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
-  File "..\src\openassetlib\plugins\sqlite\Multi-threaded Debug DLL\openassetlib_sqlite-vc80-d-${VERSION}.dll"
   File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
   File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-${VERSION}.dll"
   
@@ -382,7 +362,7 @@
   StrCmp $R0 "" done
  
   MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "OpenLibraries is already installed. $\n$\nClick `OK` to remove the \
+  "HDRFlow is already installed. $\n$\nClick `OK` to remove the \
   previous version or `Cancel` to cancel this upgrade." \
   IDOK uninst
   Abort

Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln	2008-02-06 22:59:49 UTC (rev 408)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln	2008-02-09 13:31:51 UTC (rev 409)
@@ -224,24 +224,6 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "al", "src\openassetlib\al\al_vc8.vcproj", "{BD346E41-BEBD-43E7-9801-8EC1158355C4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
-		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
-		{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "py", "src\openassetlib\py\py_vc8.vcproj", "{ECEDB34E-A863-420F-BFC6-F294AC078892}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4} = {BD346E41-BEBD-43E7-9801-8EC1158355C4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "src\openassetlib\plugins\sqlite\sqlite_vc8.vcproj", "{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4} = {BD346E41-BEBD-43E7-9801-8EC1158355C4}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{C2EBF114-BFF6-4520-BC11-EB54565B92D6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D", "test\openimagelib\GL\_2D\_2D_vc8.vcproj", "{24D622CC-4577-49B0-9224-8BB191236A61}"
@@ -479,18 +461,6 @@
 		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -623,9 +593,6 @@
 		{1AC3D22B-175B-4169-B74A-276F9D5BA7AB} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
 		{0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
 		{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
-		{BD346E41-BEBD-43E7-9801-8EC1158355C4} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
-		{ECEDB34E-A863-420F-BFC6-F294AC078892} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
-		{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA} = {56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9}
 		{24D622CC-4577-49B0-9224-8BB191236A61} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
 		{F0557FAB-2BC7-4991-9AD8-560526321D80} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
 		{23B3623B-4FED-49F3-8F16-4883E57588E6} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}


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

[Hdrflow-svn] SF.net SVN: hdrflow: [408] trunk/lib/openlibraries/installer/hdrflow_sdk. nsi

From: <gl...@us...> - 2008-02-06 22:59:52

Revision: 408
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=408&view=rev
Author:   glslang
Date:     2008-02-06 14:59:49 -0800 (Wed, 06 Feb 2008)

Log Message:
-----------
+ build fix

Modified Paths:
--------------
    trunk/lib/openlibraries/installer/hdrflow_sdk.nsi

Modified: trunk/lib/openlibraries/installer/hdrflow_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_sdk.nsi	2008-02-06 22:55:42 UTC (rev 407)
+++ trunk/lib/openlibraries/installer/hdrflow_sdk.nsi	2008-02-06 22:59:49 UTC (rev 408)
@@ -34,8 +34,8 @@
 !include "write_env_str.nsh"
 
 ;Names
-Name "OpenLibraries"
-Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
+Name "HDRFlow"
+Caption "HDRFlow (v.${VERSION_DOT}) Setup"
 
 ;Interface Settings
 !define MUI_ABORTWARNING


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

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

From: <gl...@us...> - 2008-02-06 22:55:45

Revision: 407
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=407&view=rev
Author:   glslang
Date:     2008-02-06 14:55:42 -0800 (Wed, 06 Feb 2008)

Log Message:
-----------
+ breaking from the hive

Added Paths:
-----------
    trunk/lib/openlibraries/installer/hdrflow_runtime.nsi

Removed Paths:
-------------
    trunk/lib/openlibraries/installer/openlibraries_runtime.nsi

Copied: trunk/lib/openlibraries/installer/hdrflow_runtime.nsi (from rev 406, trunk/lib/openlibraries/installer/openlibraries_runtime.nsi)
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_runtime.nsi	                        (rev 0)
+++ trunk/lib/openlibraries/installer/hdrflow_runtime.nsi	2008-02-06 22:55:42 UTC (rev 407)
@@ -0,0 +1,274 @@
+;--------------------------------
+;NSIS OpenLibraries Installation Script
+;--------------------------------
+
+!ifndef VERSION
+  !define VERSION 0_5_0
+  !define VERSION_DOT 0.5.0
+!endif
+
+;--------------------------------
+;Configuration
+
+!ifdef OUTFILE
+  OutFile "${OUTFILE}"
+!else
+  OutFile openlibraries-${VERSION_DOT}-runtime.exe
+!endif
+
+SetCompressor /SOLID lzma
+
+InstType "Full"
+
+InstallDir $PROGRAMFILES\OpenLibraries
+InstallDirRegKey HKLM Software\OpenLibraries ""
+
+;--------------------------------
+;Header Files
+
+!define ALL_USERS
+
+!include "MUI.nsh"
+!include "Sections.nsh"
+!include "add_to_path.nsh"
+!include "write_env_str.nsh"
+
+;Names
+Name "OpenLibraries"
+Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
+
+;Interface Settings
+!define MUI_ABORTWARNING
+
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "openlibraries.bmp" ; optional
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp"
+
+!define MUI_COMPONENTSPAGE_SMALLDESC
+
+;Pages
+!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION_DOT}) Setup Wizard"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of OpenLibraries.\r\n\r\n$_CLICK"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "..\COPYING"
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.openlibraries.org/"
+
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+
+!insertmacro MUI_LANGUAGE "English"
+
+Section "OpenLibraries" SecCore
+
+  SetDetailsPrint textonly
+  DetailPrint "Installing OpenLibraries..."
+  SetDetailsPrint listonly
+
+  SectionIn 1 2 3 RO
+  SetOutPath $INSTDIR
+
+  SetOverwrite on
+
+  SetOutPath $INSTDIR\bin
+  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
+  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll"
+  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.dll"
+
+  ; dependencies
+  File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
+  File "C:\OpenEXR\bin\Release\Half.dll"
+  File "C:\OpenEXR\bin\Release\Iex.dll"
+  File "C:\OpenEXR\bin\Release\IlmImf.dll"
+  File "C:\OpenEXR\bin\Release\Half.dll"
+  File "C:\OpenEXR\bin\Release\IlmThread.dll"
+  File "C:\OpenEXR\bin\Release\Imath.dll"
+  File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
+  File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
+  File "C:\zlib\lib\zlib1.dll"
+
+  ; Python
+  SetOutPath $INSTDIR\python
+  File "..\src\openpluginlib\py\Multi-threaded Release DLL\HDRFlowPlugin.pyd"
+  File "..\src\openimagelib\py\Multi-threaded Release DLL\HDRFlowImage.pyd"
+  File "..\src\openmedialib\py\Multi-threaded Release DLL\HDRFlowMedia.pyd"
+  File "..\src\openassetlib\py\Multi-threaded Release DLL\HDRFlowAsset.pyd"
+  
+  SetOutPath $INSTDIR\plugins\release
+  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
+  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
+  File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
+  File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
+  File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
+  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
+  File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
+  File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
+  File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
+  File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
+  File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
+  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
+  File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
+  ;File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
+  ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
+  File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
+  File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
+  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
+  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
+  File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
+  File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-${VERSION}.dll"
+  File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
+  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
+  
+  SetOutPath $INSTDIR\shaders
+  File "..\effects\shaders\sepia.cg"
+  File "..\effects\shaders\sepia.frag"
+  File "..\effects\shaders\fixed_function.vert"
+  File "..\effects\shaders\passthrough.vert"
+  File "..\effects\shaders\passthrough.cg"
+  File "..\effects\shaders\rgb_to_yuv444.frag"
+  File "..\effects\shaders\yuv444_to_rgb.frag"
+  File "..\effects\shaders\yuv444_to_rgb.cg"
+  File "..\effects\shaders\yuv444_to_rgb_deinterlace.cg"
+  File "..\effects\shaders\yuv444_to_rgb_deinterlace.frag"
+  File "..\effects\shaders\histogram.cg"
+  File "..\effects\shaders\histogram.frag"
+  File "..\effects\shaders\channel_selector.cg"
+  File "..\effects\shaders\channel_selector.frag"
+ 
+  SetDetailsPrint both
+
+;--------------------------------
+;Path environment variable
+
+  Push "$INSTDIR\bin"
+  Call AddToPath
+  Push "$INSTDIR\bin\Release"
+  Call AddToPath
+;--------------------------------
+;Python environment variable
+  Push "PYTHONPATH"
+  Push "$INSTDIR\python"
+  Call WriteEnvStr
+
+;--------------------------------
+;Registry
+
+WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion"		"${VERSION_DOT}"
+WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirRelease"	"$INSTDIR\plugins\release"
+WriteRegStr HKLM "Software\OpenLibraries" "KernelsDir"			"$INSTDIR\kernels"
+WriteRegStr HKLM "Software\OpenLibraries" "ShadersDir"			"$INSTDIR\shaders"
+
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "DisplayName" "OpenLibraries"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString" "$INSTDIR\uninst-openlibraries.exe"
+  
+SectionEnd
+
+Section -post
+
+	WriteUninstaller $INSTDIR\uninst-openlibraries.exe
+
+SectionEnd
+
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "OpenLibraries development and runtime files"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;--------------------------------
+;Uninstaller Section
+
+Section Uninstall
+
+  SetDetailsPrint textonly
+  DetailPrint "Deleting Files..."
+  SetDetailsPrint listonly
+
+  DeleteRegKey HKLM "Software\OpenLibraries"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries"
+
+  Push "$INSTDIR\bin"
+  Call un.RemoveFromPath
+
+  Push "$INSTDIR\bin\Release"
+  Call un.RemoveFromPath
+
+  Push "PYTHONPATH"
+  Call un.DeleteEnvStr
+
+  RMDir /r $INSTDIR\bin
+  RMDir /r $INSTDIR\include
+  RMDir /r $INSTDIR\lib
+  RMDir /r $INSTDIR\plugins
+  RMDir /r $INSTDIR\kernels
+  RMDir /r $INSTDIR\shaders
+  RMDir /r $INSTDIR
+
+  SetDetailsPrint both
+ 
+ SectionEnd
+
+ Function .onInit
+ 
+  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString"
+  StrCmp $R0 "" done
+ 
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+  "OpenLibraries is already installed. $\n$\nClick `OK` to remove the \
+  previous version or `Cancel` to cancel this upgrade." \
+  IDOK uninst
+  Abort
+  
+;Run the uninstaller
+uninst:
+  ClearErrors
+  ; Copy the uninstaller to a temp location
+  ;GetTempFileName $0
+  ;CopyFiles $R0 $0
+  ;Start the uninstaller using the option to not copy itself
+  ExecWait '$R0 _?=$INSTDIR'
+ 
+  IfErrors no_remove_uninstaller
+    ; In most cases the uninstall is successful at this point.
+    ; You may also consider using a registry key to check whether 
+    ; the user has chosen to uninstall. If you are using an uninstaller
+    ; components page, make sure all sections are uninstalled.
+    goto done
+  no_remove_uninstaller:
+    MessageBox MB_ICONEXCLAMATION \
+    "Unable to remove previous version of OpenLibraries"
+    Abort
+  
+done:
+  ; remove the copied uninstaller
+  ;Delete '$0'
+ 
+FunctionEnd

Deleted: trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_runtime.nsi	2008-01-27 15:57:52 UTC (rev 406)
+++ trunk/lib/openlibraries/installer/openlibraries_runtime.nsi	2008-02-06 22:55:42 UTC (rev 407)
@@ -1,274 +0,0 @@
-;--------------------------------
-;NSIS OpenLibraries Installation Script
-;--------------------------------
-
-!ifndef VERSION
-  !define VERSION 0_5_0
-  !define VERSION_DOT 0.5.0
-!endif
-
-;--------------------------------
-;Configuration
-
-!ifdef OUTFILE
-  OutFile "${OUTFILE}"
-!else
-  OutFile openlibraries-${VERSION_DOT}-runtime.exe
-!endif
-
-SetCompressor /SOLID lzma
-
-InstType "Full"
-
-InstallDir $PROGRAMFILES\OpenLibraries
-InstallDirRegKey HKLM Software\OpenLibraries ""
-
-;--------------------------------
-;Header Files
-
-!define ALL_USERS
-
-!include "MUI.nsh"
-!include "Sections.nsh"
-!include "add_to_path.nsh"
-!include "write_env_str.nsh"
-
-;Names
-Name "OpenLibraries"
-Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
-
-;Interface Settings
-!define MUI_ABORTWARNING
-
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "openlibraries.bmp" ; optional
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp"
-
-!define MUI_COMPONENTSPAGE_SMALLDESC
-
-;Pages
-!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION_DOT}) Setup Wizard"
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of OpenLibraries.\r\n\r\n$_CLICK"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "..\COPYING"
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.openlibraries.org/"
-
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-;--------------------------------
-;Languages
-
-!insertmacro MUI_LANGUAGE "English"
-
-Section "OpenLibraries" SecCore
-
-  SetDetailsPrint textonly
-  DetailPrint "Installing OpenLibraries..."
-  SetDetailsPrint listonly
-
-  SectionIn 1 2 3 RO
-  SetOutPath $INSTDIR
-
-  SetOverwrite on
-
-  SetOutPath $INSTDIR\bin
-  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll"
-  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.dll"
-
-  ; dependencies
-  File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
-  File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
-  File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
-  File "C:\OpenEXR\bin\Release\Half.dll"
-  File "C:\OpenEXR\bin\Release\Iex.dll"
-  File "C:\OpenEXR\bin\Release\IlmImf.dll"
-  File "C:\OpenEXR\bin\Release\Half.dll"
-  File "C:\OpenEXR\bin\Release\IlmThread.dll"
-  File "C:\OpenEXR\bin\Release\Imath.dll"
-  File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
-  File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
-  File "C:\zlib\lib\zlib1.dll"
-
-  ; Python
-  SetOutPath $INSTDIR\python
-  File "..\src\openpluginlib\py\Multi-threaded Release DLL\HDRFlowPlugin.pyd"
-  File "..\src\openimagelib\py\Multi-threaded Release DLL\HDRFlowImage.pyd"
-  File "..\src\openmedialib\py\Multi-threaded Release DLL\HDRFlowMedia.pyd"
-  File "..\src\openassetlib\py\Multi-threaded Release DLL\HDRFlowAsset.pyd"
-  
-  SetOutPath $INSTDIR\plugins\release
-  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
-  File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
-  File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
-  File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
-  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
-  File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
-  File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
-  File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
-  File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
-  File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
-  File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
-  ;File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
-  ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
-  File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
-  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
-  File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
-  File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-${VERSION}.dll"
-  File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
-  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
-  
-  SetOutPath $INSTDIR\shaders
-  File "..\effects\shaders\sepia.cg"
-  File "..\effects\shaders\sepia.frag"
-  File "..\effects\shaders\fixed_function.vert"
-  File "..\effects\shaders\passthrough.vert"
-  File "..\effects\shaders\passthrough.cg"
-  File "..\effects\shaders\rgb_to_yuv444.frag"
-  File "..\effects\shaders\yuv444_to_rgb.frag"
-  File "..\effects\shaders\yuv444_to_rgb.cg"
-  File "..\effects\shaders\yuv444_to_rgb_deinterlace.cg"
-  File "..\effects\shaders\yuv444_to_rgb_deinterlace.frag"
-  File "..\effects\shaders\histogram.cg"
-  File "..\effects\shaders\histogram.frag"
-  File "..\effects\shaders\channel_selector.cg"
-  File "..\effects\shaders\channel_selector.frag"
- 
-  SetDetailsPrint both
-
-;--------------------------------
-;Path environment variable
-
-  Push "$INSTDIR\bin"
-  Call AddToPath
-  Push "$INSTDIR\bin\Release"
-  Call AddToPath
-;--------------------------------
-;Python environment variable
-  Push "PYTHONPATH"
-  Push "$INSTDIR\python"
-  Call WriteEnvStr
-
-;--------------------------------
-;Registry
-
-WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion"		"${VERSION_DOT}"
-WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirRelease"	"$INSTDIR\plugins\release"
-WriteRegStr HKLM "Software\OpenLibraries" "KernelsDir"			"$INSTDIR\kernels"
-WriteRegStr HKLM "Software\OpenLibraries" "ShadersDir"			"$INSTDIR\shaders"
-
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "DisplayName" "OpenLibraries"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString" "$INSTDIR\uninst-openlibraries.exe"
-  
-SectionEnd
-
-Section -post
-
-	WriteUninstaller $INSTDIR\uninst-openlibraries.exe
-
-SectionEnd
-
-;--------------------------------
-;Descriptions
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "OpenLibraries development and runtime files"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;--------------------------------
-;Uninstaller Section
-
-Section Uninstall
-
-  SetDetailsPrint textonly
-  DetailPrint "Deleting Files..."
-  SetDetailsPrint listonly
-
-  DeleteRegKey HKLM "Software\OpenLibraries"
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries"
-
-  Push "$INSTDIR\bin"
-  Call un.RemoveFromPath
-
-  Push "$INSTDIR\bin\Release"
-  Call un.RemoveFromPath
-
-  Push "PYTHONPATH"
-  Call un.DeleteEnvStr
-
-  RMDir /r $INSTDIR\bin
-  RMDir /r $INSTDIR\include
-  RMDir /r $INSTDIR\lib
-  RMDir /r $INSTDIR\plugins
-  RMDir /r $INSTDIR\kernels
-  RMDir /r $INSTDIR\shaders
-  RMDir /r $INSTDIR
-
-  SetDetailsPrint both
- 
- SectionEnd
-
- Function .onInit
- 
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString"
-  StrCmp $R0 "" done
- 
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "OpenLibraries is already installed. $\n$\nClick `OK` to remove the \
-  previous version or `Cancel` to cancel this upgrade." \
-  IDOK uninst
-  Abort
-  
-;Run the uninstaller
-uninst:
-  ClearErrors
-  ; Copy the uninstaller to a temp location
-  ;GetTempFileName $0
-  ;CopyFiles $R0 $0
-  ;Start the uninstaller using the option to not copy itself
-  ExecWait '$R0 _?=$INSTDIR'
- 
-  IfErrors no_remove_uninstaller
-    ; In most cases the uninstall is successful at this point.
-    ; You may also consider using a registry key to check whether 
-    ; the user has chosen to uninstall. If you are using an uninstaller
-    ; components page, make sure all sections are uninstalled.
-    goto done
-  no_remove_uninstaller:
-    MessageBox MB_ICONEXCLAMATION \
-    "Unable to remove previous version of OpenLibraries"
-    Abort
-  
-done:
-  ; remove the copied uninstaller
-  ;Delete '$0'
- 
-FunctionEnd


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

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

From: <gl...@us...> - 2008-01-27 15:57:55

Revision: 406
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=406&view=rev
Author:   glslang
Date:     2008-01-27 07:57:52 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
breaking from the hive

Added Paths:
-----------
    trunk/lib/openlibraries/installer/hdrflow_sdk.nsi

Removed Paths:
-------------
    trunk/lib/openlibraries/installer/openlibraries_sdk.nsi

Copied: trunk/lib/openlibraries/installer/hdrflow_sdk.nsi (from rev 405, trunk/lib/openlibraries/installer/openlibraries_sdk.nsi)
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_sdk.nsi	                        (rev 0)
+++ trunk/lib/openlibraries/installer/hdrflow_sdk.nsi	2008-01-27 15:57:52 UTC (rev 406)
@@ -0,0 +1,413 @@
+;--------------------------------
+;NSIS OpenLibraries Installation Script
+;--------------------------------
+
+!ifndef VERSION
+  !define VERSION 0_5_0
+  !define VERSION_DOT 0.5.0
+!endif
+
+;--------------------------------
+;Configuration
+
+!ifdef OUTFILE
+  OutFile "${OUTFILE}"
+!else
+  OutFile hdrflow-${VERSION_DOT}-sdk.exe
+!endif
+
+SetCompressor /SOLID lzma
+
+InstType "Full"
+
+InstallDir $PROGRAMFILES\HDRFlow
+InstallDirRegKey HKLM Software\HDRFlow ""
+
+;--------------------------------
+;Header Files
+
+!define ALL_USERS
+
+!include "MUI.nsh"
+!include "Sections.nsh"
+!include "add_to_path.nsh"
+!include "write_env_str.nsh"
+
+;Names
+Name "OpenLibraries"
+Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
+
+;Interface Settings
+!define MUI_ABORTWARNING
+
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "openlibraries.bmp" ; optional
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp"
+
+!define MUI_COMPONENTSPAGE_SMALLDESC
+
+;Pages
+!define MUI_WELCOMEPAGE_TITLE "Welcome to HDRFlow SDK (v.${VERSION_DOT}) Setup Wizard"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of HDRFlow SDK.\r\n\r\n$_CLICK"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "..\COPYING"
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.hdrflow.com/"
+
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+
+!insertmacro MUI_LANGUAGE "English"
+
+Section "OpenLibraries" SecCore
+
+  SetDetailsPrint textonly
+  DetailPrint "Installing HDRFlow SDK..."
+  SetDetailsPrint listonly
+
+  SectionIn 1 2 3 RO
+  SetOutPath $INSTDIR
+
+  SetOverwrite on
+
+  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl
+  File ..\src\openpluginlib\pl\allocatorstringstorage.h
+  File ..\src\openpluginlib\pl\bind_info.hpp
+  File ..\src\openpluginlib\pl\cg.hpp
+  File ..\src\openpluginlib\pl\config.hpp
+  File ..\src\openpluginlib\pl\content_handler_libxml.hpp
+  File ..\src\openpluginlib\pl\content_handler_msxml.hpp
+  File ..\src\openpluginlib\pl\cowstringopt.h
+  File ..\src\openpluginlib\pl\discovery_traits.hpp
+  File ..\src\openpluginlib\pl\flex_string.h
+  File ..\src\openpluginlib\pl\flex_string_details.h
+  File ..\src\openpluginlib\pl\flex_string_shell.h
+  File ..\src\openpluginlib\pl\geometry.hpp
+  File ..\src\openpluginlib\pl\GL_utility.hpp
+  File ..\src\openpluginlib\pl\openplugin.hpp
+  File ..\src\openpluginlib\pl\openpluginlib.hpp
+  File ..\src\openpluginlib\pl\pool.hpp
+  File ..\src\openpluginlib\pl\property.hpp
+  File ..\src\openpluginlib\pl\registry.hpp
+  File ..\src\openpluginlib\pl\shader_manager.hpp
+  File ..\src\openpluginlib\pl\simplestringstorage.h
+  File ..\src\openpluginlib\pl\smallstringopt.h
+  File ..\src\openpluginlib\pl\stream.hpp
+  File ..\src\openpluginlib\pl\string.hpp
+  File ..\src\openpluginlib\pl\timer.hpp
+  File ..\src\openpluginlib\pl\utf8_utils.hpp
+  File ..\src\openpluginlib\pl\vectorstringstorage.h
+  
+  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl\pcos
+  File ..\src\openpluginlib\pl\pcos\iproperty_container.hpp
+  File ..\src\openpluginlib\pl\pcos\isubject.hpp
+  File ..\src\openpluginlib\pl\pcos\iclonable.hpp
+  File ..\src\openpluginlib\pl\pcos\key.hpp
+  File ..\src\openpluginlib\pl\pcos\observer.hpp
+  File ..\src\openpluginlib\pl\pcos\property.hpp
+  File ..\src\openpluginlib\pl\pcos\property_container.hpp
+  File ..\src\openpluginlib\pl\pcos\subject.hpp
+  File ..\src\openpluginlib\pl\pcos\visitor.hpp
+  
+  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openimagelib\il
+  File ..\src\openimagelib\il\basic_image.hpp
+  File ..\src\openimagelib\il\compression_traits.hpp
+  File ..\src\openimagelib\il\config.hpp
+  File ..\src\openimagelib\il\float_traits.hpp
+  File ..\src\openimagelib\il\il.hpp
+  File ..\src\openimagelib\il\openimagelib_plugin.hpp
+  File ..\src\openimagelib\il\rgb_traits.hpp
+  File ..\src\openimagelib\il\traits.hpp
+  File ..\src\openimagelib\il\utility.hpp
+  File ..\src\openimagelib\il\yuv_traits.hpp
+  File ..\src\openimagelib\il\lut_functions.hpp
+  
+  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openmedialib\ml
+  File ..\src\openmedialib\ml\audio.hpp
+  File ..\src\openmedialib\ml\config.hpp
+  File ..\src\openmedialib\ml\filter.hpp
+  File ..\src\openmedialib\ml\frame.hpp
+  File ..\src\openmedialib\ml\input.hpp
+  File ..\src\openmedialib\ml\ml.hpp
+  File ..\src\openmedialib\ml\openmedialib_plugin.hpp
+  File ..\src\openmedialib\ml\store.hpp
+  File ..\src\openmedialib\ml\utilities.hpp
+   
+  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openassetlib\al
+  File ..\src\openassetlib\al\al.hpp
+  File ..\src\openassetlib\al\al_plugin.hpp
+  File ..\src\openassetlib\al\asset.hpp
+  File ..\src\openassetlib\al\base64_codec.hpp
+  File ..\src\openassetlib\al\config.hpp
+  File ..\src\openassetlib\al\guid.hpp
+  File ..\src\openassetlib\al\set.hpp
+
+  SetOutPath $INSTDIR\bin
+  File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.dll"
+  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.dll"
+  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.dll"
+  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
+  File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.dll"
+  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll"
+  File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.dll"
+  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.dll"
+
+  ; dependencies
+  File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
+  File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
+  File "C:\OpenEXR\bin\Debug\Half.dll"
+  File "C:\OpenEXR\bin\Debug\Iex.dll"
+  File "C:\OpenEXR\bin\Debug\IlmImf.dll"
+  File "C:\OpenEXR\bin\Debug\Half.dll"
+  File "C:\OpenEXR\bin\Debug\IlmThread.dll"
+  File "C:\OpenEXR\bin\Debug\Imath.dll"
+  File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
+  File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
+  File "C:\zlib\lib\zlib1.dll"
+
+  ; Python
+  SetOutPath $INSTDIR\python
+  File "..\src\openpluginlib\py\Multi-threaded Debug DLL\HDRFlowPlugin.pyd"
+  File "..\src\openimagelib\py\Multi-threaded Debug DLL\HDRFlowImage.pyd"
+  File "..\src\openmedialib\py\Multi-threaded Debug DLL\HDRFlowMedia.pyd"
+  File "..\src\openassetlib\py\Multi-threaded Debug DLL\HDRFlowAsset.pyd"
+  
+  SetOutPath $INSTDIR\lib
+  File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.lib"
+  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.lib"
+  File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.lib"
+  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.lib"
+  File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.lib"
+  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.lib"
+  File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.lib"
+  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.lib"
+  File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.lib"
+  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.lib"
+   
+  SetOutPath $INSTDIR\plugins\debug
+;  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
+;  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
+  File "..\src\openimagelib\plugins\dds\Multi-threaded Debug DLL\openimagelib_dds-vc80-d-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
+  File "..\src\openimagelib\plugins\dpx\Multi-threaded Debug DLL\openimagelib_dpx-vc80-d-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
+  File "..\src\openimagelib\plugins\exr\Multi-threaded Debug DLL\openimagelib_exr-vc80-d-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
+  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Debug DLL\openimagelib_gdi-vc80-d-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
+  File "..\src\openimagelib\plugins\hdr\Multi-threaded Debug DLL\openimagelib_hdr-vc80-d-${VERSION}.dll"
+;  File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
+;  File "..\src\openimagelib\plugins\jpg\Multi-threaded Debug DLL\openimagelib_jpg-vc80-d-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
+  File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
+  File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
+  File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+  File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
+  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
+  File "..\src\openmedialib\plugins\ofx\Multi-threaded Debug DLL\openmedialib_ofx-vc80-d-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
+;  File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
+;  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
+;  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll"
+  File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
+  File "..\src\openassetlib\plugins\sqlite\Multi-threaded Debug DLL\openassetlib_sqlite-vc80-d-${VERSION}.dll"
+  File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
+  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-${VERSION}.dll"
+  
+  SetOutPath $INSTDIR\plugins\release
+  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
+  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
+  File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
+  File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
+  File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
+  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
+  File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
+;  File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
+;  File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
+  File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
+  File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
+  File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
+  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
+  File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
+;  File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
+;  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
+;  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
+  File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
+  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
+  
+  SetOutPath $INSTDIR\shaders
+  File "..\effects\shaders\sepia.cg"
+  File "..\effects\shaders\sepia.frag"
+  File "..\effects\shaders\fixed_function.vert"
+  File "..\effects\shaders\passthrough.vert"
+  File "..\effects\shaders\passthrough.cg"
+  File "..\effects\shaders\rgb_to_yuv444.frag"
+  File "..\effects\shaders\yuv444_to_rgb.frag"
+  File "..\effects\shaders\yuv444_to_rgb.cg"
+  File "..\effects\shaders\yuv444_to_rgb_deinterlace.cg"
+  File "..\effects\shaders\yuv444_to_rgb_deinterlace.frag"
+  File "..\effects\shaders\histogram.cg"
+  File "..\effects\shaders\histogram.frag"
+  File "..\effects\shaders\channel_selector.cg"
+  File "..\effects\shaders\channel_selector.frag"
+
+  SetDetailsPrint both
+
+;--------------------------------
+;Path environment variable
+
+  Push "$INSTDIR\bin"
+  Call AddToPath
+
+;--------------------------------
+;Include environment variable
+  Push "HDRFLOW_INCLUDE_PATH"
+  Push "$INSTDIR\include\hdrflow-${VERSION_DOT}"
+  Call WriteEnvStr
+
+;--------------------------------
+;Lib environment variable
+  Push "HDRFLOW_LIB_PATH"
+  Push "$INSTDIR\lib"
+  Call WriteEnvStr
+
+;--------------------------------
+;Python environment variable
+  Push "PYTHONPATH"
+  Push "$INSTDIR\python"
+  Call WriteEnvStr
+
+;--------------------------------
+;Registry
+
+WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion"	"${VERSION_DOT}"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirDebug"	"$INSTDIR\plugins\debug"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease"	"$INSTDIR\plugins\release"
+WriteRegStr HKLM "Software\HDRFlow" "KernelsDir"		"$INSTDIR\kernels"
+WriteRegStr HKLM "Software\HDRFlow" "ShadersDir"		"$INSTDIR\shaders"
+
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "DisplayName" "HDRFlow"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString" "$INSTDIR\uninst-hdrflow.exe"
+
+SectionEnd
+
+Section -post
+
+	WriteUninstaller $INSTDIR\uninst-hdrflow.exe
+
+SectionEnd
+
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "HDRFlow development and runtime files"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;--------------------------------
+;Uninstaller Section
+
+Section Uninstall
+
+  SetDetailsPrint textonly
+  DetailPrint "Deleting Files..."
+  SetDetailsPrint listonly
+
+  DeleteRegKey HKLM "Software\HDRFlow"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow"
+
+  Push "$INSTDIR\bin"
+  Call un.RemoveFromPath
+
+  Push "HDRFLOW_LIB_PATH"
+  Call un.DeleteEnvStr
+
+  Push "HDRFLOW_INCLUDE_PATH"
+  Call un.DeleteEnvStr
+
+  Push "PYTHONPATH"
+  Call un.DeleteEnvStr
+
+  RMDir /r $INSTDIR\bin
+  RMDir /r $INSTDIR\include
+  RMDir /r $INSTDIR\lib
+  RMDir /r $INSTDIR\plugins
+  RMDir /r $INSTDIR\kernels
+  RMDir /r $INSTDIR\shaders
+  RMDir /r $INSTDIR
+
+  SetDetailsPrint both
+ 
+ SectionEnd
+ 
+ Function .onInit
+ 
+  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString"
+  StrCmp $R0 "" done
+ 
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+  "OpenLibraries is already installed. $\n$\nClick `OK` to remove the \
+  previous version or `Cancel` to cancel this upgrade." \
+  IDOK uninst
+  Abort
+  
+;Run the uninstaller
+uninst:
+  ClearErrors
+  ; Copy the uninstaller to a temp location
+  ;GetTempFileName $0
+  ;CopyFiles $R0 $0
+  ;Start the uninstaller using the option to not copy itself
+  ExecWait '$R0 _?=$INSTDIR'
+ 
+  IfErrors no_remove_uninstaller
+    ; In most cases the uninstall is successful at this point.
+    ; You may also consider using a registry key to check whether 
+    ; the user has chosen to uninstall. If you are using an uninstaller
+    ; components page, make sure all sections are uninstalled.
+    goto done
+  no_remove_uninstaller:
+    MessageBox MB_ICONEXCLAMATION "Unable to remove previous version of HDRFlow"
+    Abort
+  
+done:
+  ; remove the copied uninstaller
+  ;Delete '$0'
+ 
+FunctionEnd

Deleted: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi	2008-01-27 15:18:39 UTC (rev 405)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi	2008-01-27 15:57:52 UTC (rev 406)
@@ -1,413 +0,0 @@
-;--------------------------------
-;NSIS OpenLibraries Installation Script
-;--------------------------------
-
-!ifndef VERSION
-  !define VERSION 0_5_0
-  !define VERSION_DOT 0.5.0
-!endif
-
-;--------------------------------
-;Configuration
-
-!ifdef OUTFILE
-  OutFile "${OUTFILE}"
-!else
-  OutFile hdrflow-${VERSION_DOT}-sdk.exe
-!endif
-
-SetCompressor /SOLID lzma
-
-InstType "Full"
-
-InstallDir $PROGRAMFILES\HDRFlow
-InstallDirRegKey HKLM Software\HDRFlow ""
-
-;--------------------------------
-;Header Files
-
-!define ALL_USERS
-
-!include "MUI.nsh"
-!include "Sections.nsh"
-!include "add_to_path.nsh"
-!include "write_env_str.nsh"
-
-;Names
-Name "OpenLibraries"
-Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
-
-;Interface Settings
-!define MUI_ABORTWARNING
-
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "openlibraries.bmp" ; optional
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp"
-
-!define MUI_COMPONENTSPAGE_SMALLDESC
-
-;Pages
-!define MUI_WELCOMEPAGE_TITLE "Welcome to HDRFlow SDK (v.${VERSION_DOT}) Setup Wizard"
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of HDRFlow SDK.\r\n\r\n$_CLICK"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "..\COPYING"
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.hdrflow.com/"
-
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-;--------------------------------
-;Languages
-
-!insertmacro MUI_LANGUAGE "English"
-
-Section "OpenLibraries" SecCore
-
-  SetDetailsPrint textonly
-  DetailPrint "Installing HDRFlow SDK..."
-  SetDetailsPrint listonly
-
-  SectionIn 1 2 3 RO
-  SetOutPath $INSTDIR
-
-  SetOverwrite on
-
-  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl
-  File ..\src\openpluginlib\pl\allocatorstringstorage.h
-  File ..\src\openpluginlib\pl\bind_info.hpp
-  File ..\src\openpluginlib\pl\cg.hpp
-  File ..\src\openpluginlib\pl\config.hpp
-  File ..\src\openpluginlib\pl\content_handler_libxml.hpp
-  File ..\src\openpluginlib\pl\content_handler_msxml.hpp
-  File ..\src\openpluginlib\pl\cowstringopt.h
-  File ..\src\openpluginlib\pl\discovery_traits.hpp
-  File ..\src\openpluginlib\pl\flex_string.h
-  File ..\src\openpluginlib\pl\flex_string_details.h
-  File ..\src\openpluginlib\pl\flex_string_shell.h
-  File ..\src\openpluginlib\pl\geometry.hpp
-  File ..\src\openpluginlib\pl\GL_utility.hpp
-  File ..\src\openpluginlib\pl\openplugin.hpp
-  File ..\src\openpluginlib\pl\openpluginlib.hpp
-  File ..\src\openpluginlib\pl\pool.hpp
-  File ..\src\openpluginlib\pl\property.hpp
-  File ..\src\openpluginlib\pl\registry.hpp
-  File ..\src\openpluginlib\pl\shader_manager.hpp
-  File ..\src\openpluginlib\pl\simplestringstorage.h
-  File ..\src\openpluginlib\pl\smallstringopt.h
-  File ..\src\openpluginlib\pl\stream.hpp
-  File ..\src\openpluginlib\pl\string.hpp
-  File ..\src\openpluginlib\pl\timer.hpp
-  File ..\src\openpluginlib\pl\utf8_utils.hpp
-  File ..\src\openpluginlib\pl\vectorstringstorage.h
-  
-  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl\pcos
-  File ..\src\openpluginlib\pl\pcos\iproperty_container.hpp
-  File ..\src\openpluginlib\pl\pcos\isubject.hpp
-  File ..\src\openpluginlib\pl\pcos\iclonable.hpp
-  File ..\src\openpluginlib\pl\pcos\key.hpp
-  File ..\src\openpluginlib\pl\pcos\observer.hpp
-  File ..\src\openpluginlib\pl\pcos\property.hpp
-  File ..\src\openpluginlib\pl\pcos\property_container.hpp
-  File ..\src\openpluginlib\pl\pcos\subject.hpp
-  File ..\src\openpluginlib\pl\pcos\visitor.hpp
-  
-  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openimagelib\il
-  File ..\src\openimagelib\il\basic_image.hpp
-  File ..\src\openimagelib\il\compression_traits.hpp
-  File ..\src\openimagelib\il\config.hpp
-  File ..\src\openimagelib\il\float_traits.hpp
-  File ..\src\openimagelib\il\il.hpp
-  File ..\src\openimagelib\il\openimagelib_plugin.hpp
-  File ..\src\openimagelib\il\rgb_traits.hpp
-  File ..\src\openimagelib\il\traits.hpp
-  File ..\src\openimagelib\il\utility.hpp
-  File ..\src\openimagelib\il\yuv_traits.hpp
-  File ..\src\openimagelib\il\lut_functions.hpp
-  
-  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openmedialib\ml
-  File ..\src\openmedialib\ml\audio.hpp
-  File ..\src\openmedialib\ml\config.hpp
-  File ..\src\openmedialib\ml\filter.hpp
-  File ..\src\openmedialib\ml\frame.hpp
-  File ..\src\openmedialib\ml\input.hpp
-  File ..\src\openmedialib\ml\ml.hpp
-  File ..\src\openmedialib\ml\openmedialib_plugin.hpp
-  File ..\src\openmedialib\ml\store.hpp
-  File ..\src\openmedialib\ml\utilities.hpp
-   
-  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openassetlib\al
-  File ..\src\openassetlib\al\al.hpp
-  File ..\src\openassetlib\al\al_plugin.hpp
-  File ..\src\openassetlib\al\asset.hpp
-  File ..\src\openassetlib\al\base64_codec.hpp
-  File ..\src\openassetlib\al\config.hpp
-  File ..\src\openassetlib\al\guid.hpp
-  File ..\src\openassetlib\al\set.hpp
-
-  SetOutPath $INSTDIR\bin
-  File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.dll"
-  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.dll"
-  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.dll"
-  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.dll"
-  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll"
-  File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.dll"
-  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.dll"
-
-  ; dependencies
-  File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
-  File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
-  File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
-  File "C:\OpenEXR\bin\Debug\Half.dll"
-  File "C:\OpenEXR\bin\Debug\Iex.dll"
-  File "C:\OpenEXR\bin\Debug\IlmImf.dll"
-  File "C:\OpenEXR\bin\Debug\Half.dll"
-  File "C:\OpenEXR\bin\Debug\IlmThread.dll"
-  File "C:\OpenEXR\bin\Debug\Imath.dll"
-  File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
-  File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
-  File "C:\zlib\lib\zlib1.dll"
-
-  ; Python
-  SetOutPath $INSTDIR\python
-  File "..\src\openpluginlib\py\Multi-threaded Debug DLL\HDRFlowPlugin.pyd"
-  File "..\src\openimagelib\py\Multi-threaded Debug DLL\HDRFlowImage.pyd"
-  File "..\src\openmedialib\py\Multi-threaded Debug DLL\HDRFlowMedia.pyd"
-  File "..\src\openassetlib\py\Multi-threaded Debug DLL\HDRFlowAsset.pyd"
-  
-  SetOutPath $INSTDIR\lib
-  File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.lib"
-  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.lib"
-  File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.lib"
-  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.lib"
-  File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.lib"
-  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.lib"
-  File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.lib"
-  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.lib"
-  File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.lib"
-  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.lib"
-   
-  SetOutPath $INSTDIR\plugins\debug
-;  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-;  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
-  File "..\src\openimagelib\plugins\dds\Multi-threaded Debug DLL\openimagelib_dds-vc80-d-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
-  File "..\src\openimagelib\plugins\dpx\Multi-threaded Debug DLL\openimagelib_dpx-vc80-d-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
-  File "..\src\openimagelib\plugins\exr\Multi-threaded Debug DLL\openimagelib_exr-vc80-d-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
-  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Debug DLL\openimagelib_gdi-vc80-d-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
-  File "..\src\openimagelib\plugins\hdr\Multi-threaded Debug DLL\openimagelib_hdr-vc80-d-${VERSION}.dll"
-;  File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
-;  File "..\src\openimagelib\plugins\jpg\Multi-threaded Debug DLL\openimagelib_jpg-vc80-d-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
-  File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
-  File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
-  File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-  File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
-  File "..\src\openmedialib\plugins\ofx\Multi-threaded Debug DLL\openmedialib_ofx-vc80-d-${VERSION}.dll"
-;  File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
-;  File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll"
-;  File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
-;  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
-;  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
-;  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll"
-  File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
-  File "..\src\openassetlib\plugins\sqlite\Multi-threaded Debug DLL\openassetlib_sqlite-vc80-d-${VERSION}.dll"
-  File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
-  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-${VERSION}.dll"
-  
-  SetOutPath $INSTDIR\plugins\release
-  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
-  File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
-  File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
-  File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
-  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
-  File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
-;  File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
-;  File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
-  File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
-  File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
-  File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
-  File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
-  File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
-  File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
-;  File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
-;  File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
-;  File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
-;  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
-;  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
-;  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
-  File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
-  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
-  
-  SetOutPath $INSTDIR\shaders
-  File "..\effects\shaders\sepia.cg"
-  File "..\effects\shaders\sepia.frag"
-  File "..\effects\shaders\fixed_function.vert"
-  File "..\effects\shaders\passthrough.vert"
-  File "..\effects\shaders\passthrough.cg"
-  File "..\effects\shaders\rgb_to_yuv444.frag"
-  File "..\effects\shaders\yuv444_to_rgb.frag"
-  File "..\effects\shaders\yuv444_to_rgb.cg"
-  File "..\effects\shaders\yuv444_to_rgb_deinterlace.cg"
-  File "..\effects\shaders\yuv444_to_rgb_deinterlace.frag"
-  File "..\effects\shaders\histogram.cg"
-  File "..\effects\shaders\histogram.frag"
-  File "..\effects\shaders\channel_selector.cg"
-  File "..\effects\shaders\channel_selector.frag"
-
-  SetDetailsPrint both
-
-;--------------------------------
-;Path environment variable
-
-  Push "$INSTDIR\bin"
-  Call AddToPath
-
-;--------------------------------
-;Include environment variable
-  Push "HDRFLOW_INCLUDE_PATH"
-  Push "$INSTDIR\include\hdrflow-${VERSION_DOT}"
-  Call WriteEnvStr
-
-;--------------------------------
-;Lib environment variable
-  Push "HDRFLOW_LIB_PATH"
-  Push "$INSTDIR\lib"
-  Call WriteEnvStr
-
-;--------------------------------
-;Python environment variable
-  Push "PYTHONPATH"
-  Push "$INSTDIR\python"
-  Call WriteEnvStr
-
-;--------------------------------
-;Registry
-
-WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion"	"${VERSION_DOT}"
-WriteRegStr HKLM "Software\HDRFlow" "PluginsDirDebug"	"$INSTDIR\plugins\debug"
-WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease"	"$INSTDIR\plugins\release"
-WriteRegStr HKLM "Software\HDRFlow" "KernelsDir"		"$INSTDIR\kernels"
-WriteRegStr HKLM "Software\HDRFlow" "ShadersDir"		"$INSTDIR\shaders"
-
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "DisplayName" "HDRFlow"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString" "$INSTDIR\uninst-hdrflow.exe"
-
-SectionEnd
-
-Section -post
-
-	WriteUninstaller $INSTDIR\uninst-hdrflow.exe
-
-SectionEnd
-
-;--------------------------------
-;Descriptions
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "HDRFlow development and runtime files"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;--------------------------------
-;Uninstaller Section
-
-Section Uninstall
-
-  SetDetailsPrint textonly
-  DetailPrint "Deleting Files..."
-  SetDetailsPrint listonly
-
-  DeleteRegKey HKLM "Software\HDRFlow"
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow"
-
-  Push "$INSTDIR\bin"
-  Call un.RemoveFromPath
-
-  Push "HDRFLOW_LIB_PATH"
-  Call un.DeleteEnvStr
-
-  Push "HDRFLOW_INCLUDE_PATH"
-  Call un.DeleteEnvStr
-
-  Push "PYTHONPATH"
-  Call un.DeleteEnvStr
-
-  RMDir /r $INSTDIR\bin
-  RMDir /r $INSTDIR\include
-  RMDir /r $INSTDIR\lib
-  RMDir /r $INSTDIR\plugins
-  RMDir /r $INSTDIR\kernels
-  RMDir /r $INSTDIR\shaders
-  RMDir /r $INSTDIR
-
-  SetDetailsPrint both
- 
- SectionEnd
- 
- Function .onInit
- 
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString"
-  StrCmp $R0 "" done
- 
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "OpenLibraries is already installed. $\n$\nClick `OK` to remove the \
-  previous version or `Cancel` to cancel this upgrade." \
-  IDOK uninst
-  Abort
-  
-;Run the uninstaller
-uninst:
-  ClearErrors
-  ; Copy the uninstaller to a temp location
-  ;GetTempFileName $0
-  ;CopyFiles $R0 $0
-  ;Start the uninstaller using the option to not copy itself
-  ExecWait '$R0 _?=$INSTDIR'
- 
-  IfErrors no_remove_uninstaller
-    ; In most cases the uninstall is successful at this point.
-    ; You may also consider using a registry key to check whether 
-    ; the user has chosen to uninstall. If you are using an uninstaller
-    ; components page, make sure all sections are uninstalled.
-    goto done
-  no_remove_uninstaller:
-    MessageBox MB_ICONEXCLAMATION "Unable to remove previous version of HDRFlow"
-    Abort
-  
-done:
-  ; remove the copied uninstaller
-  ;Delete '$0'
- 
-FunctionEnd


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

[Hdrflow-svn] SF.net SVN: hdrflow: [405] trunk/lib/openlibraries/installer/ openlibraries_sdk.nsi

From: <gl...@us...> - 2008-01-27 15:18:56

Revision: 405
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=405&view=rev
Author:   glslang
Date:     2008-01-27 07:18:39 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
+ break with the hive

Modified Paths:
--------------
    trunk/lib/openlibraries/installer/openlibraries_sdk.nsi

Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi	2008-01-27 14:52:03 UTC (rev 404)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi	2008-01-27 15:18:39 UTC (rev 405)
@@ -13,15 +13,15 @@
 !ifdef OUTFILE
   OutFile "${OUTFILE}"
 !else
-  OutFile openlibraries-${VERSION_DOT}-sdk.exe
+  OutFile hdrflow-${VERSION_DOT}-sdk.exe
 !endif
 
 SetCompressor /SOLID lzma
 
 InstType "Full"
 
-InstallDir $PROGRAMFILES\OpenLibraries
-InstallDirRegKey HKLM Software\OpenLibraries ""
+InstallDir $PROGRAMFILES\HDRFlow
+InstallDirRegKey HKLM Software\HDRFlow ""
 
 ;--------------------------------
 ;Header Files
@@ -47,8 +47,8 @@
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
 ;Pages
-!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION_DOT}) Setup Wizard"
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of OpenLibraries.\r\n\r\n$_CLICK"
+!define MUI_WELCOMEPAGE_TITLE "Welcome to HDRFlow SDK (v.${VERSION_DOT}) Setup Wizard"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of HDRFlow SDK.\r\n\r\n$_CLICK"
 
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "..\COPYING"
@@ -57,7 +57,7 @@
 !insertmacro MUI_PAGE_INSTFILES
 
 !define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.openlibraries.org/"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.hdrflow.com/"
 
 !insertmacro MUI_PAGE_FINISH
 
@@ -72,7 +72,7 @@
 Section "OpenLibraries" SecCore
 
   SetDetailsPrint textonly
-  DetailPrint "Installing OpenLibraries..."
+  DetailPrint "Installing HDRFlow SDK..."
   SetDetailsPrint listonly
 
   SectionIn 1 2 3 RO
@@ -80,7 +80,7 @@
 
   SetOverwrite on
 
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openpluginlib\pl
+  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl
   File ..\src\openpluginlib\pl\allocatorstringstorage.h
   File ..\src\openpluginlib\pl\bind_info.hpp
   File ..\src\openpluginlib\pl\cg.hpp
@@ -108,7 +108,7 @@
   File ..\src\openpluginlib\pl\utf8_utils.hpp
   File ..\src\openpluginlib\pl\vectorstringstorage.h
   
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openpluginlib\pl\pcos
+  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl\pcos
   File ..\src\openpluginlib\pl\pcos\iproperty_container.hpp
   File ..\src\openpluginlib\pl\pcos\isubject.hpp
   File ..\src\openpluginlib\pl\pcos\iclonable.hpp
@@ -119,7 +119,7 @@
   File ..\src\openpluginlib\pl\pcos\subject.hpp
   File ..\src\openpluginlib\pl\pcos\visitor.hpp
   
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openimagelib\il
+  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openimagelib\il
   File ..\src\openimagelib\il\basic_image.hpp
   File ..\src\openimagelib\il\compression_traits.hpp
   File ..\src\openimagelib\il\config.hpp
@@ -132,7 +132,7 @@
   File ..\src\openimagelib\il\yuv_traits.hpp
   File ..\src\openimagelib\il\lut_functions.hpp
   
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openmedialib\ml
+  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openmedialib\ml
   File ..\src\openmedialib\ml\audio.hpp
   File ..\src\openmedialib\ml\config.hpp
   File ..\src\openmedialib\ml\filter.hpp
@@ -142,27 +142,8 @@
   File ..\src\openmedialib\ml\openmedialib_plugin.hpp
   File ..\src\openmedialib\ml\store.hpp
   File ..\src\openmedialib\ml\utilities.hpp
- 
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openobjectlib\sg
-  File ..\src\openobjectlib\sg\appearance.hpp
-  File ..\src\openobjectlib\sg\bbox_volume.hpp
-  File ..\src\openobjectlib\sg\calculate_tangent_space.hpp
-  File ..\src\openobjectlib\sg\config.hpp
-  File ..\src\openobjectlib\sg\constant_time_dispatcher.hpp
-  File ..\src\openobjectlib\sg\core.hpp
-  File ..\src\openobjectlib\sg\graph_updater.hpp
-  File ..\src\openobjectlib\sg\hw_GL_renderer.hpp
-  File ..\src\openobjectlib\sg\lexical_cast.hpp
-  File ..\src\openobjectlib\sg\meshes.hpp
-  File ..\src\openobjectlib\sg\openobjectlib_plugin.hpp
-  File ..\src\openobjectlib\sg\render_buffer.hpp
-  File ..\src\openobjectlib\sg\scene.hpp
-  File ..\src\openobjectlib\sg\sg.hpp
-  File ..\src\openobjectlib\sg\shaders.hpp
-  File ..\src\openobjectlib\sg\spatial.hpp
-  File ..\src\openobjectlib\sg\spirit.hpp
-  
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openassetlib\al
+   
+  SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openassetlib\al
   File ..\src\openassetlib\al\al.hpp
   File ..\src\openassetlib\al\al_plugin.hpp
   File ..\src\openassetlib\al\asset.hpp
@@ -185,7 +166,7 @@
 
   ; dependencies
   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
-  File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
   File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
   File "C:\OpenEXR\bin\Debug\Half.dll"
   File "C:\OpenEXR\bin\Debug\Iex.dll"
@@ -217,8 +198,8 @@
   File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.lib"
    
   SetOutPath $INSTDIR\plugins\debug
-  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-${VERSION}.dll"
+;  File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
+;  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
   File "..\src\openimagelib\plugins\dds\Multi-threaded Debug DLL\openimagelib_dds-vc80-d-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
@@ -243,12 +224,12 @@
   File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll"
   File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
   File "..\src\openmedialib\plugins\ofx\Multi-threaded Debug DLL\openmedialib_ofx-vc80-d-${VERSION}.dll"
-  ;File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
-  ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
-  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
-  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
+;  File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
+;  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
+;  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll"
   File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
   File "..\src\openassetlib\plugins\sqlite\Multi-threaded Debug DLL\openassetlib_sqlite-vc80-d-${VERSION}.dll"
   File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
@@ -281,12 +262,12 @@
   File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
   File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
-  ;File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
-  ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
-  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
-  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
-  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
+;  File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
+;  File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
+;  File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
+;  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
   File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
   File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
   
@@ -316,13 +297,13 @@
 
 ;--------------------------------
 ;Include environment variable
-  Push "OPENLIBRARIES_INCLUDE_PATH"
-  Push "$INSTDIR\include\openlibraries-${VERSION_DOT}"
+  Push "HDRFLOW_INCLUDE_PATH"
+  Push "$INSTDIR\include\hdrflow-${VERSION_DOT}"
   Call WriteEnvStr
 
 ;--------------------------------
 ;Lib environment variable
-  Push "OPENLIBRARIES_LIB_PATH"
+  Push "HDRFLOW_LIB_PATH"
   Push "$INSTDIR\lib"
   Call WriteEnvStr
 
@@ -335,20 +316,20 @@
 ;--------------------------------
 ;Registry
 
-WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion"		"${VERSION_DOT}"
-WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirDebug"		"$INSTDIR\plugins\debug"
-WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirRelease"	"$INSTDIR\plugins\release"
-WriteRegStr HKLM "Software\OpenLibraries" "KernelsDir"			"$INSTDIR\kernels"
-WriteRegStr HKLM "Software\OpenLibraries" "ShadersDir"			"$INSTDIR\shaders"
+WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion"	"${VERSION_DOT}"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirDebug"	"$INSTDIR\plugins\debug"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease"	"$INSTDIR\plugins\release"
+WriteRegStr HKLM "Software\HDRFlow" "KernelsDir"		"$INSTDIR\kernels"
+WriteRegStr HKLM "Software\HDRFlow" "ShadersDir"		"$INSTDIR\shaders"
 
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "DisplayName" "OpenLibraries"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString" "$INSTDIR\uninst-openlibraries.exe"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "DisplayName" "HDRFlow"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString" "$INSTDIR\uninst-hdrflow.exe"
 
 SectionEnd
 
 Section -post
 
-	WriteUninstaller $INSTDIR\uninst-openlibraries.exe
+	WriteUninstaller $INSTDIR\uninst-hdrflow.exe
 
 SectionEnd
 
@@ -356,7 +337,7 @@
 ;Descriptions
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "OpenLibraries development and runtime files"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "HDRFlow development and runtime files"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;--------------------------------
@@ -368,16 +349,16 @@
   DetailPrint "Deleting Files..."
   SetDetailsPrint listonly
 
-  DeleteRegKey HKLM "Software\OpenLibraries"
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries"
+  DeleteRegKey HKLM "Software\HDRFlow"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow"
 
   Push "$INSTDIR\bin"
   Call un.RemoveFromPath
 
-  Push "OPENLIBRARIES_LIB_PATH"
+  Push "HDRFLOW_LIB_PATH"
   Call un.DeleteEnvStr
 
-  Push "OPENLIBRARIES_INCLUDE_PATH"
+  Push "HDRFLOW_INCLUDE_PATH"
   Call un.DeleteEnvStr
 
   Push "PYTHONPATH"
@@ -397,7 +378,7 @@
  
  Function .onInit
  
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString"
+  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString"
   StrCmp $R0 "" done
  
   MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
@@ -422,8 +403,7 @@
     ; components page, make sure all sections are uninstalled.
     goto done
   no_remove_uninstaller:
-    MessageBox MB_ICONEXCLAMATION \
-    "Unable to remove previous version of OpenLibraries"
+    MessageBox MB_ICONEXCLAMATION "Unable to remove previous version of HDRFlow"
     Abort
   
 done:


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

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

From: <gl...@us...> - 2008-01-27 14:52:06

Revision: 404
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=404&view=rev
Author:   glslang
Date:     2008-01-27 06:52:03 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
+ better names
+ update py bindings

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp
    trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-27 13:36:47 UTC (rev 403)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-27 14:52:03 UTC (rev 404)
@@ -47,7 +47,7 @@
 	return ( powf( 10.0f, ( v - 685.0f ) * ( 0.002f / 0.6f ) ) - dpx_black_offset ) / ( 1.0f - dpx_black_offset );
 }
 
-float from_dpxLog_byte_scaled( float v )
+float from_dpxLog_normalised( float v )
 {
 	return from_dpxLog( v ) * 1.0f / 1023.0f;
 }

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-27 13:36:47 UTC (rev 403)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-27 14:52:03 UTC (rev 404)
@@ -14,7 +14,7 @@
 IL_DECLSPEC float to_rec709( float v );
 IL_DECLSPEC float from_rec709( float v );
 IL_DECLSPEC float from_dpxLog( float v );
-IL_DECLSPEC float from_dpxLog_byte_scaled( float v );
+IL_DECLSPEC float from_dpxLog_normalised( float v );
 
 } } }
 

Modified: trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp	2008-01-27 13:36:47 UTC (rev 403)
+++ trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp	2008-01-27 14:52:03 UTC (rev 404)
@@ -20,6 +20,8 @@
 	py::def( "to_sRGB", &il::to_sRGB );
 	py::def( "to_rec709", &il::to_rec709 );
 	py::def( "from_rec709", &il::from_rec709 );
+	py::def( "from_dpxLog", &il::from_dpxLog );
+	py::def( "from_dpxLog_normalised", &il::from_dpxLog_normalised );
 }
 
 } } } }


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

[Hdrflow-svn] SF.net SVN: hdrflow: [403] trunk/lib/openlibraries/m4/ofx.m4

From: <gl...@us...> - 2008-01-27 13:36:48

Revision: 403
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=403&view=rev
Author:   glslang
Date:     2008-01-27 05:36:47 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
+ build fix

Modified Paths:
--------------
    trunk/lib/openlibraries/m4/ofx.m4

Modified: trunk/lib/openlibraries/m4/ofx.m4
===================================================================
--- trunk/lib/openlibraries/m4/ofx.m4	2008-01-26 21:24:22 UTC (rev 402)
+++ trunk/lib/openlibraries/m4/ofx.m4	2008-01-27 13:36:47 UTC (rev 403)
@@ -16,7 +16,7 @@
 	CXXFLAGS="$CXXFLAGS ${OFX_INCLUDE_PATH}"
 
 	AC_LANG(C++)
-	AC_CHECK_HEADER(OfxCore.h,
+	AC_CHECK_HEADER(ofxCore.h,
 		[ac_have_ofx="yes" AC_DEFINE(HAVE_OFX,1,[Define this if you have OFX support])],
 		[AC_MSG_WARN([*** OFX development headers not available. Please check your OFX installation ***])])
 


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

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

From: <gl...@us...> - 2008-01-26 21:24:25

Revision: 402
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=402&view=rev
Author:   glslang
Date:     2008-01-26 13:24:22 -0800 (Sat, 26 Jan 2008)

Log Message:
-----------
+build fixes

Modified Paths:
--------------
    trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
    trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp

Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi	2008-01-14 21:17:51 UTC (rev 401)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi	2008-01-26 21:24:22 UTC (rev 402)
@@ -130,6 +130,7 @@
   File ..\src\openimagelib\il\traits.hpp
   File ..\src\openimagelib\il\utility.hpp
   File ..\src\openimagelib\il\yuv_traits.hpp
+  File ..\src\openimagelib\il\lut_functions.hpp
   
   SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openmedialib\ml
   File ..\src\openmedialib\ml\audio.hpp

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp	2008-01-14 21:17:51 UTC (rev 401)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp	2008-01-26 21:24:22 UTC (rev 402)
@@ -312,7 +312,7 @@
 
 				// Close the output file
 				if ( !( fmt_->flags & AVFMT_NOFILE ) )
-					url_fclose( &oc_->pb );
+					url_fclose( oc_->pb );
 
 				// Free the context
 				av_free( oc_ );
@@ -1160,7 +1160,7 @@
 			int error = av_open_input_file( &context_, opl::to_string( resource ).c_str( ), format_, 0, params_ ) < 0;
 
 			// Check for streaming
-			if ( error == 0 && url_is_streamed( &context_->pb ) )
+			if ( error == 0 && url_is_streamed( context_->pb ) )
 			{
 				is_seekable_ = false;
 				key_search_ = true;


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

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

From: <gl...@us...> - 2008-01-14 21:17:57

Revision: 401
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=401&view=rev
Author:   glslang
Date:     2008-01-14 13:17:51 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
+ more dpx log transfer functions

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-10 22:09:39 UTC (rev 400)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-14 21:17:51 UTC (rev 401)
@@ -16,11 +16,6 @@
 
 namespace olib { namespace openimagelib { namespace il {
 
-namespace
-{
-	const float dpx_black_offset = 0.0107977516233f;
-}
-
 float to_sRGB( float v )
 {
 	if( v < ( 0.04045f / 12.92f ) )
@@ -47,7 +42,14 @@
 
 float from_dpxLog( float v )
 {
-	return ( powf( 10.0f, ( v - 685.0f ) * ( 0.002f / 0.6f )) - dpx_black_offset ) / ( 1.0f - dpx_black_offset );
+	const float dpx_black_offset = 0.0107977516233f;
+
+	return ( powf( 10.0f, ( v - 685.0f ) * ( 0.002f / 0.6f ) ) - dpx_black_offset ) / ( 1.0f - dpx_black_offset );
 }
 
+float from_dpxLog_byte_scaled( float v )
+{
+	return from_dpxLog( v ) * 1.0f / 1023.0f;
+}
+
 } } }

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-10 22:09:39 UTC (rev 400)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-14 21:17:51 UTC (rev 401)
@@ -14,6 +14,7 @@
 IL_DECLSPEC float to_rec709( float v );
 IL_DECLSPEC float from_rec709( float v );
 IL_DECLSPEC float from_dpxLog( float v );
+IL_DECLSPEC float from_dpxLog_byte_scaled( float v );
 
 } } }
 


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

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

From: <gl...@us...> - 2008-01-10 22:09:50

Revision: 400
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=400&view=rev
Author:   glslang
Date:     2008-01-10 14:09:39 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
+ dpx log to linear transfer function

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-08 23:14:58 UTC (rev 399)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-10 22:09:39 UTC (rev 400)
@@ -10,10 +10,17 @@
 #include <cmath>
 #endif
 
+#include <limits>
+
 #include <openimagelib/il/il.hpp>
 
 namespace olib { namespace openimagelib { namespace il {
 
+namespace
+{
+	const float dpx_black_offset = 0.0107977516233f;
+}
+
 float to_sRGB( float v )
 {
 	if( v < ( 0.04045f / 12.92f ) )
@@ -38,4 +45,9 @@
 		return powf( ( v + 0.099f) / 1.099f, 1.0f / 0.45f );
 }
 
+float from_dpxLog( float v )
+{
+	return ( powf( 10.0f, ( v - 685.0f ) * ( 0.002f / 0.6f )) - dpx_black_offset ) / ( 1.0f - dpx_black_offset );
+}
+
 } } }

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-08 23:14:58 UTC (rev 399)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-10 22:09:39 UTC (rev 400)
@@ -13,6 +13,7 @@
 IL_DECLSPEC float to_sRGB( float v );
 IL_DECLSPEC float to_rec709( float v );
 IL_DECLSPEC float from_rec709( float v );
+IL_DECLSPEC float from_dpxLog( float v );
 
 } } }
 


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

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

From: <gl...@us...> - 2008-01-08 23:14:59

Revision: 399
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=399&view=rev
Author:   glslang
Date:     2008-01-08 15:14:58 -0800 (Tue, 08 Jan 2008)

Log Message:
-----------
+ rec709 transfer function

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp
    trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-06 11:09:50 UTC (rev 398)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-08 23:14:58 UTC (rev 399)
@@ -22,4 +22,20 @@
 		return 1.055f * powf( v, 1.0f / 2.4f ) - 0.055f;
 }
 
+float to_rec709( float v )
+{
+	if( v < 0.018f )
+		return v * 4.5f;
+	else
+		return 1.099f * powf( v, 0.45f ) - 0.099f;
+}
+
+float from_rec709( float v )
+{
+	if( v < 0.081 )
+		return v / 4.5f;
+	else
+		return powf( ( v + 0.099f) / 1.099f, 1.0f / 0.45f );
+}
+
 } } }

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-06 11:09:50 UTC (rev 398)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-08 23:14:58 UTC (rev 399)
@@ -11,6 +11,8 @@
 namespace olib { namespace openimagelib { namespace il {
 
 IL_DECLSPEC float to_sRGB( float v );
+IL_DECLSPEC float to_rec709( float v );
+IL_DECLSPEC float from_rec709( float v );
 
 } } }
 

Modified: trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp	2008-01-06 11:09:50 UTC (rev 398)
+++ trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp	2008-01-08 23:14:58 UTC (rev 399)
@@ -18,6 +18,8 @@
 void py_lut_functions( )
 {
 	py::def( "to_sRGB", &il::to_sRGB );
+	py::def( "to_rec709", &il::to_rec709 );
+	py::def( "from_rec709", &il::from_rec709 );
 }
 
 } } } }


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

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

From: <gl...@us...> - 2008-01-06 11:09:56

Revision: 398
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=398&view=rev
Author:   glslang
Date:     2008-01-06 03:09:50 -0800 (Sun, 06 Jan 2008)

Log Message:
-----------
+ missing file

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openimagelib/py/Makefile.am

Added Paths:
-----------
    trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp

Modified: trunk/lib/openlibraries/src/openimagelib/py/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/Makefile.am	2008-01-06 10:54:23 UTC (rev 397)
+++ trunk/lib/openlibraries/src/openimagelib/py/Makefile.am	2008-01-06 11:09:50 UTC (rev 398)
@@ -11,6 +11,7 @@
 
 libopenimagelib_py_la_SOURCES = \
 	il.cpp	\
+	lut_functions.cpp \
 	py.hpp	\
 	py.cpp
 

Added: trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp	                        (rev 0)
+++ trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp	2008-01-06 11:09:50 UTC (rev 398)
@@ -0,0 +1,23 @@
+
+// il - An image library representation.
+
+// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.hdrflow.com.
+
+#include <openpluginlib/py/python.hpp>
+
+#include <openimagelib/il/il.hpp>
+#include <openimagelib/py/py.hpp>
+
+namespace il = olib::openimagelib;
+namespace py = boost::python;
+
+namespace olib { namespace openimagelib { namespace il { namespace detail {
+
+void py_lut_functions( )
+{
+	py::def( "to_sRGB", &il::to_sRGB );
+}
+
+} } } }


Property changes on: trunk/lib/openlibraries/src/openimagelib/py/lut_functions.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


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

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

From: <gl...@us...> - 2008-01-06 10:54:51

Revision: 397
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=397&view=rev
Author:   glslang
Date:     2008-01-06 02:54:23 -0800 (Sun, 06 Jan 2008)

Log Message:
-----------
+ py bindings for luts

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openimagelib/il/il_vc8.icproj
    trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj
    trunk/lib/openlibraries/src/openimagelib/py/py.cpp
    trunk/lib/openlibraries/src/openimagelib/py/py.hpp
    trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
    trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.icproj

Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.icproj	2008-01-05 21:59:16 UTC (rev 396)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.icproj	2008-01-06 10:54:23 UTC (rev 397)
@@ -8,7 +8,7 @@
 	RootNamespace="il"
 	Keyword="Win32Proj"
 	VCNestedProjectGUID="{C9BA7656-B238-4882-A30A-EC2BDB2843B4}"
-	VCNestedProjectCRC32="805946158"
+	VCNestedProjectCRC32="829839122"
 	VCNestedProjectFileName="il_vc8.vcproj">
 	<Platforms>
 		<Platform 
@@ -191,6 +191,9 @@
 				RelativePath=".\lut_converter.hpp">
 			</File>
 			<File 
+				RelativePath=".\lut_functions.hpp">
+			</File>
+			<File 
 				RelativePath=".\openimagelib_plugin.hpp">
 			</File>
 			<File 
@@ -219,6 +222,9 @@
 				RelativePath=".\il.cpp">
 			</File>
 			<File 
+				RelativePath=".\lut_functions.cpp">
+			</File>
+			<File 
 				RelativePath=".\utility.cpp">
 			</File>
 		</Filter>

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj	2008-01-05 21:59:16 UTC (rev 396)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj	2008-01-06 10:54:23 UTC (rev 397)
@@ -7,7 +7,7 @@
 	RootNamespace="jpg"
 	Keyword="Win32Proj"
 	VCNestedProjectGUID="{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}"
-	VCNestedProjectCRC32="162289014"
+	VCNestedProjectCRC32="808222300"
 	VCNestedProjectFileName="jpg_vc8.vcproj">
 	<Platforms>
 		<Platform 
@@ -38,7 +38,7 @@
 				Name="CppCmplrTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;&quot;C:\Program Files\HDR\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;HAVE_JPEGHDR"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 				Name="LinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalOptions="/LARGEADDRESSAWARE"
-				AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
+				AdditionalDependencies="libjpeg.lib"
 				OutputFile="$(OutDir)/openimagelib_jpg-vc80-d-0_5_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;&quot;C:\Program Files\HDR\lib&quot;"
@@ -136,7 +136,7 @@
 				Name="LinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalOptions="/LARGEADDRESSAWARE"
-				AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
+				AdditionalDependencies="libjpeg.lib"
 				OutputFile="$(OutDir)/openimagelib_jpg-vc80-r-0_5_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;&quot;C:\Program Files\HDR\lib&quot;"

Modified: trunk/lib/openlibraries/src/openimagelib/py/py.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py.cpp	2008-01-05 21:59:16 UTC (rev 396)
+++ trunk/lib/openlibraries/src/openimagelib/py/py.cpp	2008-01-06 10:54:23 UTC (rev 397)
@@ -15,4 +15,5 @@
 	il::detail::py_basic_image( );
 	il::detail::py_utility( );
 	il::detail::py_plugin( );
+	il::detail::py_lut_functions( );
 }

Modified: trunk/lib/openlibraries/src/openimagelib/py/py.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py.hpp	2008-01-05 21:59:16 UTC (rev 396)
+++ trunk/lib/openlibraries/src/openimagelib/py/py.hpp	2008-01-06 10:54:23 UTC (rev 397)
@@ -13,6 +13,7 @@
 void py_basic_image( );
 void py_utility( );
 void py_plugin( );
+void py_lut_functions( );
 
 } } } }
 

Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj	2008-01-05 21:59:16 UTC (rev 396)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj	2008-01-06 10:54:23 UTC (rev 397)
@@ -197,6 +197,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\lut_functions.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\py.cpp"
 				>
 			</File>

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.icproj	2008-01-05 21:59:16 UTC (rev 396)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.icproj	2008-01-06 10:54:23 UTC (rev 397)
@@ -8,7 +8,7 @@
 	RootNamespace="quicktime"
 	Keyword="Win32Proj"
 	VCNestedProjectGUID="{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
-	VCNestedProjectCRC32="345708610"
+	VCNestedProjectCRC32="886469806"
 	VCNestedProjectFileName="quicktime_vc8.vcproj">
 	<Platforms>
 		<Platform 
@@ -43,7 +43,7 @@
 				MinimalRebuild="true"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				OpenMP="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -109,7 +109,7 @@
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;&quot;C:\Program Files\QuickTime SDK\CIncludes&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QUICKTIME_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
 				ExceptionHandling="2"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				FloatingPointModel="2"
 				OpenMP="true"


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

[Hdrflow-svn] SF.net SVN: hdrflow: [396] trunk/lib/extras/src/lut/lut.cpp

From: <gl...@us...> - 2008-01-05 21:59:18

Revision: 396
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=396&view=rev
Author:   glslang
Date:     2008-01-05 13:59:16 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
+ sRGB lut

Modified Paths:
--------------
    trunk/lib/extras/src/lut/lut.cpp

Modified: trunk/lib/extras/src/lut/lut.cpp
===================================================================
--- trunk/lib/extras/src/lut/lut.cpp	2008-01-05 21:43:59 UTC (rev 395)
+++ trunk/lib/extras/src/lut/lut.cpp	2008-01-05 21:59:16 UTC (rev 396)
@@ -18,6 +18,39 @@
 
 namespace hdrflow {
 
+namespace
+{
+	typedef float ( *unary_float )( float );
+	
+	template<typename T, typename F>
+	void fill_3( il::image_type_ptr im, F fn )
+	{
+		int width = im->width( );
+		int height = im->height( );
+		int depth = im->depth( );
+		int pitch = im->pitch( );
+	
+		const float sx = 1.0f / ( width - 1.0f );
+		
+		T* src = reinterpret_cast<T*>( im->data( ) );
+				
+		for( int i = 0; i < depth; ++i )
+		{
+			for( int j = 0; j < height; ++j )
+			{
+				for( int k = 0; k < width; ++k )
+				{
+					src[ k + 0 ] = static_cast<T>( fn( k * sx ) );
+					src[ k + 1 ] = static_cast<T>( fn( k * sx ) );
+					src[ k + 2 ] = static_cast<T>( fn( k * sx ) );
+				}
+				
+				src += pitch;
+			}
+		}
+	}
+}
+
 class ML_PLUGIN_DECLSPEC lut_input : public ml::input_type
 {
 public:
@@ -105,33 +138,11 @@
 		pl::wstring pf = prop_colourspace_.value<pl::wstring>( );
 		pl::wstring fn = prop_function_.value<pl::wstring>( );
 		
-		int width = im->width( );
-		int height = im->height( );
-		int depth = im->depth( );
-		int pitch = im->pitch( );
-	
-		const float sx = 1.0f / ( width - 1.0f );
-		
 		if( fn == L"sRGB" )
 		{
 			if( pf == L"r32g32b32f" )
 			{
-				float* src = reinterpret_cast<float*>( im->data( ) );
-				
-				for( int i = 0; i < depth; ++i )
-				{
-					for( int j = 0; j < height; ++j )
-					{
-						for( int k = 0; k < width; ++k )
-						{
-							src[ k + 0 ] = il::to_sRGB( k * sx );
-							src[ k + 1 ] = il::to_sRGB( k * sx );
-							src[ k + 2 ] = il::to_sRGB( k * sx );
-						}
-						
-						src += pitch;
-					}
-				}
+				fill_3<float, unary_float>( im, il::to_sRGB );
 			}
 		}
 	}


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

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

From: <gl...@us...> - 2008-01-05 21:44:00

Revision: 395
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=395&view=rev
Author:   glslang
Date:     2008-01-05 13:43:59 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
+ sRGB lut

Modified Paths:
--------------
    trunk/lib/extras/src/lut/lut.cpp
    trunk/lib/openlibraries/src/openimagelib/il/il.hpp
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp

Modified: trunk/lib/extras/src/lut/lut.cpp
===================================================================
--- trunk/lib/extras/src/lut/lut.cpp	2008-01-05 21:00:49 UTC (rev 394)
+++ trunk/lib/extras/src/lut/lut.cpp	2008-01-05 21:43:59 UTC (rev 395)
@@ -9,11 +9,6 @@
 #include <openlibraries_global_config.hpp>
 #endif
 
-#ifdef WIN32
-#define _USE_MATH_DEFINES
-#include <cmath>
-#endif
-
 #include <openmedialib/ml/openmedialib_plugin.hpp>
 
 namespace pl = olib::openpluginlib;
@@ -28,8 +23,10 @@
 public:
 	explicit lut_input( )
 		: prop_colourspace_( pcos::key::from_string( "colourspace" ) )
+		, prop_function_( pcos::key::from_string( "function" ) )
 		, prop_width_( pcos::key::from_string( "width" ) )
 		, prop_height_( pcos::key::from_string( "height" ) )
+		, prop_depth_( pcos::key::from_string( "depth" ) )
 		, prop_fps_num_( pcos::key::from_string( "fps_num" ) )
 		, prop_fps_den_( pcos::key::from_string( "fps_den" ) )
 		, prop_sar_num_( pcos::key::from_string( "sar_num" ) )
@@ -37,8 +34,10 @@
 		, prop_out_( pcos::key::from_string( "out" ) )
 	{
 		properties( ).append( prop_colourspace_ = pl::wstring( L"r32g32b32f" ) );
+		properties( ).append( prop_function_ = pl::wstring( L"sRGB" ) );
 		properties( ).append( prop_width_ = 512 );
-		properties( ).append( prop_height_ = 512 );
+		properties( ).append( prop_height_ = 1 );
+		properties( ).append( prop_depth_ = 1 );
 		properties( ).append( prop_fps_num_ = 24 );
 		properties( ).append( prop_fps_den_ = 1 );
 		properties( ).append( prop_sar_num_ = 1 );
@@ -82,18 +81,67 @@
 
 	virtual ml::frame_type_ptr fetch( )
 	{
-		return ml::frame_type_ptr( );
+		acquire_values( );
+
+		il::image_type_ptr image = il::allocate( prop_colourspace_.value<pl::wstring>( ).c_str(), get_width( ), get_height( ) );
+		if( image )
+			fill( image );
+
+		ml::frame_type_ptr frame( new ml::frame_type( ) );
+		frame->set_sar( prop_sar_num_.value<int>( ), prop_sar_den_.value<int>( ) );
+		frame->set_fps( prop_fps_num_.value<int>( ), prop_fps_den_.value<int>( ) );
+		frame->set_pts( get_position( ) * 1.0 / fps( ) );
+		frame->set_duration( 1.0 / fps( ) );
+		frame->set_position( get_position( ) );
+
+		frame->set_image( image );
+
+		return frame;
 	}
 	
 private:
 	void fill( il::image_type_ptr im )
 	{
+		pl::wstring pf = prop_colourspace_.value<pl::wstring>( );
+		pl::wstring fn = prop_function_.value<pl::wstring>( );
+		
+		int width = im->width( );
+		int height = im->height( );
+		int depth = im->depth( );
+		int pitch = im->pitch( );
+	
+		const float sx = 1.0f / ( width - 1.0f );
+		
+		if( fn == L"sRGB" )
+		{
+			if( pf == L"r32g32b32f" )
+			{
+				float* src = reinterpret_cast<float*>( im->data( ) );
+				
+				for( int i = 0; i < depth; ++i )
+				{
+					for( int j = 0; j < height; ++j )
+					{
+						for( int k = 0; k < width; ++k )
+						{
+							src[ k + 0 ] = il::to_sRGB( k * sx );
+							src[ k + 1 ] = il::to_sRGB( k * sx );
+							src[ k + 2 ] = il::to_sRGB( k * sx );
+						}
+						
+						src += pitch;
+					}
+				}
+			}
+		}
 	}
 
 private:
 	pcos::property prop_colourspace_;
+	pcos::property prop_function_;
 	pcos::property prop_width_;
 	pcos::property prop_height_;
+	pcos::property prop_depth_;
 	pcos::property prop_fps_num_;
 	pcos::property prop_fps_den_;
 	pcos::property prop_sar_num_;

Modified: trunk/lib/openlibraries/src/openimagelib/il/il.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il.hpp	2008-01-05 21:00:49 UTC (rev 394)
+++ trunk/lib/openlibraries/src/openimagelib/il/il.hpp	2008-01-05 21:43:59 UTC (rev 395)
@@ -14,6 +14,7 @@
 #include <openimagelib/il/basic_image.hpp>
 #include <openimagelib/il/traits.hpp>
 #include <openimagelib/il/utility.hpp>
+#include <openimagelib/il/lut_functions.hpp>
 
 namespace olib { namespace openimagelib {
 

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-05 21:00:49 UTC (rev 394)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-05 21:43:59 UTC (rev 395)
@@ -10,7 +10,7 @@
 #include <cmath>
 #endif
 
-#include <openimagelib/il/lut_functions.hpp>
+#include <openimagelib/il/il.hpp>
 
 namespace olib { namespace openimagelib { namespace il {
 

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-05 21:00:49 UTC (rev 394)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-05 21:43:59 UTC (rev 395)
@@ -10,7 +10,7 @@
 
 namespace olib { namespace openimagelib { namespace il {
 
-float to_sRGB( float v );
+IL_DECLSPEC float to_sRGB( float v );
 
 } } }
 


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

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

From: <gl...@us...> - 2008-01-05 21:00:53

Revision: 394
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=394&view=rev
Author:   glslang
Date:     2008-01-05 13:00:49 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
+ some more lut related code

Modified Paths:
--------------
    trunk/lib/extras/src/lut/lut.cpp
    trunk/lib/openlibraries/src/openimagelib/il/Makefile.am
    trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj

Added Paths:
-----------
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
    trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp

Modified: trunk/lib/extras/src/lut/lut.cpp
===================================================================
--- trunk/lib/extras/src/lut/lut.cpp	2008-01-03 21:35:22 UTC (rev 393)
+++ trunk/lib/extras/src/lut/lut.cpp	2008-01-05 21:00:49 UTC (rev 394)
@@ -23,34 +23,90 @@
 
 namespace hdrflow {
 
-class ML_PLUGIN_DECLSPEC gamma_input : public ml::input_type
+class ML_PLUGIN_DECLSPEC lut_input : public ml::input_type
 {
 public:
-	explicit gamma_input( )
+	explicit lut_input( )
 		: prop_colourspace_( pcos::key::from_string( "colourspace" ) )
 		, prop_width_( pcos::key::from_string( "width" ) )
 		, prop_height_( pcos::key::from_string( "height" ) )
+		, prop_fps_num_( pcos::key::from_string( "fps_num" ) )
+		, prop_fps_den_( pcos::key::from_string( "fps_den" ) )
+		, prop_sar_num_( pcos::key::from_string( "sar_num" ) )
+		, prop_sar_den_( pcos::key::from_string( "sar_den" ) )
+		, prop_out_( pcos::key::from_string( "out" ) )
 	{
-		 
+		properties( ).append( prop_colourspace_ = pl::wstring( L"r32g32b32f" ) );
+		properties( ).append( prop_width_ = 512 );
+		properties( ).append( prop_height_ = 512 );
+		properties( ).append( prop_fps_num_ = 24 );
+		properties( ).append( prop_fps_den_ = 1 );
+		properties( ).append( prop_sar_num_ = 1 );
+		properties( ).append( prop_sar_den_ = 1 );
+		properties( ).append( prop_out_ = 24 );	 
 	}
 
-	virtual ~gamma_input( ) { }
+	virtual ~lut_input( ) { }
 	
-	virtual pl::wstring get_uri( ) const { return L"gamma:"; }
+	virtual pl::wstring get_uri( ) const { return L"lut:"; }
 	virtual pl::wstring get_mime_type( ) const { return L""; }
+	
+	virtual int get_frames( ) const { return prop_out_.value<int>( ); }
+	virtual bool is_seekable( ) const { return true; }
+	
+	virtual void get_fps( int& num, int& den ) const
+	{
+		num = prop_sar_num_.value<int>( );
+		den = prop_sar_den_.value<int>( );
+	}
 
+	virtual double fps( ) const
+	{
+		int num, den;
+		get_fps( num, den );
+		return den != 0 ? double( num ) / double( den ) : 1;
+	}
+
+	virtual void get_sar( int &num, int &den ) const 
+	{
+		num = prop_sar_num_.value<int>( );
+		den = prop_sar_den_.value<int>( );
+	}
+
+	virtual int get_video_streams( ) const { return 1; }
+
+	virtual int get_width( ) const { return prop_width_.value<int>( ); }
+	virtual int get_height( ) const { return prop_height_.value<int>( ); }
+
+	virtual int get_audio_streams( ) const { return 0; }
+
+	virtual ml::frame_type_ptr fetch( )
+	{
+		return ml::frame_type_ptr( );
+	}
+	
 private:
+	void fill( il::image_type_ptr im )
+	{
+	}
+
+private:
 	pcos::property prop_colourspace_;
 	pcos::property prop_width_;
 	pcos::property prop_height_;
+	pcos::property prop_fps_num_;
+	pcos::property prop_fps_den_;
+	pcos::property prop_sar_num_;
+	pcos::property prop_sar_den_;
+	pcos::property prop_out_;
 };
 
 class ML_PLUGIN_DECLSPEC lut_plugin : public ml::openmedialib_plugin
 {
 public:
-	virtual ml::input_type_ptr input( const pl::wstring& request )
+	virtual ml::input_type_ptr input( const pl::wstring& )
 	{
-		return ml::input_type_ptr( );
+		return ml::input_type_ptr( new lut_input( ) );
 	}
 };
 

Modified: trunk/lib/openlibraries/src/openimagelib/il/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/Makefile.am	2008-01-03 21:35:22 UTC (rev 393)
+++ trunk/lib/openlibraries/src/openimagelib/il/Makefile.am	2008-01-05 21:00:49 UTC (rev 394)
@@ -14,6 +14,9 @@
 	float_traits.hpp		\
 	il.hpp					\
 	il.cpp					\
+	lut_converter.hpp		\
+	lut_functions.cpp		\
+	lut_functions.hpp		\
 	openimagelib_plugin.hpp	\
 	rgb_traits.hpp			\
 	traits.hpp				\

Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj	2008-01-03 21:35:22 UTC (rev 393)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj	2008-01-05 21:00:49 UTC (rev 394)
@@ -231,6 +231,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\lut_functions.hpp"
+				>
+			</File>
+			<File
 				RelativePath=".\openimagelib_plugin.hpp"
 				>
 			</File>
@@ -267,6 +271,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\lut_functions.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\utility.cpp"
 				>
 			</File>

Added: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	                        (rev 0)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp	2008-01-05 21:00:49 UTC (rev 394)
@@ -0,0 +1,25 @@
+
+// il - An image library representation.
+
+// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.hdrflow.com.
+
+#ifdef WIN32
+#define _USE_MATH_DEFINES
+#include <cmath>
+#endif
+
+#include <openimagelib/il/lut_functions.hpp>
+
+namespace olib { namespace openimagelib { namespace il {
+
+float to_sRGB( float v )
+{
+	if( v < ( 0.04045f / 12.92f ) )
+		return v * 12.92f;
+	else
+		return 1.055f * powf( v, 1.0f / 2.4f ) - 0.055f;
+}
+
+} } }


Property changes on: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	                        (rev 0)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp	2008-01-05 21:00:49 UTC (rev 394)
@@ -0,0 +1,17 @@
+
+// il - An image library representation.
+
+// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.hdrflow.com.
+
+#ifndef LUT_FUNCTIONS_INC_
+#define LUT_FUNCTIONS_INC_
+
+namespace olib { namespace openimagelib { namespace il {
+
+float to_sRGB( float v );
+
+} } }
+
+#endif


Property changes on: trunk/lib/openlibraries/src/openimagelib/il/lut_functions.hpp
___________________________________________________________________
Name: svn:eol-style
   + native


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

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

From: <gl...@us...> - 2008-01-03 21:35:25

Revision: 393
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=393&view=rev
Author:   glslang
Date:     2008-01-03 13:35:22 -0800 (Thu, 03 Jan 2008)

Log Message:
-----------
+ adds lut conversion of 16bpc fixed to float

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openimagelib/il/lut_converter.hpp
    trunk/lib/openlibraries/src/openimagelib/il/utility.cpp

Modified: trunk/lib/openlibraries/src/openimagelib/il/lut_converter.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/lut_converter.hpp	2008-01-02 23:02:01 UTC (rev 392)
+++ trunk/lib/openlibraries/src/openimagelib/il/lut_converter.hpp	2008-01-03 21:35:22 UTC (rev 393)
@@ -39,6 +39,12 @@
 	{ return static_cast<result_type>( openpluginlib::fast_floorf( v ) ); }
 };
 
+struct fixed16_to_float : public std::unary_function<unsigned short, float>
+{
+	result_type operator( )( argument_type v ) const
+	{ return static_cast<result_type>( static_cast<short>( v ) / 8192.0f ); }
+};
+
 } } }
 
 #endif

Modified: trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/utility.cpp	2008-01-02 23:02:01 UTC (rev 392)
+++ trunk/lib/openlibraries/src/openimagelib/il/utility.cpp	2008-01-03 21:35:22 UTC (rev 393)
@@ -1113,10 +1113,11 @@
 	{ L"a8b8g8r8", L"r8g8b8", 4, { 3, 2, 1, 0 }, 3, { 0, 1, 2, 0 } },
 	{ L"l8a8", L"b8g8r8a8", 2, { 0, 0, 0, 1 }, 4, { 2, 1, 0, 3 } },
 	{ L"l8a8", L"b8g8r8", 2, { 0, 0, 0, 1 }, 3, { 2, 1, 0, 0 } },
+	{ L"r16g16b16fixed", L"r32g32b32a32f", 3, { 0, 1, 2, 0 }, 4, { 0, 1, 2, 3 } },
 	{ L"", L"", 0, { 0, 0, 0, 0 }, 0, { 0, 0, 0, 0 } }
 };
 
-template<typename const_pointer, typename pointer, class LUT>
+template<typename T, typename U, class LUT>
 image_type_ptr rgb_to_rgb( const image_type_ptr &src_img, const std::wstring &format )
 {
 	size_type width = src_img->width( );
@@ -1128,13 +1129,13 @@
 	{
 		LUT lut;
 		
-		const_pointer src = src_img->data( );
+		T src = reinterpret_cast<T>( src_img->data( ) );
 		size_type src_pitch = src_img->pitch( );
-		pointer dst = dst_img->data( );
+		U dst = reinterpret_cast<U>( dst_img->data( ) );
 		size_type dst_pitch = dst_img->pitch( );
 
-		const_pointer sptr = src;
-		pointer dptr = dst;
+		T sptr = src;
+		U dptr = dst;
 
 		size_type orig_width = width;
 
@@ -2090,6 +2091,11 @@
 		if( dst_pf == L"b8g8r8a8" )
 			return l10_l12_l16p_ushort_with_alpha_to_b8g8r8a8( src, dst_pf );
 	}
+	else if( src_pf == L"r16g16b16fixed" )
+	{
+		if( dst_pf == L"r32g32b32a32f" )
+			return rgb_to_rgb<const unsigned short*, float*, fixed16_to_float>( src, dst_pf );
+	}
 
 #ifndef WIN32
 	fprintf( stderr, "Unknown %s to %s\n", opl::to_string( src_pf ).c_str( ), opl::to_string( dst_pf ).c_str( ) );


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

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

From: <gl...@us...> - 2008-01-02 23:02:04

Revision: 392
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=392&view=rev
Author:   glslang
Date:     2008-01-02 15:02:01 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
+ adds a fixed point float format to il
+ more wic

Modified Paths:
--------------
    trunk/lib/extras/src/wic/wic.cpp
    trunk/lib/openlibraries/openlibraries_vc8.sln
    trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp
    trunk/lib/openlibraries/src/openimagelib/il/utility.cpp

Modified: trunk/lib/extras/src/wic/wic.cpp
===================================================================
--- trunk/lib/extras/src/wic/wic.cpp	2008-01-01 17:55:53 UTC (rev 391)
+++ trunk/lib/extras/src/wic/wic.cpp	2008-01-02 23:02:01 UTC (rev 392)
@@ -30,10 +30,12 @@
 
 namespace
 {
-	il::image_type_ptr GUID_to_pf( WICPixelFormatGUID guid, UINT width, UINT height, UINT& pitch )
+	il::image_type_ptr GUID_to_pf( WICPixelFormatGUID guid, UINT width, UINT height, UINT& pitch, bool& convert )
 	{
 		il::image_type_ptr im;
 		
+		convert = false;
+		
 		if( guid == GUID_WICPixelFormat128bppRGBAFloat )
 		{
 			im = il::allocate( L"r32g32b32a32f", width, height );
@@ -41,6 +43,8 @@
 		}
 		else if( guid == GUID_WICPixelFormat128bppRGBFloat )
 		{
+			im = il::allocate( L"r32g32b32f", width, height );
+			pitch = im->pitch( ) * sizeof( float );			
 		}
 
 		return im;
@@ -75,7 +79,8 @@
 		source->GetPixelFormat( &pixelformat );
 
 		UINT pitch;
-		im = GUID_to_pf( pixelformat, width, height, pitch );
+		bool convert;
+		im = GUID_to_pf( pixelformat, width, height, pitch, convert );
 		if( !im )
 			return im;
 		

Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln	2008-01-01 17:55:53 UTC (rev 391)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln	2008-01-02 23:02:01 UTC (rev 392)
@@ -304,26 +304,6 @@
 		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multipass_draw", "test\openobjectlib\GL\multipass_draw\multipass_draw_vc8.vcproj", "{AB0137D5-38BE-45A5-ACE9-02BB34D02358}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noise_volume", "test\openobjectlib\GL\noise_volume\noise_volume_vc8.vcproj", "{3780D440-9C37-4186-B9B2-861EF3833CD4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_draw", "test\openobjectlib\GL\obj_draw\obj_draw_vc8.vcproj", "{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texture_draw", "test\openobjectlib\GL\texture_draw\texture_draw_vc8.vcproj", "{8032E526-0866-4764-A4E9-F18C7CEE12D2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{B972DCEB-386E-42D2-8C5E-DD2942EC7F63}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{C85EDDFB-1A91-4ABD-8E86-6AFDF0C85CBA}"
@@ -551,22 +531,6 @@
 		{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{AB0137D5-38BE-45A5-ACE9-02BB34D02358}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{3780D440-9C37-4186-B9B2-861EF3833CD4}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{DD597B0F-DE01-4A1A-A399-F2355ABB06B0}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
-		{8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
-		{8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{8032E526-0866-4764-A4E9-F18C7CEE12D2}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -670,10 +634,6 @@
 		{4CC2C554-1EB4-4E53-A73F-38F0A1862F49} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
 		{F30DAA25-794E-44F6-BF01-867A72BE385B} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
 		{DBF9F309-3C1F-4563-AA2B-69FA27C2CBF7} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
-		{3780D440-9C37-4186-B9B2-861EF3833CD4} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
-		{DD597B0F-DE01-4A1A-A399-F2355ABB06B0} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
-		{8032E526-0866-4764-A4E9-F18C7CEE12D2} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
-		{AB0137D5-38BE-45A5-ACE9-02BB34D02358} = {B972DCEB-386E-42D2-8C5E-DD2942EC7F63}
 		{6D618CAE-230F-4ADD-936B-6C1D3D723236} = {C85EDDFB-1A91-4ABD-8E86-6AFDF0C85CBA}
 	EndGlobalSection
 EndGlobal

Modified: trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp	2008-01-01 17:55:53 UTC (rev 391)
+++ trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp	2008-01-02 23:02:01 UTC (rev 392)
@@ -268,6 +268,49 @@
 	{ flop_scan_line_( p, ( float* ) dst, ( const float* ) src, w ); }
 };
 
+template<typename T = float, class storage = default_storage<T> >
+class r16g16b16fixed : public surface_format<T, storage>
+{
+public:
+	typedef typename storage::const_pointer					const_pointer;
+	typedef typename storage::pointer						pointer;
+	typedef typename surface_format<T, storage>::size_type	size_type;
+
+private:
+	static const size_type bs = 3;
+
+public:
+	explicit r16g16b16fixed( size_type width,
+						     size_type height,
+						     size_type depth,
+						     size_type count	= 1,
+						     bool cubemap		= false )
+		: surface_format<T, storage>( bs, width, height, depth, count, cubemap, L"r16g16b16fixed" )
+	{ surface_format<T, storage>::allocate( ); }
+
+	r16g16b16fixed( const r16g16b16fixed& other, size_type w, size_type h )
+		: surface_format<T, storage>( other.bs, w, h, other.depth( ), other.count( ), other.is_cubemap( ), L"r16g16b16fixed" )
+	{ surface_format<T, storage>::allocate( ); }
+
+	~r16g16b16fixed( )
+	{ }
+
+public:
+	virtual size_type allocsize( size_type width, size_type height, size_type depth ) const
+	{ return sizeof( unsigned short ) * detail::rgb_Allocate_size<T>( )( bs, width, height, depth ); }
+
+	virtual size_type bitdepth( ) const
+	{ return 16; }
+	
+	virtual bool is_float( ) const { return true; }
+	
+	virtual r16g16b16fixed* clone( size_type w, size_type h )
+	{ return new r16g16b16fixed( *this, w, h ); }
+	
+	virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
+	{ flop_scan_line_( p, ( short* ) dst, ( const unsigned short* ) src, w ); }
+};
+
 } } }
 
 #endif

Modified: trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/utility.cpp	2008-01-01 17:55:53 UTC (rev 391)
+++ trunk/lib/openlibraries/src/openimagelib/il/utility.cpp	2008-01-02 23:02:01 UTC (rev 392)
@@ -154,6 +154,7 @@
 typedef image< unsigned char, r16g16b16a16log >	r16g16b16a16log_image_type;
 typedef image< unsigned char, r32g32b32f >		r32g32b32f_image_type;
 typedef image< unsigned char, r32g32b32a32f >	r32g32b32a32f_image_type;
+typedef image< unsigned char, r16g16b16fixed >	r16g16b16fixed_image_type;
 typedef image< unsigned char, rgbe >			rgbe_image_type;
 typedef image< unsigned char, yuv444p >			yuv444p_image_type;
 typedef image< unsigned char, yuv444 >			yuv444_image_type;
@@ -235,6 +236,8 @@
 		dst_img = image_type_ptr( new image_type( r32g32b32f_image_type( width, height, 1 ) ) );
 	else if( pf == L"r32g32b32a32f" )
 		dst_img = image_type_ptr( new image_type( r32g32b32a32f_image_type( width, height, 1 ) ) );
+	else if( pf == L"r16g16b16fixed" )
+		dst_img = image_type_ptr( new image_type( r16g16b16fixed_image_type( width, height, 1 ) ) );
 	else if( pf == L"rgbe" )
 		dst_img = image_type_ptr( new image_type( rgbe_image_type( width, height, 1 ) ) );
 	else if ( pf == L"yuv444p" )


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

[Hdrflow-svn] SF.net SVN: hdrflow: [391] trunk/lib/extras/src/wic/wic.cpp

From: <gl...@us...> - 2008-01-01 17:55:55

Revision: 391
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=391&view=rev
Author:   glslang
Date:     2008-01-01 09:55:53 -0800 (Tue, 01 Jan 2008)

Log Message:
-----------
+ little bit more wic

Modified Paths:
--------------
    trunk/lib/extras/src/wic/wic.cpp

Modified: trunk/lib/extras/src/wic/wic.cpp
===================================================================
--- trunk/lib/extras/src/wic/wic.cpp	2007-12-30 21:21:49 UTC (rev 390)
+++ trunk/lib/extras/src/wic/wic.cpp	2008-01-01 17:55:53 UTC (rev 391)
@@ -15,6 +15,7 @@
 #include <openlibraries_global_config.hpp>
 #endif
 
+#include <atlbase.h>
 #include <wincodec.h>
 #include <wincodecsdk.h>
 
@@ -38,31 +39,32 @@
 			im = il::allocate( L"r32g32b32a32f", width, height );
 			pitch = im->pitch( ) * sizeof( float );
 		}
+		else if( guid == GUID_WICPixelFormat128bppRGBFloat )
+		{
+		}
 
 		return im;
 	}
 	
 	il::image_type_ptr load_wic( const pl::string& uri )
 	{
-#	define SAFE_RELEASE( p ) { if( p ) { p->Release( ); p = NULL; } }
-
 		il::image_type_ptr im;
 
-		IWICImagingFactory* wic_factory = NULL;
-		IWICBitmapDecoder* decoder = NULL;
-		IWICBitmapFrameDecode* frame = NULL;
+		CComPtr<IWICImagingFactory> wic_factory;
+		CComPtr<IWICBitmapDecoder> decoder;
+		CComPtr<IWICBitmapFrameDecode> frame;
 		
 		HRESULT hr = CoCreateInstance( CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, IID_IWICImagingFactory, ( LPVOID* ) &wic_factory );
 		if( FAILED( hr ) )
-			goto error;
+			return im;
 		
 		hr = wic_factory->CreateDecoderFromFilename( pl::to_wstring( uri ).c_str( ), NULL, GENERIC_READ, WICDecodeMetadataCacheOnDemand, &decoder );
 		if( FAILED( hr ) )
-			goto error;
+			return im;
 
 		hr = decoder->GetFrame( 0, &frame );
 		if( FAILED( hr ) )
-			goto error;
+			return im;
 
 		IWICBitmapSource* source = ( IWICBitmapSource* ) frame;
 		UINT width;
@@ -74,16 +76,12 @@
 
 		UINT pitch;
 		im = GUID_to_pf( pixelformat, width, height, pitch );
+		if( !im )
+			return im;
+		
 		hr = source->CopyPixels( NULL, pitch, im->size( ), im->data( ) );
 
-	error:
-		SAFE_RELEASE( decoder );
-		SAFE_RELEASE( wic_factory );
-		SAFE_RELEASE( frame );
-			
 		return im;
-
-#	undef SAFE_RELEASE
 	}
 }
 


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

[Hdrflow-svn] SF.net SVN: hdrflow: [390] trunk/lib/extras/src

From: <gl...@us...> - 2007-12-30 21:21:51

Revision: 390
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=390&view=rev
Author:   glslang
Date:     2007-12-30 13:21:49 -0800 (Sun, 30 Dec 2007)

Log Message:
-----------
+ more JPEG XR/HD Photo support

Modified Paths:
--------------
    trunk/lib/extras/src/lut/lut.cpp
    trunk/lib/extras/src/wic/wic.cpp

Added Paths:
-----------
    trunk/lib/extras/src/wic/wic_plugin.opl

Modified: trunk/lib/extras/src/lut/lut.cpp
===================================================================
--- trunk/lib/extras/src/lut/lut.cpp	2007-12-30 16:49:57 UTC (rev 389)
+++ trunk/lib/extras/src/lut/lut.cpp	2007-12-30 21:21:49 UTC (rev 390)
@@ -27,24 +27,22 @@
 {
 public:
 	explicit gamma_input( )
-		: prop_width_( pcos::key::from_string( "width" ) )
+		: prop_colourspace_( pcos::key::from_string( "colourspace" ) )
+		, prop_width_( pcos::key::from_string( "width" ) )
 		, prop_height_( pcos::key::from_string( "height" ) )
-		, prop_bitdepth_( pcos::key::from_string( "bitdepth" ) )
-		, prop_is_float_( pcos::key::from_string( "is_float" ) )
-	{ }
+	{
+		 
+	}
 
 	virtual ~gamma_input( ) { }
 	
 	virtual pl::wstring get_uri( ) const { return L"gamma:"; }
 	virtual pl::wstring get_mime_type( ) const { return L""; }
-	
-	
 
 private:
+	pcos::property prop_colourspace_;
 	pcos::property prop_width_;
 	pcos::property prop_height_;
-	pcos::property prop_bitdepth_;
-	pcos::property prop_is_float_;	
 };
 
 class ML_PLUGIN_DECLSPEC lut_plugin : public ml::openmedialib_plugin

Modified: trunk/lib/extras/src/wic/wic.cpp
===================================================================
--- trunk/lib/extras/src/wic/wic.cpp	2007-12-30 16:49:57 UTC (rev 389)
+++ trunk/lib/extras/src/wic/wic.cpp	2007-12-30 21:21:49 UTC (rev 390)
@@ -29,9 +29,17 @@
 
 namespace
 {
-	il::image_type_ptr GUID_to_pf( WICPixelFormatGUID guid, UINT width, UINT height )
+	il::image_type_ptr GUID_to_pf( WICPixelFormatGUID guid, UINT width, UINT height, UINT& pitch )
 	{
-		return il::image_type_ptr( );
+		il::image_type_ptr im;
+		
+		if( guid == GUID_WICPixelFormat128bppRGBAFloat )
+		{
+			im = il::allocate( L"r32g32b32a32f", width, height );
+			pitch = im->pitch( ) * sizeof( float );
+		}
+
+		return im;
 	}
 	
 	il::image_type_ptr load_wic( const pl::string& uri )
@@ -64,7 +72,9 @@
 		source->GetSize( &width, &height );
 		source->GetPixelFormat( &pixelformat );
 
-		im = GUID_to_pf( pixelformat, width, height );
+		UINT pitch;
+		im = GUID_to_pf( pixelformat, width, height, pitch );
+		hr = source->CopyPixels( NULL, pitch, im->size( ), im->data( ) );
 
 	error:
 		SAFE_RELEASE( decoder );

Added: trunk/lib/extras/src/wic/wic_plugin.opl
===================================================================
--- trunk/lib/extras/src/wic/wic_plugin.opl	                        (rev 0)
+++ trunk/lib/extras/src/wic/wic_plugin.opl	2007-12-30 21:21:49 UTC (rev 390)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openlibraries version="1.0">
+	<openimagelib name="oil" version="0.2.0">
+		<plugin name="HDRFlow wic plugin" type="input" in_filter="*.hdp *.wdp" extension='".*\.hdp", ".*\.wdp"' merit="0" filename='"libhdrflow_extras_wic.so", "libhdrflow_extras_wic.dylib", "hdrflow_extras_wic-vc80-d-0_1_0.dll", "hdrflow_extras_wic-vc80-r-0_1_0.dll"'/>
+	</openimagelib>
+</openlibraries>


Property changes on: trunk/lib/extras/src/wic/wic_plugin.opl
___________________________________________________________________
Name: svn:eol-style
   + native


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

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

From: <gl...@us...> - 2007-12-30 16:50:01

Revision: 389
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=389&view=rev
Author:   glslang
Date:     2007-12-30 08:49:57 -0800 (Sun, 30 Dec 2007)

Log Message:
-----------
+ removes unneeded const
+ some stubs for luts and hd photo

Modified Paths:
--------------
    trunk/lib/extras/extras_vc8.sln
    trunk/lib/extras/src/noise/noise.cpp
    trunk/lib/extras/src/panoramic/panoramic.cpp
    trunk/lib/extras/src/ppm/ppm_plugin.cpp
    trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
    trunk/lib/openlibraries/src/openmedialib/ml/filter.hpp
    trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
    trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp
    trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.cpp
    trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
    trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
    trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_input.h
    trunk/lib/openlibraries/src/openmedialib/py/ml.cpp

Added Paths:
-----------
    trunk/lib/extras/src/lut/
    trunk/lib/extras/src/lut/lut.cpp
    trunk/lib/extras/src/lut/lut_vc8.vcproj
    trunk/lib/extras/src/wic/
    trunk/lib/extras/src/wic/wic.cpp
    trunk/lib/extras/src/wic/wic_vc8.vcproj

Modified: trunk/lib/extras/extras_vc8.sln
===================================================================
--- trunk/lib/extras/extras_vc8.sln	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/extras/extras_vc8.sln	2007-12-30 16:49:57 UTC (rev 389)
@@ -28,6 +28,14 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "readers", "src\imf\mfn\readers_vc8.vcproj", "{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LUTs", "LUTs", "{078F108D-642B-417D-99C6-F05C8266C57E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lut", "src\lut\lut_vc8.vcproj", "{80F6C766-D2FB-4744-AAAD-0DC99094DCDD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WIC", "WIC", "{4861599B-D7E9-4C5B-83FE-2ECF7484C18E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wic", "src\wic\wic_vc8.vcproj", "{DA08A396-4003-4A9F-85DC-45A270300CD1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -58,6 +66,14 @@
 		{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+		{80F6C766-D2FB-4744-AAAD-0DC99094DCDD}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+		{80F6C766-D2FB-4744-AAAD-0DC99094DCDD}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+		{80F6C766-D2FB-4744-AAAD-0DC99094DCDD}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+		{80F6C766-D2FB-4744-AAAD-0DC99094DCDD}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+		{DA08A396-4003-4A9F-85DC-45A270300CD1}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+		{DA08A396-4003-4A9F-85DC-45A270300CD1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+		{DA08A396-4003-4A9F-85DC-45A270300CD1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+		{DA08A396-4003-4A9F-85DC-45A270300CD1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -69,11 +85,15 @@
 		{CE7A290A-13C0-424E-A02A-96CDC6B0E6BE} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
 		{4E0BD6BF-2B4D-4BF8-BEB7-3BFF57D627BC} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
 		{0CED7D48-905C-4C67-96B9-668B7728ED10} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
+		{078F108D-642B-417D-99C6-F05C8266C57E} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
+		{4861599B-D7E9-4C5B-83FE-2ECF7484C18E} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8} = {675FBBBA-6681-49E3-AAC6-FE371310DA63}
 		{927446CD-3483-4CCF-B581-F0896DD4A550} = {E0C3CF4A-5F43-4BBC-B7A9-6D4CDB225CD9}
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373} = {D133B05E-F174-4CDA-8FF4-C45C139CFACD}
 		{9A2197B4-ABC1-4047-A81B-15E9D228C108} = {CE7A290A-13C0-424E-A02A-96CDC6B0E6BE}
 		{95CD0C43-860C-467B-9995-E6A4E0F8519B} = {4E0BD6BF-2B4D-4BF8-BEB7-3BFF57D627BC}
 		{061A3FF5-B3C6-4CDC-A018-5B985C234CD6} = {0CED7D48-905C-4C67-96B9-668B7728ED10}
+		{80F6C766-D2FB-4744-AAAD-0DC99094DCDD} = {078F108D-642B-417D-99C6-F05C8266C57E}
+		{DA08A396-4003-4A9F-85DC-45A270300CD1} = {4861599B-D7E9-4C5B-83FE-2ECF7484C18E}
 	EndGlobalSection
 EndGlobal

Added: trunk/lib/extras/src/lut/lut.cpp
===================================================================
--- trunk/lib/extras/src/lut/lut.cpp	                        (rev 0)
+++ trunk/lib/extras/src/lut/lut.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -0,0 +1,93 @@
+
+// lut - LUTs image generation
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.hdrflow.com.
+
+#ifdef HAVE_CONFIG_H
+#include <openlibraries_global_config.hpp>
+#endif
+
+#ifdef WIN32
+#define _USE_MATH_DEFINES
+#include <cmath>
+#endif
+
+#include <openmedialib/ml/openmedialib_plugin.hpp>
+
+namespace pl = olib::openpluginlib;
+namespace il = olib::openimagelib::il;
+namespace ml = olib::openmedialib::ml;
+namespace pcos = olib::openpluginlib::pcos;
+
+namespace hdrflow {
+
+class ML_PLUGIN_DECLSPEC gamma_input : public ml::input_type
+{
+public:
+	explicit gamma_input( )
+		: prop_width_( pcos::key::from_string( "width" ) )
+		, prop_height_( pcos::key::from_string( "height" ) )
+		, prop_bitdepth_( pcos::key::from_string( "bitdepth" ) )
+		, prop_is_float_( pcos::key::from_string( "is_float" ) )
+	{ }
+
+	virtual ~gamma_input( ) { }
+	
+	virtual pl::wstring get_uri( ) const { return L"gamma:"; }
+	virtual pl::wstring get_mime_type( ) const { return L""; }
+	
+	
+
+private:
+	pcos::property prop_width_;
+	pcos::property prop_height_;
+	pcos::property prop_bitdepth_;
+	pcos::property prop_is_float_;	
+};
+
+class ML_PLUGIN_DECLSPEC lut_plugin : public ml::openmedialib_plugin
+{
+public:
+	virtual ml::input_type_ptr input( const pl::wstring& request )
+	{
+		return ml::input_type_ptr( );
+	}
+};
+
+}
+
+extern "C"
+{
+	ML_PLUGIN_DECLSPEC bool openplugin_init( void )
+	{
+		return true;
+	}
+
+	ML_PLUGIN_DECLSPEC bool openplugin_uninit( void )
+	{
+		return true;
+	}
+	
+	ML_PLUGIN_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+	{
+		*plug = new hdrflow::lut_plugin;
+		return true;
+	}
+	
+	ML_PLUGIN_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+	{ 
+		delete static_cast<hdrflow::lut_plugin*>( plug ); 
+	}
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+	if( fdwReason == DLL_PROCESS_ATTACH )
+		DisableThreadLibraryCalls( hInstDLL );
+	
+	return TRUE;
+}
+#endif


Property changes on: trunk/lib/extras/src/lut/lut.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/lib/extras/src/lut/lut_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/lut/lut_vc8.vcproj	                        (rev 0)
+++ trunk/lib/extras/src/lut/lut_vc8.vcproj	2007-12-30 16:49:57 UTC (rev 389)
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="lut"
+	ProjectGUID="{80F6C766-D2FB-4744-AAAD-0DC99094DCDD}"
+	RootNamespace="lut"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Multi-threaded Debug DLL|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\openlibraries\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ML_PLUGIN_EXPORTS;HAVE_FLEX_STRING"
+				MinimalRebuild="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				OpenMP="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				OutputFile="$(OutDir)\hdrflow_extras_lut-vc80-d-0_1_0.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Multi-threaded Release DLL|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\openlibraries\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ML_PLUGIN_EXPORTS;HAVE_FLEX_STRING"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				OpenMP="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				OutputFile="$(OutDir)\hdrflow_extras_lut-vc80-r-0_1_0.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</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=".\lut.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>


Property changes on: trunk/lib/extras/src/lut/lut_vc8.vcproj
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/lib/extras/src/noise/noise.cpp
===================================================================
--- trunk/lib/extras/src/noise/noise.cpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/extras/src/noise/noise.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -66,7 +66,7 @@
 		{ }
 
 	public:
-		const pl::wstring get_uri( ) const { return L"panoramic:"; }
+		virtual pl::wstring get_uri( ) const { return L"panoramic:"; }
 		
 		ml::frame_type_ptr fetch( )
 		{

Modified: trunk/lib/extras/src/panoramic/panoramic.cpp
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic.cpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/extras/src/panoramic/panoramic.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -76,7 +76,7 @@
 		}
 
 	public:
-		const pl::wstring get_uri( ) const { return L"panoramic:"; }
+		virtual pl::wstring get_uri( ) const { return L"panoramic:"; }
 		
 		ml::frame_type_ptr fetch( )
 		{

Modified: trunk/lib/extras/src/ppm/ppm_plugin.cpp
===================================================================
--- trunk/lib/extras/src/ppm/ppm_plugin.cpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/extras/src/ppm/ppm_plugin.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -11,6 +11,10 @@
 #	define PPM_DECLSPEC __attribute__( ( visibility( "default" ) ) )
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include <openlibraries_global_config.hpp>
+#endif
+
 #include <openimagelib/il/openimagelib_plugin.hpp>
 
 namespace il = olib::openimagelib::il;

Added: trunk/lib/extras/src/wic/wic.cpp
===================================================================
--- trunk/lib/extras/src/wic/wic.cpp	                        (rev 0)
+++ trunk/lib/extras/src/wic/wic.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -0,0 +1,121 @@
+
+// wic - Windows Image Component plugin
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.hdrflow.com.
+
+#ifdef WIN32
+#	define WIC_DECLSPEC __declspec( dllexport )
+#else
+#	define WIC_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include <openlibraries_global_config.hpp>
+#endif
+
+#include <wincodec.h>
+#include <wincodecsdk.h>
+
+#include <openpluginlib/pl/utf8_utils.hpp>
+
+#include <openimagelib/il/openimagelib_plugin.hpp>
+
+namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
+
+namespace hdrflow {
+
+namespace
+{
+	il::image_type_ptr GUID_to_pf( WICPixelFormatGUID guid, UINT width, UINT height )
+	{
+		return il::image_type_ptr( );
+	}
+	
+	il::image_type_ptr load_wic( const pl::string& uri )
+	{
+#	define SAFE_RELEASE( p ) { if( p ) { p->Release( ); p = NULL; } }
+
+		il::image_type_ptr im;
+
+		IWICImagingFactory* wic_factory = NULL;
+		IWICBitmapDecoder* decoder = NULL;
+		IWICBitmapFrameDecode* frame = NULL;
+		
+		HRESULT hr = CoCreateInstance( CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, IID_IWICImagingFactory, ( LPVOID* ) &wic_factory );
+		if( FAILED( hr ) )
+			goto error;
+		
+		hr = wic_factory->CreateDecoderFromFilename( pl::to_wstring( uri ).c_str( ), NULL, GENERIC_READ, WICDecodeMetadataCacheOnDemand, &decoder );
+		if( FAILED( hr ) )
+			goto error;
+
+		hr = decoder->GetFrame( 0, &frame );
+		if( FAILED( hr ) )
+			goto error;
+
+		IWICBitmapSource* source = ( IWICBitmapSource* ) frame;
+		UINT width;
+		UINT height;
+		WICPixelFormatGUID pixelformat;
+		
+		source->GetSize( &width, &height );
+		source->GetPixelFormat( &pixelformat );
+
+		im = GUID_to_pf( pixelformat, width, height );
+
+	error:
+		SAFE_RELEASE( decoder );
+		SAFE_RELEASE( wic_factory );
+		SAFE_RELEASE( frame );
+			
+		return im;
+
+#	undef SAFE_RELEASE
+	}
+}
+
+struct WIC_DECLSPEC wic_plugin : public il::openimagelib_plugin
+{
+	virtual il::image_type_ptr load( const pl::string& uri )
+	{ return load_wic( uri ); }
+	
+	virtual bool store( const pl::string&, il::image_type_ptr )
+	{ return false; }
+};
+
+}
+
+extern "C"
+{
+	WIC_DECLSPEC bool openplugin_init( void )
+	{
+		return true;
+	}
+
+	WIC_DECLSPEC bool openplugin_uninit( void )
+	{
+		return true;
+	}
+
+	WIC_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+	{
+		*plug = new hdrflow::wic_plugin;
+		return true;
+	}
+	
+	WIC_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+	{ delete static_cast<hdrflow::wic_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+	if( fdwReason == DLL_PROCESS_ATTACH )
+		DisableThreadLibraryCalls( hInstDLL );
+	
+	return TRUE;
+}
+#endif


Property changes on: trunk/lib/extras/src/wic/wic.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/lib/extras/src/wic/wic_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/wic/wic_vc8.vcproj	                        (rev 0)
+++ trunk/lib/extras/src/wic/wic_vc8.vcproj	2007-12-30 16:49:57 UTC (rev 389)
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="wic"
+	ProjectGUID="{DA08A396-4003-4A9F-85DC-45A270300CD1}"
+	RootNamespace="wic"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Multi-threaded Debug DLL|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\openlibraries\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;C:\Program Files\Microsoft SDKs\Windows\v6.0\Include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WIC_EXPORTS;HAVE_FLEX_STRING"
+				MinimalRebuild="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="false"
+				OpenMP="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				AdditionalDependencies="windowscodecs.lib"
+				OutputFile="$(OutDir)\hdrflow_extras_wic-vc80-d-0_1_0.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)&quot;;C:\Program Files\Microsoft SDKs\Windows\v6.0\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Multi-threaded Release DLL|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\openlibraries\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;C:\Program Files\Microsoft SDKs\Windows\v6.0\Include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIC_EXPORTS;HAVE_FLEX_STRING"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				OpenMP="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="true"
+				AdditionalDependencies="windowscodecs.lib"
+				OutputFile="$(OutDir)\hdrflow_extras_wic-vc80-r-0_1_0.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)&quot;;C:\Program Files\Microsoft SDKs\Windows\v6.0\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</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=".\wic.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>


Property changes on: trunk/lib/extras/src/wic/wic_vc8.vcproj
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -355,7 +355,7 @@
 		properties( ).append( prop_maxval_		 = ( std::numeric_limits<float>::max )( ) );
 	}
 
-	virtual const opl::wstring get_uri( ) const { return L"tm_linear"; }
+	virtual opl::wstring get_uri( ) const { return L"tm_linear"; }
 
 	virtual frame_type_ptr fetch( )
 	{
@@ -392,7 +392,7 @@
 		properties( ).append( prop_knee_high_ = 5.0f );
 	}
 
-	virtual const opl::wstring get_uri( ) const { return L"tm_ilm_exr"; }
+	virtual opl::wstring get_uri( ) const { return L"tm_ilm_exr"; }
 
 	virtual frame_type_ptr fetch( )
 	{
@@ -428,7 +428,7 @@
 		properties( ).append( prop_ldmax_		 = 100.0f );
 	}
 	
-	virtual const opl::wstring get_uri( ) const { return L"tm_ferwerda"; }
+	virtual opl::wstring get_uri( ) const { return L"tm_ferwerda"; }
 	
 	virtual frame_type_ptr fetch( )
 	{

Modified: trunk/lib/openlibraries/src/openmedialib/ml/filter.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/filter.hpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/ml/filter.hpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -62,9 +62,9 @@
 		// implementation of these methods should be sufficient for the majority of cases.
 
 		// Basic information
-		virtual const openpluginlib::wstring get_uri( )  const = 0;
+		virtual openpluginlib::wstring get_uri( )  const = 0;
 
-		virtual const openpluginlib::wstring get_mime_type( ) const
+		virtual openpluginlib::wstring get_mime_type( ) const
 		{ return slots_[ 0 ] ? slots_[ 0 ]->get_mime_type( ) : L""; }
 
 		// Audio/Visual

Modified: trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/input.hpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/ml/input.hpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -83,8 +83,8 @@
 		void register_callback( input_callback_ptr callback ) { callback_ = callback; }
 
 		// Basic information
-		virtual const openpluginlib::wstring get_uri( ) const = 0;
-		virtual const openpluginlib::wstring get_mime_type( ) const = 0;
+		virtual openpluginlib::wstring get_uri( ) const = 0;
+		virtual openpluginlib::wstring get_mime_type( ) const = 0;
 
 		// Audio/Visual
 		virtual int get_frames( ) const = 0;

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -14,6 +14,10 @@
 #include <windows.h>
 #endif // WIN32
 
+#ifndef INT64_C
+#define INT64_C(x)	x ## LL
+#endif // INT64_C
+   
 #include <iostream>
 #include <cstdlib>
 #include <vector>
@@ -27,7 +31,6 @@
 #include <boost/thread/condition.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 
-
 extern "C" {
 #include <avformat.h>
 }
@@ -1724,8 +1727,8 @@
 		}
 
 		// Basic information
-		virtual const opl::wstring get_uri( ) const { return uri_; }
-		virtual const opl::wstring get_mime_type( ) const { return mime_type_; }
+		virtual opl::wstring get_uri( ) const { return uri_; }
+		virtual opl::wstring get_mime_type( ) const { return mime_type_; }
 		virtual bool has_video( ) const { return prop_video_index_.value< int >( ) != -1 && video_indexes_.size( ) > 0; }
 		virtual bool has_audio( ) const { return prop_audio_index_.value< int >( ) != -1 && audio_indexes_.size( ) > 0; }
 
@@ -1956,7 +1959,7 @@
 			free(out_buffer_);
 		}
 	
-		virtual const opl::wstring get_uri( ) const { return L"resampler"; }
+		virtual opl::wstring get_uri( ) const { return L"resampler"; }
 	
 		void cache( int pos, input_type_ptr input )
 		{

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.cpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -102,8 +102,8 @@
 		virtual ~colour_input( ) { }
 
 		// Basic information
-		virtual const opl::wstring get_uri( ) const { return L"colour:"; }
-		virtual const opl::wstring get_mime_type( ) const { return L""; }
+		virtual opl::wstring get_uri( ) const { return L"colour:"; }
+		virtual opl::wstring get_mime_type( ) const { return L""; }
 
 		// Audio/Visual
 		virtual int get_frames( ) const { return prop_out_.value< int >( ); }
@@ -210,8 +210,8 @@
 		virtual ~pusher_input( ) { }
 
 		// Basic information
-		virtual const opl::wstring get_uri( ) const { return L"pusher:"; }
-		virtual const opl::wstring get_mime_type( ) const { return L""; }
+		virtual opl::wstring get_uri( ) const { return L"pusher:"; }
+		virtual opl::wstring get_mime_type( ) const { return L""; }
 
 		// Audio/Visual
 		virtual int get_frames( ) const { return int( queue_.size( ) ); }
@@ -281,7 +281,7 @@
 			properties( ).append( prop_v_ = 128 );
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"chroma"; }
+		virtual opl::wstring get_uri( ) const { return L"chroma"; }
 
 		virtual frame_type_ptr fetch( )
 		{
@@ -344,7 +344,7 @@
 			properties( ).append( prop_channels_ = 2 );
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"conform"; }
+		virtual opl::wstring get_uri( ) const { return L"conform"; }
 
 		virtual frame_type_ptr fetch( )
 		{
@@ -434,7 +434,7 @@
 			properties( ).append( prop_rh_ = 1.0 );
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"crop"; }
+		virtual opl::wstring get_uri( ) const { return L"crop"; }
 
 		virtual frame_type_ptr fetch( )
 		{
@@ -582,7 +582,7 @@
 			properties( ).append( prop_interp_ = opl::wstring( L"bilinear" ) );
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"composite"; }
+		virtual opl::wstring get_uri( ) const { return L"composite"; }
 
 		virtual const size_t slot_count( ) const { return 2; }
 
@@ -950,7 +950,7 @@
 			properties( ).append( prop_saturation_ = 1.0 );
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"correction"; }
+		virtual opl::wstring get_uri( ) const { return L"correction"; }
 
 		virtual frame_type_ptr fetch( )
 		{
@@ -1110,7 +1110,7 @@
 			prop_active_.set( 0 );
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"threader"; }
+		virtual opl::wstring get_uri( ) const { return L"threader"; }
 
 		void update_active( )
 		{
@@ -1290,7 +1290,7 @@
 			return map_source_to_dest( src_frames_ );
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"frame_rate"; }
+		virtual opl::wstring get_uri( ) const { return L"frame_rate"; }
 
 		virtual void seek( const int position, const bool relative = false )
 		{
@@ -1465,7 +1465,7 @@
 			return frames < 0 ? - frames : frames;
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"clip"; }
+		virtual opl::wstring get_uri( ) const { return L"clip"; }
 
 		virtual void seek( const int position, const bool relative = false )
 		{
@@ -1565,7 +1565,7 @@
 		{
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"deinterlace"; }
+		virtual opl::wstring get_uri( ) const { return L"deinterlace"; }
 
 		virtual frame_type_ptr fetch( )
 		{
@@ -1592,7 +1592,7 @@
 		{
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"lerp"; }
+		virtual opl::wstring get_uri( ) const { return L"lerp"; }
 
 		virtual frame_type_ptr fetch( )
 		{
@@ -1651,7 +1651,7 @@
 {
 	public:
 		bezier_filter( ) : lerp_filter( ) { }
-		virtual const opl::wstring get_uri( ) const { return L"bezier"; }
+		virtual opl::wstring get_uri( ) const { return L"bezier"; }
 
 	protected:
 		typedef struct
@@ -1771,7 +1771,7 @@
 			properties( ).append( prop_colourspace_ = opl::wstring( L"r8g8b8" ) );
 		}
 
-		virtual const opl::wstring get_uri( ) const { return L"visualise"; }
+		virtual opl::wstring get_uri( ) const { return L"visualise"; }
 
 		virtual frame_type_ptr fetch( )
 		{
@@ -1955,7 +1955,7 @@
 
 		virtual const size_t slot_count( ) const { return size_t( prop_slots_.value< int >( ) ); }
 
-		virtual const opl::wstring get_uri( ) const { return L"playlist"; }
+		virtual opl::wstring get_uri( ) const { return L"playlist"; }
 
 		virtual int get_frames( ) const 
 		{

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -2147,7 +2147,7 @@
 		plug_->mainEntry( kOfxActionUnload, 0, 0, 0 );
 	}
 	
-	virtual const opl::wstring get_uri( ) const
+	virtual opl::wstring get_uri( ) const
 	{ return pl::to_wstring( plug_->pluginIdentifier ); }
 
 	virtual frame_type_ptr fetch( )

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -256,8 +256,8 @@
 		}
 
 		// Basic information
-		virtual const pl::wstring get_uri( ) const { return resource_; }
-		virtual const pl::wstring get_mime_type( ) const { return L""; }
+		virtual pl::wstring get_uri( ) const { return resource_; }
+		virtual pl::wstring get_mime_type( ) const { return L""; }
 		virtual bool has_video( ) const { return files_.size( ) > 0; }
 		virtual bool has_audio( ) const { return false; }
 

Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_input.h
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_input.h	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_input.h	2007-12-30 16:49:57 UTC (rev 389)
@@ -123,8 +123,8 @@
 
 
 		virtual bool is_seekable( ) const { return true; }
-		virtual const opl::wstring get_uri( ) const { return uri_; }
-		virtual const opl::wstring get_mime_type( ) const { return mime_type_; }
+		virtual opl::wstring get_uri( ) const { return uri_; }
+		virtual opl::wstring get_mime_type( ) const { return mime_type_; }
 
 		virtual double fps( ) const
 		{

Modified: trunk/lib/openlibraries/src/openmedialib/py/ml.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/ml.cpp	2007-12-30 15:25:04 UTC (rev 388)
+++ trunk/lib/openlibraries/src/openmedialib/py/ml.cpp	2007-12-30 16:49:57 UTC (rev 389)
@@ -30,14 +30,14 @@
 			if ( method ) method( ); 
 		}
 
-		virtual const openpluginlib::wstring get_uri( ) const
+		virtual openpluginlib::wstring get_uri( ) const
 		{
 			py::override method = get_override( "get_uri" );
 			if ( method ) return method( ); 
 			return openpluginlib::wstring( L"" );
 		}
 
-		virtual const openpluginlib::wstring get_mime_type( ) const
+		virtual openpluginlib::wstring get_mime_type( ) const
 		{
 			py::override method = get_override( "get_mime_type" );
 			if ( method ) return method( ); 
@@ -139,7 +139,7 @@
 			if ( method ) method( ); 
 		}
 
-		virtual const openpluginlib::wstring get_uri( ) const
+		virtual openpluginlib::wstring get_uri( ) const
 		{
 			py::override method = get_override( "get_uri" );
 			if ( method ) return method( ); 


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

[Hdrflow-svn] SF.net SVN: hdrflow: [388] trunk/lib/openlibraries/src/openeffectslib/ plugins/tonemap/tonemap_plugin.cpp

From: <gl...@us...> - 2007-12-30 15:25:07

Revision: 388
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=388&view=rev
Author:   glslang
Date:     2007-12-30 07:25:04 -0800 (Sun, 30 Dec 2007)

Log Message:
-----------
+ custom dllmain

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp

Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp	2007-12-29 15:34:35 UTC (rev 387)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp	2007-12-30 15:25:04 UTC (rev 388)
@@ -499,3 +499,13 @@
 		delete static_cast<plugin::tonemap_plugin*>( plug ); 
 	}
 }
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+	if( fdwReason == DLL_PROCESS_ATTACH )
+		DisableThreadLibraryCalls( hInstDLL );
+	
+	return TRUE;
+}
+#endif


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

Flat | Threaded

<< < 1 2 3 4 5 .. 16 > >> (Page 3 of 16)

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