hdrflow-svn Mailing List for HDRFlow (Page 16)
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn — HDRFlow SVN notifications
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(30) |
May
(38) |
Jun
(22) |
Jul
(53) |
Aug
(66) |
Sep
(56) |
Oct
(29) |
Nov
(13) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(16) |
Feb
(22) |
Mar
(12) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gl...@us...> - 2007-04-21 16:19:19
|
Revision: 87
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=87&view=rev
Author: glslang
Date: 2007-04-21 09:19:18 -0700 (Sat, 21 Apr 2007)
Log Message:
-----------
+build updates
Added Paths:
-----------
lib/openlibraries/test/openeffectslib/Makefile.am
Added: lib/openlibraries/test/openeffectslib/Makefile.am
===================================================================
--- lib/openlibraries/test/openeffectslib/Makefile.am (rev 0)
+++ lib/openlibraries/test/openeffectslib/Makefile.am 2007-04-21 16:19:18 UTC (rev 87)
@@ -0,0 +1,7 @@
+
+#
+#
+#
+
+SUBDIRS = tm_bench
+
Property changes on: lib/openlibraries/test/openeffectslib/Makefile.am
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-20 16:31:59
|
Revision: 86
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=86&view=rev
Author: glslang
Date: 2007-04-20 09:31:48 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
+ enables tiff support on win
Modified Paths:
--------------
lib/openlibraries/openlibraries_vc8.sln
Added Paths:
-----------
lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
Modified: lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- lib/openlibraries/openlibraries_vc8.sln 2007-04-20 13:50:09 UTC (rev 85)
+++ lib/openlibraries/openlibraries_vc8.sln 2007-04-20 16:31:48 UTC (rev 86)
@@ -103,80 +103,80 @@
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
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{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}") = "dds", "src\openimagelib\plugins\dds\dds_vc8.vcproj", "{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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}") = "dpx", "src\openimagelib\plugins\dpx\dpx_vc8.vcproj", "{875CE227-A98F-4711-9496-61BC21DA88B8}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{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}") = "exr", "src\openimagelib\plugins\exr\exr_vc8.vcproj", "{17CBC457-3279-40F9-A614-A69046132424}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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}") = "gdi+", "src\openimagelib\plugins\gdi+\gdi+_vc8.vcproj", "{08D0F0FA-947B-4AAF-90A8-7FBFC5EBD51B}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{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}") = "hdr", "src\openimagelib\plugins\hdr\hdr_vc8.vcproj", "{972FF7FA-BDBE-400E-BDF6-59C13A6AE74D}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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}") = "png", "src\openimagelib\plugins\png\png_vc8.vcproj", "{4A6B0F4F-676E-4A96-A990-62464D923ED2}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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}") = "psd", "src\openimagelib\plugins\psd\psd_vc8.vcproj", "{FF23E252-5FD9-4642-9563-1111B12D8EE7}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{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}") = "qim", "src\openimagelib\plugins\qim\qim_vc8.vcproj", "{A2C21D3B-0948-4724-8028-C3824213912A}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.vcproj", "{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{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}") = "sgi", "src\openimagelib\plugins\sgi\sgi_vc8.vcproj", "{291BFF23-61D3-4355-8AA5-C8BF0FE30CB0}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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}") = "tga", "src\openimagelib\plugins\tga\tga_vc8.vcproj", "{227A0088-F3AE-4CA7-941C-0283D44F1678}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ML", "ML", "{F76943CD-19F1-469A-B725-38C44C2DD27F}"
@@ -185,8 +185,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml", "src\openmedialib\ml\ml_vc8.vcproj", "{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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\openmedialib\py\py_vc8.vcproj", "{1C648B54-C3DC-49B5-AFC9-B205F3151F81}"
@@ -196,80 +196,80 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avformat", "src\openmedialib\plugins\avformat\avformat_vc8.vcproj", "{0C4F7499-83C6-4143-A392-56F299345E8A}"
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}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.vcproj", "{88BCD57E-044F-4427-A407-541BA8A938E6}"
+ 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("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.vcproj", "{88BCD57E-044F-4427-A407-541BA8A938E6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "src\openmedialib\plugins\glew\glew_vc8.vcproj", "{649D053D-1768-40BB-8FA7-8CD91A765F32}"
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}") = "glew", "src\openmedialib\plugins\glew\glew_vc8.vcproj", "{649D053D-1768-40BB-8FA7-8CD91A765F32}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.vcproj", "{A60E2710-2DA9-4641-AEF6-6488A6264723}"
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("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.vcproj", "{A60E2710-2DA9-4641-AEF6-6488A6264723}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oil", "src\openmedialib\plugins\oil\oil_vc8.vcproj", "{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}"
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}") = "oil", "src\openmedialib\plugins\oil\oil_vc8.vcproj", "{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
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("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
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}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "template", "src\openmedialib\plugins\template\template_vc8.vcproj", "{18271104-A6E4-4293-A6F1-70B15AE311E5}"
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("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "template", "src\openmedialib\plugins\template\template_vc8.vcproj", "{18271104-A6E4-4293-A6F1-70B15AE311E5}"
- 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("{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("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sg", "src\openobjectlib\sg\sg_vc8.vcproj", "{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{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}") = "obj", "src\openobjectlib\plugins\obj\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "X3D", "src\openobjectlib\plugins\X3D\X3D_vc8.vcproj", "{7A98C731-F651-4427-BD02-25133DEA7171}"
ProjectSection(ProjectDependencies) = postProject
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AL", "AL", "{D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}"
@@ -278,10 +278,10 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "al", "src\openassetlib\al\al_vc8.vcproj", "{BD346E41-BEBD-43E7-9801-8EC1158355C4}"
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}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {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}"
@@ -291,94 +291,94 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "src\openassetlib\plugins\sqlite\sqlite_vc8.vcproj", "{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}"
ProjectSection(ProjectDependencies) = postProject
+ {BD346E41-BEBD-43E7-9801-8EC1158355C4} = {BD346E41-BEBD-43E7-9801-8EC1158355C4}
{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}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{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}") = "_2D_compressed", "test\openimagelib\GL\_2D_compressed\_2D_compressed_vc8.vcproj", "{F0557FAB-2BC7-4991-9AD8-560526321D80}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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}") = "_2D_compressed_cubemap", "test\openimagelib\GL\_2D_compressed_cubemap\_2D_compressed_cubemap_vc8.vcproj", "{23B3623B-4FED-49F3-8F16-4883E57588E6}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{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}") = "_2D_crop", "test\openimagelib\GL\_2D_crop\_2D_crop_vc8.vcproj", "{19B62156-49C4-4D43-A0E6-2D45952CC2CC}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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}") = "_2D_crop2", "test\openimagelib\GL\_2D_crop2\_2D_crop2_vc8.vcproj", "{AA3C0ACD-1251-484F-80D6-E9B8FF249B9E}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{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}") = "_2D_exr", "test\openimagelib\GL\_2D_exr\_2D_exr_vc8.vcproj", "{4CC2C554-1EB4-4E53-A73F-38F0A1862F49}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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}") = "_2D_sgi", "test\openimagelib\GL\_2D_sgi\_2D_sgi_vc8.vcproj", "{F30DAA25-794E-44F6-BF01-867A72BE385B}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{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}") = "_3D_lightmap", "test\openimagelib\GL\_3D_lightmap\_3D_lightmap_vc8.vcproj", "{DBF9F309-3C1F-4563-AA2B-69FA27C2CBF7}"
ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{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}") = "player", "test\openmedialib\player\player_vc8.vcproj", "{14B49ECE-F5DB-4985-A31D-C48483362F9F}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "store", "test\openmedialib\store\store_vc8.vcproj", "{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF}"
ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {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
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
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}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {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
+ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
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}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- {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}"
@@ -387,17 +387,22 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tonemap", "src\openeffectslib\plugins\tonemap\tonemap_vc8.vcproj", "{6D618CAE-230F-4ADD-936B-6C1D3D723236}"
ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tm_bench", "test\openeffectslib\tm_bench\tm_bench_vc8.vcproj", "{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
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}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff", "src\openimagelib\plugins\tiff\tiff_vc8.vcproj", "{A1308789-3ABD-438C-BA08-FB341B55D94C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -640,6 +645,10 @@
{534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {A1308789-3ABD-438C-BA08-FB341B55D94C}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -699,6 +708,7 @@
{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}
+ {A1308789-3ABD-438C-BA08-FB341B55D94C} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
{1C648B54-C3DC-49B5-AFC9-B205F3151F81} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
{0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
Added: lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj (rev 0)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2007-04-20 16:31:48 UTC (rev 86)
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="tiff"
+ ProjectGUID="{A1308789-3ABD-438C-BA08-FB341B55D94C}"
+ RootNamespace="tiff"
+ 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=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1";C:\libtiff\include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TIFF_EXPORTS;OPENIMAGELIB_BUILD;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"
+ AdditionalDependencies="libtiff.lib"
+ OutputFile="$(OutDir)\openimagelib_tiff-vc80-d-0_4_0.dll"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
+ IgnoreDefaultLibraryNames="msvcrt.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=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1";C:\libtiff\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TIFF_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ ExceptionHandling="2"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ 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="libtiff.lib"
+ OutputFile="$(OutDir)\openimagelib_tiff-vc80-r-0_4_0.dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
+ IgnoreDefaultLibraryNames="msvcrt.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=".\tiff.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\tiff_plugin.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\config.hpp"
+ >
+ </File>
+ <File
+ RelativePath=".\tiff_plugin.hpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ 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: lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-20 13:50:12
|
Revision: 85
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=85&view=rev
Author: glslang
Date: 2007-04-20 06:50:09 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
+ allow for more fine grained control of which "kind" of plugins are to be initialised.
+ make python aware of pl::init default arguments
Modified Paths:
--------------
lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
lib/openlibraries/src/openpluginlib/py/openpluginlib.cpp
Modified: lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-20 10:47:54 UTC (rev 84)
+++ lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-20 13:50:09 UTC (rev 85)
@@ -132,7 +132,7 @@
return paths;
}
- void reflib( int init, const string& lookup_path = "" )
+ void reflib( int init, const string& lookup_path = "", int mode = 0 )
{
static long refs = 0;
@@ -144,21 +144,28 @@
{
if( refs == 1 )
{
-# ifdef WIN32
- el_reg.insert( plugins_path( ) );
-# else
- el_reg.insert( OPENIMAGELIB_PLUGINS );
- el_reg.insert( OPENMEDIALIB_PLUGINS );
- el_reg.insert( OPENOBJECTLIB_PLUGINS );
- el_reg.insert( OPENASSETLIB_PLUGINS );
- el_reg.insert( OPENEFFECTSLIB_PLUGINS );
-# endif
- string_list ofx_paths = get_ofx_plugin_path( );
- std::for_each( ofx_paths.begin( ), ofx_paths.end( ), boost::bind( &detail::registry::insert, boost::ref( el_reg ), _1 ) );
+ if( ( mode & STD_PLUGINS ) != 0 )
+ {
+# ifdef WIN32
+ el_reg.insert( plugins_path( ) );
+# else
+ el_reg.insert( OPENIMAGELIB_PLUGINS );
+ el_reg.insert( OPENMEDIALIB_PLUGINS );
+ el_reg.insert( OPENOBJECTLIB_PLUGINS );
+ el_reg.insert( OPENASSETLIB_PLUGINS );
+ el_reg.insert( OPENEFFECTSLIB_PLUGINS );
+# endif
+ }
+
+ if( ( mode & OFX_PLUGINS ) != 0 )
+ {
+ string_list ofx_paths = get_ofx_plugin_path( );
+ std::for_each( ofx_paths.begin( ), ofx_paths.end( ), boost::bind( &detail::registry::insert, boost::ref( el_reg ), _1 ) );
+ }
-# ifdef HAVE_CG_RUNTIME
+# ifdef HAVE_CG_RUNTIME
shader_manager_instance( ).create_Cg_context( );
-# endif
+# endif
}
if( !lookup_path.empty( ) )
@@ -287,11 +294,11 @@
}
#endif
-bool init( const string& lookup_path )
+bool init( const string& lookup_path, int mode )
{
boost::recursive_mutex::scoped_lock lock( mutex );
- reflib( 1, lookup_path );
+ reflib( 1, lookup_path, mode );
return true;
}
Modified: lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-04-20 10:47:54 UTC (rev 84)
+++ lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-04-20 13:50:09 UTC (rev 85)
@@ -24,7 +24,9 @@
namespace olib { namespace openpluginlib {
-OPENPLUGINLIB_DECLSPEC bool init( const string& lookup_path = "" );
+enum { STD_PLUGINS = 1, OFX_PLUGINS };
+
+OPENPLUGINLIB_DECLSPEC bool init( const string& lookup_path = "", int mode = STD_PLUGINS | OFX_PLUGINS );
OPENPLUGINLIB_DECLSPEC bool uninit( );
// UI construction motivated
Modified: lib/openlibraries/src/openpluginlib/py/openpluginlib.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/py/openpluginlib.cpp 2007-04-20 10:47:54 UTC (rev 84)
+++ lib/openlibraries/src/openpluginlib/py/openpluginlib.cpp 2007-04-20 13:50:09 UTC (rev 85)
@@ -36,9 +36,11 @@
int merit_;
};
+BOOST_PYTHON_FUNCTION_OVERLOADS( init_overloads, init, 0, 2 )
+
void py_openpluginlib( )
{
- py::def( "init", &init );
+ py::def( "init", &init, init_overloads( py::args( "lookup_path", "mode" ), "openpluginlib init" ) );
py::def( "uninit", &uninit );
py::def( "registered_filters", ®istered_filters );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-20 10:47:58
|
Revision: 84
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=84&view=rev
Author: glslang
Date: 2007-04-20 03:47:54 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
+ win build updates
Modified Paths:
--------------
lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/qim/qim_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/glew/glew_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj
lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D/_2D_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap_vc8.vcproj
lib/openlibraries/test/openmedialib/player/player_vc8.vcproj
lib/openlibraries/test/openmedialib/store/store_vc8.vcproj
lib/openlibraries/test/openobjectlib/GL/multipass_draw/multipass_draw_vc8.vcproj
lib/openlibraries/test/openobjectlib/GL/noise_volume/noise_volume_vc8.vcproj
lib/openlibraries/test/openobjectlib/GL/obj_draw/obj_draw_vc8.vcproj
lib/openlibraries/test/openobjectlib/GL/texture_draw/texture_draw_vc8.vcproj
lib/openlibraries/test/openpluginlib/discovery/discovery_vc8.vcproj
lib/openlibraries/test/openpluginlib/enumerate/enumerate_vc8.vcproj
lib/openlibraries/test/openpluginlib/gpu_timer_query/gpu_timer_query_vc8.vcproj
lib/openlibraries/test/openpluginlib/initialization/initialization_vc8.vcproj
lib/openlibraries/test/openpluginlib/pcos/key/key_vc8.vcproj
lib/openlibraries/test/openpluginlib/pcos/property/property_vc8.vcproj
lib/openlibraries/test/openpluginlib/pcos/property_container/property_container_vc8.vcproj
lib/openlibraries/test/openpluginlib/pcos/subject-observer/subject-observer_vc8.vcproj
lib/openlibraries/test/openpluginlib/rdtsc/rdtsc_vc8.vcproj
lib/openlibraries/test/openpluginlib/sleep/sleep_vc8.vcproj
Modified: lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -3,13 +3,15 @@
ProjectType="Visual C++"
Version="8.00"
Name="al"
+ OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
ProjectGUID="{BD346E41-BEBD-43E7-9801-8EC1158355C4}"
RootNamespace="al"
Keyword="Win32Proj"
- OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -19,17 +21,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,16 +47,23 @@
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="0"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\openassetlib_al-vc80-d-0_4_0.dll"
@@ -57,23 +72,32 @@
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="$(TargetDir)openassetlib_al-vc80-d-0_4_0.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
@@ -81,17 +105,23 @@
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
- WholeProgramOptimization="1">
+ WholeProgramOptimization="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="C:\Boost\include\boost-1_33_1;$(SolutionDir)\src"
@@ -99,16 +129,23 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/openassetlib_al-vc80-r-0_4_0.dll"
@@ -119,23 +156,32 @@
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(TargetDir)openassetlib_al-vc80-r-0_4_0.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -144,56 +190,72 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\al.cpp">
+ RelativePath=".\al.cpp"
+ >
</File>
<File
- RelativePath=".\al_plugin.cpp">
+ RelativePath=".\al_plugin.cpp"
+ >
</File>
<File
- RelativePath=".\asset.cpp">
+ RelativePath=".\asset.cpp"
+ >
</File>
<File
- RelativePath=".\base64_codec.cpp">
+ RelativePath=".\base64_codec.cpp"
+ >
</File>
<File
- RelativePath=".\guid.cpp">
+ RelativePath=".\guid.cpp"
+ >
</File>
<File
- RelativePath=".\set.cpp">
+ RelativePath=".\set.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\al.hpp">
+ RelativePath=".\al.hpp"
+ >
</File>
<File
- RelativePath=".\al_plugin.hpp">
+ RelativePath=".\al_plugin.hpp"
+ >
</File>
<File
- RelativePath=".\asset.hpp">
+ RelativePath=".\asset.hpp"
+ >
</File>
<File
- RelativePath=".\base64_codec.hpp">
+ RelativePath=".\base64_codec.hpp"
+ >
</File>
<File
- RelativePath=".\config.hpp">
+ RelativePath=".\config.hpp"
+ >
</File>
<File
- RelativePath=".\guid.hpp">
+ RelativePath=".\guid.hpp"
+ >
</File>
<File
- RelativePath=".\set.hpp">
+ RelativePath=".\set.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}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -3,13 +3,15 @@
ProjectType="Visual C++"
Version="8.00"
Name="sqlite"
+ OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
ProjectGUID="{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}"
RootNamespace="sqlite"
Keyword="Win32Proj"
- OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -19,17 +21,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,16 +47,21 @@
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -58,23 +71,32 @@
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
@@ -82,17 +104,23 @@
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
- WholeProgramOptimization="1">
+ WholeProgramOptimization="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(SolutionDir)src;C:\Boost\include\boost-1_33_1"
@@ -100,16 +128,22 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -121,23 +155,32 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -146,38 +189,48 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\database.cpp">
+ RelativePath=".\database.cpp"
+ >
</File>
<File
- RelativePath=".\sqlite3_metadata.cpp">
+ RelativePath=".\sqlite3_metadata.cpp"
+ >
</File>
<File
- RelativePath=".\sqlite3_metadata_plugin.cpp">
+ RelativePath=".\sqlite3_metadata_plugin.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\config.hpp">
+ RelativePath=".\config.hpp"
+ >
</File>
<File
- RelativePath=".\database.hpp">
+ RelativePath=".\database.hpp"
+ >
</File>
<File
- RelativePath=".\sqlite3.h">
+ RelativePath=".\sqlite3.h"
+ >
</File>
<File
- RelativePath=".\sqlite3_metadata_plugin.hpp">
+ RelativePath=".\sqlite3_metadata_plugin.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}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -3,13 +3,15 @@
ProjectType="Visual C++"
Version="8.00"
Name="py"
+ OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
ProjectGUID="{ECEDB34E-A863-420F-BFC6-F294AC078892}"
RootNamespace="py"
Keyword="Win32Proj"
- OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -19,17 +21,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,16 +47,21 @@
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
AdditionalDependencies="boost_python-vc80-mt-gd-1_33_1.lib"
@@ -57,23 +70,32 @@
AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)src\openassetlib\al\$(ConfigurationName);$(SolutionDir)src\openimagelib\il\$(ConfigurationName);$(SolutionDir)src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)src\openobjectlib\sg\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
@@ -81,17 +103,23 @@
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
- WholeProgramOptimization="1">
+ WholeProgramOptimization="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1";C:\Python25\include"
@@ -99,16 +127,22 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -120,23 +154,32 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -145,41 +188,52 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\asset.cpp">
+ RelativePath=".\asset.cpp"
+ >
</File>
<File
- RelativePath=".\guid.cpp">
+ RelativePath=".\guid.cpp"
+ >
</File>
<File
- RelativePath=".\openassetlib.cpp">
+ RelativePath=".\openassetlib.cpp"
+ >
</File>
<File
- RelativePath=".\plugin.cpp">
+ RelativePath=".\plugin.cpp"
+ >
</File>
<File
- RelativePath=".\py.cpp">
+ RelativePath=".\py.cpp"
+ >
</File>
<File
- RelativePath=".\set.cpp">
+ RelativePath=".\set.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\py.hpp">
+ RelativePath=".\py.hpp"
+ >
</File>
<File
- RelativePath=".\python.hpp">
+ RelativePath=".\python.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}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -46,6 +46,7 @@
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
@@ -127,6 +128,8 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
Modified: lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -48,7 +48,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="true"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
@@ -136,7 +136,8 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
Modified: lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -5,10 +5,12 @@
Name="3D_lightmap"
ProjectGUID="{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}"
RootNamespace="My3D_lightmap"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -18,17 +20,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,18 +47,23 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="true"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
RuntimeTypeInfo="true"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -59,40 +72,55 @@
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="2"
@@ -101,18 +129,24 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
RuntimeTypeInfo="true"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -123,23 +157,32 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -148,29 +191,36 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\3D_lightmap.cpp">
+ RelativePath=".\3D_lightmap.cpp"
+ >
</File>
<File
- RelativePath=".\3D_lightmap_plugin.cpp">
+ RelativePath=".\3D_lightmap_plugin.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\3D_lightmap_plugin.hpp">
+ RelativePath=".\3D_lightmap_plugin.hpp"
+ >
</File>
<File
- RelativePath=".\config.hpp">
+ RelativePath=".\config.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}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -5,10 +5,12 @@
Name="bmp"
ProjectGUID="{261595DD-FB76-4D37-A3C8-0D9625C20D46}"
RootNamespace="bmp"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -18,17 +20,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,7 +47,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="true"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
@@ -47,13 +55,17 @@
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -65,40 +77,55 @@
ProgramDatabaseFile="$(OutDir)/bmp.pdb"
SubSystem="2"
ImportLibrary=""
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="3"
@@ -107,7 +134,8 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
@@ -115,13 +143,17 @@
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -134,23 +166,32 @@
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary=""
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -159,29 +200,36 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\bmp.cpp">
+ RelativePath=".\bmp.cpp"
+ >
</File>
<File
- RelativePath=".\bmp_plugin.cpp">
+ RelativePath=".\bmp_plugin.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\bmp_plugin.hpp">
+ RelativePath=".\bmp_plugin.hpp"
+ >
</File>
<File
- RelativePath=".\config.hpp">
+ RelativePath=".\config.hpp"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -5,10 +5,12 @@
Name="dds"
ProjectGUID="{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE}"
RootNamespace="dds"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -18,17 +20,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,19 +47,23 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="true"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
RuntimeTypeInfo="true"
OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -61,40 +73,55 @@
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary=""
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="2"
@@ -103,19 +130,24 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
RuntimeTypeInfo="true"
OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -127,23 +159,32 @@
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary=""
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -152,29 +193,36 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\dds.cpp">
+ RelativePath=".\dds.cpp"
+ >
</File>
<File
- RelativePath=".\dds_plugin.cpp">
+ RelativePath=".\dds_plugin.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\config.hpp">
+ RelativePath=".\config.hpp"
+ >
</File>
<File
- RelativePath=".\dds_plugin.hpp">
+ RelativePath=".\dds_plugin.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}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -5,10 +5,12 @@
Name="dpx"
ProjectGUID="{875CE227-A98F-4711-9496-61BC21DA88B8}"
RootNamespace="dpx"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -18,17 +20,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -38,16 +46,21 @@
ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -57,40 +70,55 @@
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="2"
@@ -99,16 +127,22 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -119,23 +153,32 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -144,29 +187,36 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\dpx.cpp">
+ RelativePath=".\dpx.cpp"
+ >
</File>
<File
- RelativePath=".\dpx_plugin.cpp">
+ RelativePath=".\dpx_plugin.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\config.hpp">
+ RelativePath=".\config.hpp"
+ >
</File>
<File
- RelativePath=".\dpx_plugin.hpp">
+ RelativePath=".\dpx_plugin.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}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -48,6 +48,7 @@
RuntimeLibrary="3"
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
@@ -128,7 +129,9 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ FloatingPointModel="2"
RuntimeTypeInfo="true"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
Modified: lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -5,10 +5,12 @@
Name="gdi+"
ProjectGUID="{08D0F0FA-947B-4AAF-90A8-7FBFC5EBD51B}"
RootNamespace="gdi"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -18,17 +20,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -40,16 +48,21 @@
RuntimeLibrary="3"
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -59,40 +72,55 @@
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="2"
@@ -101,17 +129,23 @@
ExceptionHandling="2"
RuntimeLibrary="2"
BufferSecurityCheck="false"
+ FloatingPointModel="2"
RuntimeTypeInfo="true"
+ OpenMP="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCManagedResourceCompilerTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
@@ -123,23 +157,32 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCALinkTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCManifestTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCXDCMakeTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCBscMakeTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCFxCopTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCAppVerifierTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -148,29 +191,36 @@
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath=".\gdi+.cpp">
+ RelativePath=".\gdi+.cpp"
+ >
</File>
<File
- RelativePath=".\gdi+_plugin.cpp">
+ RelativePath=".\gdi+_plugin.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath=".\config.hpp">
+ RelativePath=".\config.hpp"
+ >
</File>
<File
- RelativePath=".\gdi+_plugin.hpp">
+ RelativePath=".\gdi+_plugin.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}">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
</Files>
<Globals>
Modified: lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2007-04-18 22:05:49 UTC (rev 83)
+++ lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2007-04-20 10:47:54 UTC (rev 84)
@@ -5,10 +5,12 @@
Name="hdr"
ProjectGUID="{972FF7FA-BDBE-400E-BDF6-59C13A6AE74D}"
RootNamespace="hdr"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -18,17 +20,23 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCWebServiceProxyGeneratorTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -39,7 +47,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="true"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
@@ -47,13 +...
[truncated message content] |
|
From: <gl...@us...> - 2007-04-18 22:05:55
|
Revision: 83
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=83&view=rev
Author: glslang
Date: 2007-04-18 15:05:49 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
+ guard fixes
+ dpx storer
Modified Paths:
--------------
lib/openlibraries/src/openimagelib/il/utility.hpp
lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
lib/openlibraries/test/openmedialib/store/store.cpp
Modified: lib/openlibraries/src/openimagelib/il/utility.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/utility.hpp 2007-04-17 22:24:01 UTC (rev 82)
+++ lib/openlibraries/src/openimagelib/il/utility.hpp 2007-04-18 22:05:49 UTC (rev 83)
@@ -14,7 +14,7 @@
inline image_type_ptr conform( image_type_ptr image, int flags )
{
- if ( !image->matching( flags ) )
+ if ( image && !image->matching( flags ) )
image = image_type_ptr( static_cast<image_type*>( image->clone( flags ) ) );
return image;
}
Modified: lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-04-17 22:24:01 UTC (rev 82)
+++ lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-04-18 22:05:49 UTC (rev 83)
@@ -101,6 +101,13 @@
image_element element[ 8 ];
char reserved[ 52 ];
};
+
+ struct additional_image_orientation_information_header
+ {
+ float x_scanned_size;
+ float y_scanned_size;
+ char reserved[ 20 ];
+ };
struct image_orientation_information_header
{
@@ -116,6 +123,7 @@
char input_device_serial_name[ 32 ];
unsigned short border_validity[ 4 ];
unsigned int sar[ 2 ];
+ additional_image_orientation_information_header additional;
};
struct motion_picture_film_information_header
@@ -610,8 +618,6 @@
if( !Read_s( file, ( char* ) &tv_info_header, sizeof( tv_info_header ), sizeof( tv_info_header ) ) )
return il::image_type_ptr( );
- file.rdbuf( )->pubseekoff( header.user_header_length, std::ios::cur );
-
bool swab = header.magic == 0x58504453 ? true : false;
if( swab )
@@ -688,18 +694,66 @@
return im;
}
-
- // Needs to move into IL traits.
- void element_info( const std::wstring& pf, unsigned char& bitdepth )
+
+ // IL enum support for colour spaces... and add swizzling support.
+ bool element_info( int i, const std::wstring& pf, unsigned char& bitdepth, unsigned char& descriptor, unsigned char& transfer, unsigned char& colorimetric )
{
- if( pf == L"r8g8b8" || pf == L"r8g8b8a8" )
- bitdepth = 8;
- else if( pf == L"r10g10b10" || pf == L"r10g10b10a10" )
- bitdepth = 10;
- else if( pf == L"r12g12b12" || pf == L"r12g12b12a12" )
- bitdepth = 12;
- else if( pf == L"r16g16b16" || pf == L"r16g16b16a16" )
- bitdepth = 16;
+ transfer = 2, colorimetric = 2;
+
+ if( pf == L"r8g8b8" || pf == L"r8g8b8a8" || pf == L"r10g10b10" || pf == L"r10g10b10a10"
+ || pf == L"r12g12b12" || pf == L"r12g12b12a12" || pf == L"r16g16b16" || pf == L"r16g16b16a16"
+ || pf == L"r8g8b8log" || pf == L"r8g8b8a8log" || pf == L"r10g10b10log" || pf == L"r10g10b10a10log"
+ || pf == L"r12g12b12log" || pf == L"r12g12b12a12log" || pf == L"r16g16b16log" || pf == L"r16g16b16a16log" )
+ {
+ if( pf == L"r8g8b8" || pf == L"r8g8b8a8" || pf == L"r8g8b8log" || pf == L"r8g8b8a8log" )
+ bitdepth = 8;
+ else if( pf == L"r10g10b10" || pf == L"r10g10b10a10" || pf == L"r10g10b10log" || pf == L"r10g10b10a10log" )
+ bitdepth = 10;
+ else if( pf == L"r12g12b12" || pf == L"r12g12b12a12" || pf == L"r12g12b12log" || pf == L"r12g12b12a12log" )
+ bitdepth = 12;
+ else if( pf == L"r16g16b16" || pf == L"r16g16b16a16" || pf == L"r16g16b16log" || pf == L"r16g16b16a16log" )
+ bitdepth = 16;
+
+ if( pf == L"r8g8b8" || pf == L"r10g10b10" || pf == L"r12g12b12" || pf == L"r16g16b16"
+ || pf == L"r8g8b8log" || pf == L"r10g10b10log" || pf == L"r12g12b12log" || pf == L"r16g16b16log" )
+ descriptor = IMAGE_ELEMENT_DESC_RGB;
+ else
+ descriptor = IMAGE_ELEMENT_DESC_RGBA;
+
+ if( pf == L"r8g8b8log" || pf == L"r8g8b8a8log" || pf == L"r10g10b10log" || pf == L"r10g10b10a10log"
+ || pf == L"r12g12b12log" || pf == L"r12g12b12a12log" || pf == L"r16g16b16log" || pf == L"r16g16b16a16log" )
+ transfer = 1, colorimetric = 1;
+
+ return true;
+ }
+ else if( pf == L"r8g8b8p" || pf == L"r8g8b8a8p" || pf == L"r10g10b10p" || pf == L"r10g10b10a10p"
+ || pf == L"r12g12b12p" || pf == L"r12g12b12a12p" || pf == L"r16g16b16p" || pf == L"r16g16b16a16p" )
+ {
+ if( pf == L"r8g8b8p" || pf == L"r8g8b8a8p" )
+ bitdepth = 8;
+ else if( pf == L"r10g10b10p" || pf == L"r10g10b10a10p" )
+ bitdepth = 10;
+ else if( pf == L"r12g12b12p" || pf == L"r12g12b12a12p" )
+ bitdepth = 12;
+ else if( pf == L"r16g16b16p" || pf == L"r16g16b16a16p" )
+ bitdepth = 16;
+
+ if( i == 0 )
+ descriptor = IMAGE_ELEMENT_DESC_RED;
+ else if( i == 1 )
+ descriptor = IMAGE_ELEMENT_DESC_GREEN;
+ else if( i == 2 )
+ descriptor = IMAGE_ELEMENT_DESC_BLUE;
+ else if( i == 3 )
+ descriptor = IMAGE_ELEMENT_DESC_ALPHA;
+
+ return true;
+ }
+ else if( pf == L"l12a12p" || pf == L"l16a16p" )
+ {
+ }
+
+ return false;
}
bool store_dpx( const fs::path& path, const il::image_type_ptr& im )
@@ -709,18 +763,13 @@
il::image_type::size_type width = im->width( );
il::image_type::size_type height = im->height( );
-
- unsigned char bitdepth;
- element_info( im->pf( ), bitdepth );
- int linesize = bytes_per_line( bitdepth, im->linesize( ), 0 );
-
file_information_header header;
memset( &header, 0, sizeof( header ) );
header.magic = 0x53445058;
- header.offset = 2048; // fixed value if no user defined data is present. check the specification.
- strcpy( header.version, "V2.0" ); // xxx
- header.filesize = 2048 + linesize * height;
+ header.offset = 2080; // fixed value if no user defined data is present. check the specification.
+ strcpy( header.version, "V2.0" );
+ header.filesize = 2080 + im->size( );
image_information_header image_info_header;
memset( &image_info_header, 0, sizeof( image_info_header ) );
@@ -729,20 +778,30 @@
image_info_header.pixels_per_line = width;
image_info_header.lines_per_element = height;
+ int offset = 2080;
for( int i = 0; i < image_info_header.image_elements; ++i )
- {
- image_info_header.element[ i ].sign = 0;
- image_info_header.element[ i ].descriptor = 50; // xxx
- image_info_header.element[ i ].transfer = 2; // xxx
- image_info_header.element[ i ].colorimetric = 2; // xxx
- image_info_header.element[ i ].bitdepth = bitdepth;
- image_info_header.element[ i ].packing = 0;
- image_info_header.element[ i ].encoding = 0;
-
- if( !i )
- image_info_header.element[ i ].offset = 2048;
- else
- image_info_header.element[ i ].offset = image_info_header.element[ i - 1 ].offset + im->pitch( i - 1 ) * im->height( i - 1 );
+ {
+ unsigned char bitdepth, descriptor, transfer, colorimetric;
+ if( element_info( i, im->pf( ), bitdepth, descriptor, transfer, colorimetric ) )
+ {
+ image_info_header.element[ i ].sign = 0;
+ image_info_header.element[ i ].descriptor = descriptor;
+ image_info_header.element[ i ].transfer = transfer;
+ image_info_header.element[ i ].colorimetric = colorimetric;
+ image_info_header.element[ i ].bitdepth = bitdepth == 10 || bitdepth == 12 ? 16 : bitdepth;
+ image_info_header.element[ i ].packing = 0;
+ image_info_header.element[ i ].encoding = 0;
+
+ if( i > 0 )
+ {
+ if( bitdepth == 8 )
+ offset = 2080 + im->offset( i );
+ else
+ offset += im->linesize( i - 1 ) * height * sizeof( unsigned short );
+ }
+
+ image_info_header.element[ i ].offset = offset;
+ }
}
image_orientation_information_header image_orientation_info_header;
@@ -764,20 +823,33 @@
Write_s( file, ( char* ) &tv_info_header, sizeof( tv_info_header ) ) &&
Write_s( file, ( char* ) &user_defined_header, sizeof( user_defined_header ) ) ) )
return false;
-
+
for( int i = 0; i < image_info_header.image_elements; ++i )
{
- unsigned char* data = im->data( i );
-
- for( int j = 0; j < im->height( i ); ++j )
+ if( image_info_header.element[ i ].bitdepth == 8 )
{
- if( !Write_s( file, ( char* ) data, im->pitch( i ) ) )
- return false;
-
- data += im->pitch( i );
+ il::image_type::const_pointer data = im->data( i );
+ for( int j = 0; j < height; ++j )
+ {
+ if( !Write_s( file, ( char* ) data, im->pitch( i ) ) )
+ return false;
+
+ data += im->pitch( i );
+ }
}
+ else
+ {
+ unsigned short* data = ( unsigned short* ) im->data( i );
+ for( int j = 0; j < height; ++j )
+ {
+ if( !Write_s( file, ( char* ) data, im->linesize( i ) * sizeof( unsigned short ) ) )
+ return false;
+
+ data += im->pitch( i );
+ }
+ }
}
-
+
return true;
}
}
Modified: lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
===================================================================
--- lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-04-17 22:24:01 UTC (rev 82)
+++ lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-04-18 22:05:49 UTC (rev 83)
@@ -460,7 +460,6 @@
typedef pl::discovery<il_query_traits> discovery;
il::image_type_ptr image = frame->get_image( );
if ( image == 0 ) return false;
- image = il::convert( image, L"r8g8b8" );
std::ostringstream out;
out << path_;
Modified: lib/openlibraries/test/openmedialib/store/store.cpp
===================================================================
--- lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-17 22:24:01 UTC (rev 82)
+++ lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-18 22:05:49 UTC (rev 83)
@@ -57,13 +57,13 @@
void run( )
{
- //while( !done_ && input_->get_position( ) != input_->get_frames( ) )
+ while( !done_ && input_->get_position( ) != input_->get_frames( ) )
{
ml::frame_type_ptr frame = input_->fetch( );
if ( speed_ != 1 )
frame->set_audio( ml::audio_type_ptr( ) );
if ( !store_->push( frame ) )
- //break;
+ break;
boost::mutex::scoped_lock scoped_lock( mutex_ );
input_->seek( speed_, true );
}
@@ -80,7 +80,6 @@
int main( int argc, char* argv[ ] )
{
- // Load both oil and oml plugins since oml uses oil
opl::init( "" );
if ( argc > 2 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-17 22:24:05
|
Revision: 82
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=82&view=rev
Author: glslang
Date: 2007-04-17 15:24:01 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
+ build updates
+ initial dpx storer (not fully functional)
Modified Paths:
--------------
lib/openlibraries/src/openassetlib/al/al.cpp
lib/openlibraries/src/openimagelib/il/Makefile.am
lib/openlibraries/src/openimagelib/il/il.cpp
lib/openlibraries/src/openimagelib/il/il.hpp
lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl
lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp
lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
lib/openlibraries/src/openpluginlib/pl/timer.hpp
lib/openlibraries/test/openmedialib/store/store.cpp
Removed Paths:
-------------
lib/openlibraries/src/openimagelib/il/openimagelib_plugin.cpp
lib/openlibraries/test/openmedialib/store/test.cpp
Modified: lib/openlibraries/src/openassetlib/al/al.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/al/al.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openassetlib/al/al.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -12,7 +12,7 @@
#include <openassetlib/al/set.hpp>
#include <openassetlib/al/base64_codec.hpp>
-#if defined(_WIN32) && !defined(USE_LIBXML2)
+#if defined( WIN32 ) && !defined( USE_LIBXML2 )
#import <msxml6.dll>
#pragma warning( disable : 4290 )
#include <atlbase.h>
@@ -39,10 +39,7 @@
al::guid_factory::initialize(guid_gen);
- opl::init();
- oil::init();
- oml::init();
- ool::init();
+ opl::init( "" );
#if defined(_WIN32) && !defined(USE_LIBXML2)
::CoInitialize(0);
@@ -53,10 +50,7 @@
AL_DECLSPEC bool uninit()
{
- opl::uninit();
- oil::uninit();
- oml::uninit();
- ool::uninit();
+ opl::uninit( );
al::guid_factory::uninitialize();
Modified: lib/openlibraries/src/openimagelib/il/Makefile.am
===================================================================
--- lib/openlibraries/src/openimagelib/il/Makefile.am 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/il/Makefile.am 2007-04-17 22:24:01 UTC (rev 82)
@@ -16,7 +16,6 @@
il.cpp \
noise_traits.hpp \
openimagelib_plugin.hpp \
- openimagelib_plugin.cpp \
rgb_traits.hpp \
traits.hpp \
utility.cpp \
Modified: lib/openlibraries/src/openimagelib/il/il.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/il.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/il/il.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -5,7 +5,7 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
-#include <openimagelib/il/il.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace olib { namespace openimagelib {
Modified: lib/openlibraries/src/openimagelib/il/il.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/il.hpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/il/il.hpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -8,10 +8,6 @@
#ifndef IL_INC_
#define IL_INC_
-#ifdef HAVE_CONFIG_H
-#include <openlibraries_global_config.hpp>
-#endif
-
#include <string>
#include <openimagelib/il/config.hpp>
Modified: lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-04-17 22:24:01 UTC (rev 82)
@@ -208,10 +208,6 @@
>
</File>
<File
- RelativePath=".\openimagelib_plugin.cpp"
- >
- </File>
- <File
RelativePath=".\utility.cpp"
>
</File>
Deleted: lib/openlibraries/src/openimagelib/il/openimagelib_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/openimagelib_plugin.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/il/openimagelib_plugin.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -1,17 +0,0 @@
-
-// il - A image library representation.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace fs = boost::filesystem;
-namespace opl = olib::openpluginlib;
-
-namespace olib { namespace openimagelib { namespace il {
-
-} } }
Modified: lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -102,15 +102,8 @@
char reserved[ 52 ];
};
- struct additional_image_source_information_header
+ struct image_orientation_information_header
{
- float x_scanned_size;
- float y_scanned_size;
- char reserved[ 20 ];
- };
-
- struct image_source_information_header
- {
unsigned int x_offset;
unsigned int y_offset;
float x_center;
@@ -164,6 +157,11 @@
char reserved[ 76 ];
};
+ struct user_defined_data_header
+ {
+ char user_identification[ 32 ];
+ };
+
#ifdef WIN32
# pragma pack( pop )
#else
@@ -234,7 +232,7 @@
}
}
- void swap_image_source_information_header( image_source_information_header& header )
+ void swap_image_orientation_information_header( image_orientation_information_header& header )
{
swap_32_bit( &header.x_offset, 1 );
swap_32_bit( &header.y_offset, 1 );
@@ -346,6 +344,11 @@
return !file.fail( );
}
+ bool Write_s( fs::ofstream& file, char* s, std::streamsize size )
+ {
+ return !file.write( s, size ).fail( );
+ }
+
std::wstring generate_image_pf( const image_information_header& im_header )
{
std::wostringstream str;
@@ -533,7 +536,7 @@
}
}
- void convert_10_bit_method_a_b_to_oil( const std::vector<unsigned char>& v, il::image_type_ptr im, int bs, bool swab, int packing, int plane )
+ void convert_10_bit_method_a_b_to_oil( const std::vector<unsigned char>& v, il::image_type_ptr im, bool swab, int packing, int plane )
{
int width = im->linesize( plane );
int height = im->height( plane );
@@ -595,8 +598,8 @@
if( !Read_s( file, ( char* ) &image_info_header, sizeof( image_info_header ), sizeof( image_info_header ) ) )
return il::image_type_ptr( );
- image_source_information_header image_source_info_header;
- if( !Read_s( file, ( char* ) &image_source_info_header, sizeof( image_source_info_header ), sizeof( image_source_info_header ) ) )
+ image_orientation_information_header image_orientation_info_header;
+ if( !Read_s( file, ( char* ) &image_orientation_info_header, sizeof( image_orientation_info_header ), sizeof( image_orientation_info_header ) ) )
return il::image_type_ptr( );
motion_picture_film_information_header motion_info_header;
@@ -615,7 +618,7 @@
{
swap_file_information_header( header );
swap_image_information_header( image_info_header );
- swap_image_source_information_header( image_source_info_header );
+ swap_image_orientation_information_header( image_orientation_info_header );
swap_motion_picture_film_information_header( motion_info_header );
swap_television_information_header( tv_info_header );
}
@@ -678,19 +681,111 @@
}
else if( packing == 1 || packing == 2 )
{
- convert_10_bit_method_a_b_to_oil( image_data, im, bs, swab, packing, i );
+ convert_10_bit_method_a_b_to_oil( image_data, im, swab, packing, i );
}
}
}
return im;
}
+
+ // Needs to move into IL traits.
+ void element_info( const std::wstring& pf, unsigned char& bitdepth )
+ {
+ if( pf == L"r8g8b8" || pf == L"r8g8b8a8" )
+ bitdepth = 8;
+ else if( pf == L"r10g10b10" || pf == L"r10g10b10a10" )
+ bitdepth = 10;
+ else if( pf == L"r12g12b12" || pf == L"r12g12b12a12" )
+ bitdepth = 12;
+ else if( pf == L"r16g16b16" || pf == L"r16g16b16a16" )
+ bitdepth = 16;
+ }
+
+ bool store_dpx( const fs::path& path, const il::image_type_ptr& im )
+ {
+ fs::ofstream file( path, std::ios::out | std::ios::binary );
+ if( !file.is_open( ) ) return false;
+
+ il::image_type::size_type width = im->width( );
+ il::image_type::size_type height = im->height( );
+
+ unsigned char bitdepth;
+ element_info( im->pf( ), bitdepth );
+
+ int linesize = bytes_per_line( bitdepth, im->linesize( ), 0 );
+
+ file_information_header header;
+ memset( &header, 0, sizeof( header ) );
+ header.magic = 0x53445058;
+ header.offset = 2048; // fixed value if no user defined data is present. check the specification.
+ strcpy( header.version, "V2.0" ); // xxx
+ header.filesize = 2048 + linesize * height;
+
+ image_information_header image_info_header;
+ memset( &image_info_header, 0, sizeof( image_info_header ) );
+ image_info_header.orientation = 0; // xxx
+ image_info_header.image_elements = static_cast<unsigned short>( im->plane_count( ) );
+ image_info_header.pixels_per_line = width;
+ image_info_header.lines_per_element = height;
+
+ for( int i = 0; i < image_info_header.image_elements; ++i )
+ {
+ image_info_header.element[ i ].sign = 0;
+ image_info_header.element[ i ].descriptor = 50; // xxx
+ image_info_header.element[ i ].transfer = 2; // xxx
+ image_info_header.element[ i ].colorimetric = 2; // xxx
+ image_info_header.element[ i ].bitdepth = bitdepth;
+ image_info_header.element[ i ].packing = 0;
+ image_info_header.element[ i ].encoding = 0;
+
+ if( !i )
+ image_info_header.element[ i ].offset = 2048;
+ else
+ image_info_header.element[ i ].offset = image_info_header.element[ i - 1 ].offset + im->pitch( i - 1 ) * im->height( i - 1 );
+ }
+
+ image_orientation_information_header image_orientation_info_header;
+ memset( &image_orientation_info_header, 0, sizeof( image_orientation_info_header ) );
+
+ motion_picture_film_information_header motion_info_header;
+ memset( &motion_info_header, 0, sizeof( motion_info_header ) );
+
+ television_information_header tv_info_header;
+ memset( &tv_info_header, 0, sizeof( tv_info_header ) );
+
+ user_defined_data_header user_defined_header;
+ memset( &user_defined_header, 0, sizeof( user_defined_header ) );
+
+ if( !( Write_s( file, ( char* ) &header, sizeof( header ) ) &&
+ Write_s( file, ( char* ) &image_info_header, sizeof( image_info_header ) ) &&
+ Write_s( file, ( char* ) &image_orientation_info_header, sizeof( image_orientation_info_header ) ) &&
+ Write_s( file, ( char* ) &motion_info_header, sizeof( motion_info_header ) ) &&
+ Write_s( file, ( char* ) &tv_info_header, sizeof( tv_info_header ) ) &&
+ Write_s( file, ( char* ) &user_defined_header, sizeof( user_defined_header ) ) ) )
+ return false;
+
+ for( int i = 0; i < image_info_header.image_elements; ++i )
+ {
+ unsigned char* data = im->data( i );
+
+ for( int j = 0; j < im->height( i ); ++j )
+ {
+ if( !Write_s( file, ( char* ) data, im->pitch( i ) ) )
+ return false;
+
+ data += im->pitch( i );
+ }
+ }
+
+ return true;
+ }
}
il::image_type_ptr DPX_plugin::load( const fs::path& path )
{ return load_dpx( path ); }
-bool DPX_plugin::store( const fs::path& /*path*/, const il::image_type_ptr& )
-{ return false; }
+bool DPX_plugin::store( const fs::path& path, const il::image_type_ptr& im )
+{ return store_dpx( path, im ); }
} } } }
Modified: lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl 2007-04-17 22:24:01 UTC (rev 82)
@@ -3,5 +3,6 @@
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
<plugin name="OpenLibraries DPX plugin" type="input" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_4_0.dll", "openimagelib_dpx-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries DPX plugin" type="output" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_4_0.dll", "openimagelib_dpx-vc80-r-0_4_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -8,10 +8,6 @@
#ifndef GL_UTILITY_INC_
#define GL_UTILITY_INC_
-#ifdef HAVE_CONFIG_H
-#include <openlibraries_global_config.hpp>
-#endif
-
#include <GL/glew.h>
#include <utility>
Modified: lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -173,7 +173,7 @@
else
el_reg.clear( );
-# ifdef HAVE_CG_RUNTIME
+# ifdef HAVE_CG_RUNTIME
shader_manager_instance( ).destroy_Cg_context( );
# endif
}
Modified: lib/openlibraries/src/openpluginlib/pl/timer.hpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/timer.hpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/src/openpluginlib/pl/timer.hpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -8,10 +8,6 @@
#ifndef TIMER_INC_
#define TIMER_INC_
-#ifdef HAVE_CONFIG_H
-#include <openlibraries_global_config.hpp>
-#endif
-
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#pragma warning ( push )
Modified: lib/openlibraries/test/openmedialib/store/store.cpp
===================================================================
--- lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -1,7 +1,7 @@
// ml - A media library representation.
-// Copyright (C) 2005-2006 VM Inc.
+// Copyright (C) 2005 Visual Media FX Ltd.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
@@ -12,10 +12,6 @@
#include <string>
#include <iostream>
-#ifdef HAVE_CONFIG_H
-#include <openlibraries_global_config.hpp>
-#endif
-
#include <openpluginlib/pl/openpluginlib.hpp>
#include <openpluginlib/pl/utf8_utils.hpp>
@@ -26,17 +22,6 @@
namespace il = olib::openimagelib::il;
namespace opl = olib::openpluginlib;
-#ifdef WIN32
- const opl::string oml_plugin_path( "./plugins" );
- const opl::string oil_plugin_path( "./plugins" );
-#else
- const opl::string oil_plugin_path( OPENIMAGELIB_PLUGINS );
- const opl::string oml_plugin_path( OPENMEDIALIB_PLUGINS );
-#endif
-
-
-
-
class handler : public ml::store_keyboard_handler
{
public:
@@ -55,50 +40,16 @@
{
}
- void flush( int offset = 0 )
- {
- ml::frame_type_ptr frame = store_->flush( );
- if ( frame )
- input_->seek( int( frame->get_pts( ) * frame->fps( ) + offset + 0.5 ) );
- }
-
virtual void keyboard_handler( unsigned char key )
{
-
- //boost::mutex::scoped_lock scoped_lock( mutex_ );
+ boost::mutex::scoped_lock scoped_lock( mutex_ );
switch( key )
{
-
case 27:
done_ = true;
break;
- case ' ':
- speed_ = !speed_;
- flush( );
- break;
-
- case 'h':
- speed_ = 0;
- flush( -1 );
- break;
-
- case 'l':
- speed_ = 0;
- flush( 1 );
- break;
-
- case 'j':
- flush( );
- input_->seek( ( int )input_->get_frames( ) );
- break;
-
- case 'k':
- flush( );
- input_->seek( 0 );
- break;
-
default:
break;
}
@@ -106,29 +57,24 @@
void run( )
{
- int end=input_->get_frames( ) - 1;
- int pos=input_->get_position( );
-
- while( !done_ && pos < end )
+ //while( !done_ && input_->get_position( ) != input_->get_frames( ) )
{
- pos = input_->get_position( );
-
ml::frame_type_ptr frame = input_->fetch( );
+ if ( speed_ != 1 )
+ frame->set_audio( ml::audio_type_ptr( ) );
if ( !store_->push( frame ) )
- break;
-
+ //break;
+ boost::mutex::scoped_lock scoped_lock( mutex_ );
input_->seek( speed_, true );
}
-
store_->complete( );
}
-
private:
ml::input_type_ptr input_;
ml::store_type_ptr store_;
-
int speed_;
+ boost::mutex mutex_;
bool done_;
};
@@ -140,27 +86,18 @@
if ( argc > 2 )
{
ml::input_type_ptr input = ml::create_input( argv[ 1 ] );
- if ( input == 0 )
- return 1;
-
+ if ( input == 0 ) return 1;
ml::store_type_ptr store = ml::create_store( argv[ 2 ], input->fetch( ) );
- if ( store == 0 )
- return 2;
+ if ( store == 0 ) return 1;
- if ( store->init( ) )
- {
- handler handler( input, store );
- handler.run( );
- }
+ handler handler( input, store );
+ handler.run( );
}
else
{
std::cerr << "Usage: store input store" << std::endl;
- std::cerr << " ie: file.avi file.mpg" << std::endl;
+ std::cerr << " ie: file.avi glew:" << std::endl;
}
- opl::uninit( );
-
return 0;
}
-
Deleted: lib/openlibraries/test/openmedialib/store/test.cpp
===================================================================
--- lib/openlibraries/test/openmedialib/store/test.cpp 2007-04-14 22:44:40 UTC (rev 81)
+++ lib/openlibraries/test/openmedialib/store/test.cpp 2007-04-17 22:24:01 UTC (rev 82)
@@ -1,171 +0,0 @@
-
-// ml - A media library representation.
-
-// Copyright (C) 2005 Visual Media FX Ltd.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-// simple example to exercise the load and store features of ml
-
-
-
-
-
-#include <cstdio>
-#include <cstdlib>
-#include <string>
-#include <iostream>
-
-
-
-#ifdef HAVE_CONFIG_H
-#include <openlibraries_global_config.hpp>
-#endif
-
-#include <openpluginlib/pl/openpluginlib.hpp>
-#include <openpluginlib/pl/utf8_utils.hpp>
-
-#include <openimagelib/il/openimagelib_plugin.hpp>
-#include <openmedialib/ml/openmedialib_plugin.hpp>
-
-namespace ml = olib::openmedialib::ml;
-namespace il = olib::openimagelib::il;
-namespace opl = olib::openpluginlib;
-
-#ifdef WIN32
- const opl::string oml_plugin_path( "./plugins" );
- const opl::string oil_plugin_path( "./plugins" );
-#else
- const opl::string oil_plugin_path( OPENIMAGELIB_PLUGINS );
- const opl::string oml_plugin_path( OPENMEDIALIB_PLUGINS );
-#endif
-
-class handler : public ml::store_keyboard_handler
-{
- public:
- handler( ml::input_type_ptr input, ml::store_type_ptr store )
- : input_( input )
- , store_( store )
- , speed_( 1 )
- , done_( false )
- {
- ml::store_keyboard_feedback *feedback = dynamic_cast< ml::store_keyboard_feedback * >( store.get( ) );
- if ( feedback )
- feedback->register_keyboard_handler( this );
- }
-
- virtual ~handler( )
- {
- }
-
- void flush( int offset = 0 )
- {
- ml::frame_type_ptr frame = store_->flush( );
- if ( frame )
- input_->seek( int( frame->get_pts( ) * input_->fps( ) + offset + 0.5 ) );
- }
-
- virtual void keyboard_handler( unsigned char key )
- {
- boost::mutex::scoped_lock scoped_lock( mutex_ );
-
- switch( key )
- {
-
- case 27:
- done_ = true;
- break;
-
-
- case 'W':
- flush( int( 10 * input_->fps( ) ) );
- break;
-
- case 'B':
- flush( int( -10 * input_->fps( ) ) );
- break;
-
-
- case ' ':
- speed_ = !speed_;
- flush( );
- break;
-
- case 'h':
- speed_ = 0;
- flush( -1 );
- break;
-
- case 'l':
- speed_ = 0;
- flush( 1 );
- break;
-
-
- default:
- break;
- }
- }
-
- void run( )
- {
-
-
- olib::openmedialib::ml::image_type_ptr img;
-
- while( !done_ && input_->get_position( ) != input_->get_frames( ) )
- {
-
- ml::frame_type_ptr frame = input_->fetch( );//get the frame...
-
- if ( speed_ != 1 )
- frame->set_audio( ml::audio_type_ptr( ) );//sets the audio
-
- if ( !store_->push( frame ) )//pushes the frame
- break;
-
- boost::mutex::scoped_lock scoped_lock( mutex_ );
- input_->seek( speed_, true );
- }
- store_->complete( );
- }
-
- private:
- ml::input_type_ptr input_;
- ml::store_type_ptr store_;
- int speed_;
- boost::mutex mutex_;
- bool done_;
-};
-
-
-int main( int argc, char* argv[ ] )
-{
- // Load both oil and oml plugins since oml uses oil
- opl::init( oil_plugin_path );
- opl::init( oml_plugin_path );
-
-
-
- //now, for testing pourposes, the arguments are in the properties page
- if ( argc > 2 )
- {
- ml::input_type_ptr input = ml::create_input( argv[ 1 ] );
- if ( input == 0 )
- return 1;
- ml::store_type_ptr store = ml::create_store( argv[ 2 ], input->fetch( ) );
- if ( store == 0 )
- return 1;
-
- handler handler( input, store );
- handler.run( );
- }
- else
- {
- std::cerr << "Usage: store input store" << std::endl;
- std::cerr << " ie: file.avi glew:" << std::endl;
- }
-
- return 0;
-}
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-14 22:44:42
|
Revision: 81
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=81&view=rev
Author: glslang
Date: 2007-04-14 15:44:40 -0700 (Sat, 14 Apr 2007)
Log Message:
-----------
+ tm benchmark
+ disable thread awareness of dlls
Modified Paths:
--------------
lib/openlibraries/openlibraries_vc8.sln
lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
lib/openlibraries/src/openpluginlib/py/py.cpp
Added Paths:
-----------
lib/openlibraries/test/openeffectslib/
lib/openlibraries/test/openeffectslib/tm_bench/
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
Modified: lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- lib/openlibraries/openlibraries_vc8.sln 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/openlibraries_vc8.sln 2007-04-14 22:44:40 UTC (rev 81)
@@ -391,6 +391,13 @@
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tm_bench", "test\openeffectslib\tm_bench\tm_bench_vc8.vcproj", "{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
+ 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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -629,6 +636,10 @@
{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
{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -669,6 +680,7 @@
{BD86F550-C573-4A68-955B-6CEDCC8F595D} = {FE28E322-51C9-4979-9A0A-93055023A503}
{9483FC7B-E396-43E6-84ED-EB021AC54252} = {FE28E322-51C9-4979-9A0A-93055023A503}
{C85EDDFB-1A91-4ABD-8E86-6AFDF0C85CBA} = {67E6C3A2-E542-4D5D-A4A4-61DF5CD73711}
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9} = {C2D61212-6194-4B66-837B-E8A2FA29AB0E}
{14B49ECE-F5DB-4985-A31D-C48483362F9F} = {135B4433-9BD9-42C8-A552-61CA0CBA6CDC}
{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF} = {135B4433-9BD9-42C8-A552-61CA0CBA6CDC}
{B972DCEB-386E-42D2-8C5E-DD2942EC7F63} = {BEF92EC2-7872-48E2-BF6F-3DE4EBA9C037}
Modified: lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-14 22:44:40 UTC (rev 81)
@@ -277,6 +277,16 @@
}
}
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
+
bool init( const string& lookup_path )
{
boost::recursive_mutex::scoped_lock lock( mutex );
Modified: lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-14 22:44:40 UTC (rev 81)
@@ -72,6 +72,7 @@
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib""
GenerateDebugInformation="true"
SubSystem="2"
+ EntryPointSymbol=""
ImportLibrary="$(TargetDir)openpluginlib_pl-vc80-d-0_4_0.lib"
TargetMachine="1"
/>
@@ -361,11 +362,11 @@
>
</File>
<File
- RelativePath=".\property.hpp"
+ RelativePath=".\pcos\property.hpp"
>
</File>
<File
- RelativePath=".\pcos\property.hpp"
+ RelativePath=".\property.hpp"
>
</File>
<File
Modified: lib/openlibraries/src/openpluginlib/py/py.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/py/py.cpp 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/src/openpluginlib/py/py.cpp 2007-04-14 22:44:40 UTC (rev 81)
@@ -5,6 +5,12 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
+#ifdef WIN32
+#define STRICT
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
#include <openpluginlib/py/python.hpp>
#include <openpluginlib/py/py.hpp>
@@ -25,3 +31,13 @@
opl::detail::py_pcos_property( );
opl::detail::py_pcos_visitor( );
}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Added: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
===================================================================
--- lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp (rev 0)
+++ lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp 2007-04-14 22:44:40 UTC (rev 81)
@@ -0,0 +1,38 @@
+
+// el - A effects library representation.
+
+// Copyright (C) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.openlibraries.org.
+
+#include <iostream>
+
+#include <openpluginlib/pl/openpluginlib.hpp>
+#include <openpluginlib/pl/timer.hpp>
+#include <openmedialib/ml/ml.hpp>
+
+namespace ml = olib::openmedialib::ml;
+namespace pl = olib::openpluginlib;
+
+int main( int argc, char* argv[ ] )
+{
+ pl::init( "" );
+
+ ml::input_type_ptr input = ml::create_input( pl::string( argv[ 1 ] ) + pl::string( "/sequence:" ) );
+ ml::filter_type_ptr filter = ml::create_filter( L"tm_linear" );
+
+ pl::rdtsc_default_timer r;
+
+ r.reset( );
+ r.start( );
+
+ if( input && filter )
+ {
+ filter->connect( input );
+ filter->fetch( );
+ }
+
+ r.stop( );
+ pl::rdtsc_default_timer::value_type elapsed = r.elapsed( );
+ std::cout << "rdtsc: elapsed time is " << elapsed.tv_sec << " seconds and " << elapsed.tv_usec << " microseconds.\n";
+}
Property changes on: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
===================================================================
--- lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj (rev 0)
+++ lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj 2007-04-14 22:44:40 UTC (rev 81)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="tm_bench"
+ ProjectGUID="{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
+ RootNamespace="tm_bench"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Multi-threaded Debug DLL|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="$(SolutionDir)\src;"C:\Boost\include\boost-1_33_1""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4503"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="C:\Boost\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ 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="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(SolutionDir)\src;"C:\Boost\include\boost-1_33_1""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4503"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Boost\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ 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=".\tm_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=".\VTune\tm_bench.vpj"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-13 22:04:27
|
Revision: 80
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=80&view=rev
Author: glslang
Date: 2007-04-13 15:04:25 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
+ bug fixes
Modified Paths:
--------------
lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
lib/openlibraries/src/openimagelib/il/utility.cpp
lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
Modified: lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
===================================================================
--- lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp 2007-04-13 10:28:42 UTC (rev 79)
+++ lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp 2007-04-13 22:04:25 UTC (rev 80)
@@ -36,7 +36,6 @@
typedef il::image_type::size_type size_type;
#ifdef HAVE_OPENEXR
-
// From ILM OpenEXR examples.
float knee (double x, double f)
{ return float( Imath::Math<double>::log( x * f + 1 ) / f ); }
@@ -110,7 +109,7 @@
return ( unsigned char ) ( v + d[ y & 3 ][ x & 3 ] );
}
- void compute_fog_color( const image_type_ptr& im, int bs, float& fog_r, float& fog_g, float& fog_b )
+ void compute_fog_color( const image_type_ptr& im, float& fog_r, float& fog_g, float& fog_b )
{
fog_r = fog_g = fog_b = 0.0f;
@@ -119,7 +118,7 @@
{
for( int j = 0; j < im->width( ); ++j )
{
- for( int k = 0; k < bs; ++k )
+ for( int k = 0; k < 3; ++k )
{
half h;
@@ -137,49 +136,36 @@
fog_b /= im->width( ) * im->height( );
}
- image_type_ptr convert_to_half( const image_type_ptr& im, int& bs )
+ image_type_ptr convert_to_half( const image_type_ptr& im )
{
- typedef il::image<unsigned char, il::r16g16b16f> r16g16b16f_image_type;
- typedef il::image<unsigned char, il::r16g16b16a16f> r16g16b16a16f_image_type;
-
- if( !( im->pf( ) == L"r32g32b32f" || im->pf( ) == L"r32g32b32a32f" ) )
- {
- if( im->pf( ) == L"r16g16b16f" )
- bs = 3;
- else if( im->pf( ) == L"r16g16b16a16f" )
- bs = 4;
-
+ if( im->pf( ) == L"r16g16b16f" )
return im;
- }
- image_type_ptr new_im;
- if( im->pf( ) == L"r32g32b32f" )
- {
- new_im = il::allocate( L"r16g16b16f", im->width( ), im->height( ) );
- bs = 3;
- }
- else if( im->pf( ) == L"r32g32b32a32f" )
- {
- new_im = il::allocate( L"r16g16b16a16f", im->width( ), im->height( ) );
- bs = 4;
- }
+ size_type width = im->width( );
+ size_type height = im->height( );
- image_type::const_pointer src_im = im->data( );
- image_type::pointer dst_im = new_im->data( );
+ image_type_ptr new_im = il::allocate( L"r16g16b16f", im->width( ), im->height( ) );
+
+ image_type::const_pointer src = im->data( );
+ image_type::pointer dst = new_im->data( );
- int f_block_inc = sizeof( float ) * bs;
- int i_block_inc = sizeof( unsigned short ) * bs;
+ int src_pitch = ( im->pitch( ) - im->linesize( ) ) * sizeof( float );
+ int dst_pitch = ( new_im->pitch( ) - new_im->linesize( ) ) * sizeof( unsigned short );
- for( int i = 0; i < im->height( ); ++i )
+ for( int i = 0; i < height; ++i )
{
- for( int j = 0; j < im->width( ); ++j )
+ for( int j = 0; j < width; ++j )
{
- for( int k = 0; k < bs; ++k )
- ( ( unsigned short* ) dst_im )[ k ] = Imf::floatToHalf( ( ( const float* ) src_im )[ k ] ).bits( );
-
- src_im += f_block_inc;
- dst_im += i_block_inc;
+ ( ( unsigned short* ) dst )[ 0 ] = Imf::floatToHalf( ( ( const float* ) src )[ 0 ] ).bits( );
+ ( ( unsigned short* ) dst )[ 1 ] = Imf::floatToHalf( ( ( const float* ) src )[ 1 ] ).bits( );
+ ( ( unsigned short* ) dst )[ 2 ] = Imf::floatToHalf( ( ( const float* ) src )[ 2 ] ).bits( );
+
+ src += 3 * sizeof( float );
+ dst += 3 * sizeof( unsigned short );
}
+
+ src += src_pitch;
+ dst += dst_pitch;
}
return new_im;
@@ -187,53 +173,55 @@
image_type_ptr tm_ilm_exr( const image_type_ptr& im, float exposure, float defog, float kneeLow, float kneeHigh )
{
- if( !( im->pf( ) == L"r16g16b16f" ||
- im->pf( ) == L"r16g16b16a16f" ||
- im->pf( ) == L"r32g32b32f" ||
- im->pf( ) == L"r32g32b32a32f" ) )
- return image_type_ptr( );
+ image_type_ptr dst_img = im;
+
+ if( im->pf( ) == L"r16g16b16f" || im->pf( ) == L"r32g32b32f" )
+ {
+ image_type_ptr half_im = convert_to_half( im );
- int bs;
- image_type_ptr half_im = convert_to_half( im, bs );
+ float fog_r, fog_g, fog_b;
+ compute_fog_color( half_im, fog_r, fog_g, fog_b );
- float fog_r, fog_g, fog_b;
- compute_fog_color( half_im, bs, fog_r, fog_g, fog_b );
+ halfFunction<float> r_gamma( gamma( exposure, defog * fog_r, kneeLow, kneeHigh ), -HALF_MAX, HALF_MAX );
+ halfFunction<float> g_gamma( gamma( exposure, defog * fog_g, kneeLow, kneeHigh ), -HALF_MAX, HALF_MAX );
+ halfFunction<float> b_gamma( gamma( exposure, defog * fog_b, kneeLow, kneeHigh ), -HALF_MAX, HALF_MAX );
- halfFunction<float> r_gamma( gamma( exposure, defog * fog_r, kneeLow, kneeHigh ), -HALF_MAX, HALF_MAX );
- halfFunction<float> g_gamma( gamma( exposure, defog * fog_g, kneeLow, kneeHigh ), -HALF_MAX, HALF_MAX );
- halfFunction<float> b_gamma( gamma( exposure, defog * fog_b, kneeLow, kneeHigh ), -HALF_MAX, HALF_MAX );
+ size_type width = im->width( );
+ size_type height = im->height( );
- image_type_ptr new_im;
- if( bs == 3 )
- new_im = il::allocate( L"r8g8b8", im->width( ), im->height( ) );
- else if( bs == 4 )
- new_im = il::allocate( L"r8g8b8a8", im->width( ), im->height( ) );
+ dst_img = il::allocate( L"b8g8r8a8", width, height );
- image_type::const_pointer src_im = half_im->data( );
- image_type::pointer dst_im = new_im->data( );
+ image_type::const_pointer src = half_im->data( );
+ image_type::pointer dst = dst_img->data( );
- for( int i = 0; i < new_im->height( ); ++i )
- {
- for( int j = 0; j < new_im->width( ); ++j )
+ size_type src_pitch = ( half_im->pitch( ) - half_im->linesize( ) ) * sizeof( unsigned short );
+ size_type dst_pitch = dst_img->pitch( ) - dst_img->linesize( );
+
+ for( int i = 0; i < height; ++i )
{
- for( int k = 0; k < bs; ++k )
+ for( int j = 0; j < width; ++j )
{
- half h;
-
- h.setBits( ( ( unsigned short* ) src_im )[ 0 ] );
-
- *dst_im = dither( r_gamma( h ), j, i );
-
- src_im += sizeof( unsigned short );
- dst_im += sizeof( unsigned char );
+ half h0, h1, h2;
+
+ h0.setBits( ( ( unsigned short* ) src )[ 0 ] ); src += sizeof( unsigned short );
+ h1.setBits( ( ( unsigned short* ) src )[ 0 ] ); src += sizeof( unsigned short );
+ h2.setBits( ( ( unsigned short* ) src )[ 0 ] ); src += sizeof( unsigned short );
+
+ *dst++ = dither( r_gamma( h2 ), j, i );
+ *dst++ = dither( g_gamma( h1 ), j, i );
+ *dst++ = dither( b_gamma( h0 ), j, i );
+ *dst++ = 255;
}
+
+ src += src_pitch;
+ dst += dst_pitch;
}
}
- return new_im;
+ return dst_img;
}
-
#endif
+
// Ferwerda et al TVI functions.
float tp( float L )
{
Modified: lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
===================================================================
--- lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl 2007-04-13 10:28:42 UTC (rev 79)
+++ lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl 2007-04-13 22:04:25 UTC (rev 80)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<openlibraries version="1.0">
<!-- plugins go here -->
- <openeffectslib name="oel" version="0.1.0">
- <plugin name="OpenLibraries tonemap plugin" type="filter" extension='"tm_linear", "tm_ilm_exr". "tm_ferwerda"' merit="0" filename='"libopeneffectslib_tonemap.so", "libopeneffectslib_tonemap.dylib", "openeffectslib_tonemap-vc80-d-0_4_0.dll", "openeffectslib_tonemap-vc80-r-0_4_0.dll"'/>
- </openeffectslib>
+ <openmedialib name="oel" version="0.1.0">
+ <plugin name="OpenLibraries tonemap plugin" type="filter" extension='"tm_linear", "tm_ilm_exr", "tm_ferwerda"' merit="0" filename='"libopeneffectslib_tonemap.so", "libopeneffectslib_tonemap.dylib", "openeffectslib_tonemap-vc80-d-0_4_0.dll", "openeffectslib_tonemap-vc80-r-0_4_0.dll"'/>
+ </openmedialib>
</openlibraries>
Modified: lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/il/utility.cpp 2007-04-13 10:28:42 UTC (rev 79)
+++ lib/openlibraries/src/openimagelib/il/utility.cpp 2007-04-13 22:04:25 UTC (rev 80)
@@ -1853,7 +1853,7 @@
return dst_img;
}
-// Free function to truncate 32-bit float to b8g8r8a8. intention is to perform all tonemaps at the float level and convert to 8-bit only if needed.
+// Truncates 32-bit float to b8g8r8a8. The intention is to perform all tonemaps at the float level and convert to 8-bit only when needed.
// Assumes normalise( im, 255.0f ) has already been called.
static image_type_ptr r32g32b32f_to_b8g8r8a8( image_type_ptr src_img, const std::wstring &format )
{
@@ -1877,9 +1877,9 @@
{
while( width-- )
{
+ *( dst + 2 ) = static_cast<unsigned char>( *src++ );
+ *( dst + 1 ) = static_cast<unsigned char>( *src++ );
*( dst + 0 ) = static_cast<unsigned char>( *src++ );
- *( dst + 1 ) = static_cast<unsigned char>( *src++ );
- *( dst + 2 ) = static_cast<unsigned char>( *src++ );
*( dst + 3 ) = 255;
dst += 4;
Modified: lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-04-13 10:28:42 UTC (rev 79)
+++ lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-04-13 22:04:25 UTC (rev 80)
@@ -22,11 +22,6 @@
void destroy( il::image_type* im )
{ delete im; }
- std::wstring exr_image_type_to_image_type( )
- {
- return L"r32g32b32f";
- }
-
il::image_type_ptr load_exr( const fs::path& path )
{
Imf::RgbaInputFile file( path.native_file_string( ).c_str( ) );
@@ -41,21 +36,17 @@
file.setFrameBuffer( &exr_texels[ 0 ][ 0 ], 1, width );
file.readPixels( dw.min.y, dw.max.y );
- il::image_type_ptr im = il::allocate( exr_image_type_to_image_type( ), width, height );
+ il::image_type_ptr im = il::allocate( L"r32g32b32f", width, height );
il::image_type::pointer texels = im->data( );
for( int j = 0; j < height; ++j )
{
for( int i = 0; i < width; ++i )
{
- half h0 = exr_texels[ j ][ i ].r;
- half h1 = exr_texels[ j ][ i ].g;
- half h2 = exr_texels[ j ][ i ].b;
-
- ( ( float* ) texels )[ 0 ] = ImfHalfToFloat( ( ImfHalf ) h0 );
- ( ( float* ) texels )[ 1 ] = ImfHalfToFloat( ( ImfHalf ) h1 );
- ( ( float* ) texels )[ 2 ] = ImfHalfToFloat( ( ImfHalf ) h2 );
-
+ ( ( float* ) texels )[ 0 ] = exr_texels[ j ][ i ].r;
+ ( ( float* ) texels )[ 1 ] = exr_texels[ j ][ i ].g;
+ ( ( float* ) texels )[ 2 ] = exr_texels[ j ][ i ].b;
+
texels += 3 * sizeof( float );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-13 10:28:44
|
Revision: 79
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=79&view=rev
Author: glslang
Date: 2007-04-13 03:28:42 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
+ *nix build fix
+ disable ILM tonemap if OpenEXR is not present
Modified Paths:
--------------
lib/openlibraries/openlibraries.pc.in
lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
Modified: lib/openlibraries/openlibraries.pc.in
===================================================================
--- lib/openlibraries/openlibraries.pc.in 2007-04-12 22:17:21 UTC (rev 78)
+++ lib/openlibraries/openlibraries.pc.in 2007-04-13 10:28:42 UTC (rev 79)
@@ -10,6 +10,7 @@
OPENIMAGELIB_PLUGINS=@OPENIMAGELIB_PLUGINPATH@
OPENMEDIALIB_PLUGINS=@OPENMEDIALIB_PLUGINPATH@
+OPENEFFECTSLIB_PLUGINS=@OPENEFFECTSLIB_PLUGINPATH@
OPENOBJECTLIB_PLUGINS=@OPENOBJECTLIB_PLUGINPATH@
OPENASSETLIB_PLUGINS=@OPENASSETLIB_PLUGINPATH@
@@ -18,7 +19,7 @@
Version: @OL_MAJOR@.@OL_MINOR@.@OL_SUB@
Libs: @OPENPLUGINLIB_RPATH@ @OPENIMAGELIB_RPATH@ @OPENMEDIALIB_RPATH@ @OPENOBJECTLIB_RPATH@ \
- @OPENASSETLIB_RPATH@ @OPENEFFECTSLIB_RPATH@ @BOOST_LIB_RPATH@ @GLEW_LIB_RPATH@ \
+ @OPENASSETLIB_RPATH@ @BOOST_LIB_RPATH@ @GLEW_LIB_RPATH@ \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openimagelib/@OL_LIBNAME@ -lopenimagelib_il \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openmedialib/@OL_LIBNAME@ -lopenmedialib_ml \
@@ -29,3 +30,4 @@
Cflags: -I${includedir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@ -I${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/include \
@BOOST_INCLUDE_PATH@ @GLEW_INCLUDE_PATH@
+
Modified: lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
===================================================================
--- lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp 2007-04-12 22:17:21 UTC (rev 78)
+++ lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp 2007-04-13 10:28:42 UTC (rev 79)
@@ -391,6 +391,7 @@
pcos::property prop_maxval_;
};
+#ifdef HAVE_OPENEXR
class ML_PLUGIN_DECLSPEC tm_ilm_exr_filter : public filter_type
{
public:
@@ -427,6 +428,7 @@
pcos::property prop_knee_low_;
pcos::property prop_knee_high_;
};
+#endif
class ML_PLUGIN_DECLSPEC tm_ferwerda_filter : public filter_type
{
@@ -476,8 +478,10 @@
{
if( request == L"tm_linear" )
return filter_type_ptr( new tm_linear_filter( ) );
+# ifdef HAVE_OPENEXR
else if( request == L"tm_ilm_exr" )
return filter_type_ptr( new tm_ilm_exr_filter( ) );
+# endif
else if( request == L"tm_ferwerda" )
return filter_type_ptr( new tm_ferwerda_filter( ) );
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-04-12 22:17:22
|
Revision: 78
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=78&view=rev
Author: glslang
Date: 2007-04-12 15:17:21 -0700 (Thu, 12 Apr 2007)
Log Message:
-----------
+ fix typo
Modified Paths:
--------------
lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
Modified: lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
===================================================================
--- lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl 2007-04-12 21:44:00 UTC (rev 77)
+++ lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl 2007-04-12 22:17:21 UTC (rev 78)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openeffectslib name="oel" version="0.1.0">
- <plugin name="OpenLibraries tonemap plugin" type="filter" extension='"tm_linear", "tm_ilm_exr". "tm_ferwerda"' merit="0" filename='"libopeneffectslib_tonemap.so", "liboeffectslib_tonemap.dylib", "openeffectslib_tonemap-vc80-d-0_4_0.dll", "openeffectslib_tonemap-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries tonemap plugin" type="filter" extension='"tm_linear", "tm_ilm_exr". "tm_ferwerda"' merit="0" filename='"libopeneffectslib_tonemap.so", "libopeneffectslib_tonemap.dylib", "openeffectslib_tonemap-vc80-d-0_4_0.dll", "openeffectslib_tonemap-vc80-r-0_4_0.dll"'/>
</openeffectslib>
</openlibraries>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
