[Hdrflow-svn] SF.net SVN: hdrflow: [101] lib/openlibraries
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [101] lib/openlibraries
|
From: <gl...@us...> - 2007-04-22 22:25:20
|
Revision: 101
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=101&view=rev
Author: glslang
Date: 2007-04-22 15:25:15 -0700 (Sun, 22 Apr 2007)
Log Message:
-----------
+ initial jpg hdr implementation
Modified Paths:
--------------
lib/openlibraries/openlibraries_vc8.sln
lib/openlibraries/src/openimagelib/plugins/jpg/config.hpp
lib/openlibraries/src/openimagelib/plugins/jpg/jpg.cpp
lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.hpp
lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
Removed Paths:
-------------
lib/openlibraries/src/openimagelib/plugins/jpg/jpg_iw.vcproj
Modified: lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- lib/openlibraries/openlibraries_vc8.sln 2007-04-22 20:57:05 UTC (rev 100)
+++ lib/openlibraries/openlibraries_vc8.sln 2007-04-22 22:25:15 UTC (rev 101)
@@ -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,15 +387,15 @@
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}"
@@ -405,9 +405,15 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rescaler_bench", "test\openeffectslib\rescaler_bench\rescaler_bench_vc8.vcproj", "{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}"
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}") = "jpg", "src\openimagelib\plugins\jpg\jpg_vc8.vcproj", "{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}"
+ 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
@@ -660,6 +666,10 @@
{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -721,6 +731,7 @@
{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}
+ {DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1} = {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}
Modified: lib/openlibraries/src/openimagelib/plugins/jpg/config.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/jpg/config.hpp 2007-04-22 20:57:05 UTC (rev 100)
+++ lib/openlibraries/src/openimagelib/plugins/jpg/config.hpp 2007-04-22 22:25:15 UTC (rev 101)
@@ -1,7 +1,7 @@
// JPG - An JPG plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005-2007 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/jpg/jpg.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/jpg/jpg.cpp 2007-04-22 20:57:05 UTC (rev 100)
+++ lib/openlibraries/src/openimagelib/plugins/jpg/jpg.cpp 2007-04-22 22:25:15 UTC (rev 101)
@@ -1,100 +1,24 @@
// JPG - An JPG plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005-2007 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
-#ifdef WIN32
-#include <windows.h>
-#include <gdiplus.h>
-#endif // WIN32
-
-#include <boost/thread/recursive_mutex.hpp>
-
#include <openimagelib/plugins/jpg/jpg_plugin.hpp>
namespace opl = olib::openpluginlib;
namespace JPG = olib::openimagelib::plugins::JPG;
-namespace
-{
- void reflib( int init )
- {
- static long refs = 0;
-#ifdef WIN32
- static ULONG_PTR gdiplusToken;
-#endif // WIN32
-
- assert( refs >= 0 && L"JPG_plugin::refinit: refs is negative." );
-
- if( init > 0 && ++refs )
- {
-# ifdef WIN32
- Gdiplus::GdiplusStartupInput gdiplusStartupInput;
-
- Gdiplus::GdiplusStartup( &gdiplusToken, &gdiplusStartupInput, NULL );
-# endif
- }
- else if( init < 0 && --refs == 0 )
- {
-# ifdef WIN32
- Gdiplus::GdiplusShutdown( gdiplusToken );
-# endif
- }
- }
-
-#ifdef WIN32
- ULONG_PTR gdiplusToken;
-
- bool has_jpg_decoder_installed( void )
- {
- UINT num, size;
- Gdiplus::GetImageDecodersSize( &num, &size );
-
- Gdiplus::ImageCodecInfo* decoders = ( Gdiplus::ImageCodecInfo* ) malloc( size );
- Gdiplus::GetImageDecoders( num, size, decoders );
-
- bool found = false;
- for( UINT i = 0; i < num; ++i )
- {
- if( !wcscmp( decoders[ i ].MimeType, L"image/jpeg" ) )
- {
- found = true;
-
- break;
- }
- }
-
- free( decoders );
-
- return found;
- }
-#endif
-}
-
extern "C"
{
JPG_DECLSPEC bool openplugin_init( void )
{
- boost::recursive_mutex mutex;
-
- reflib( 1 );
-
-# ifdef WIN32
- if( !has_jpg_decoder_installed( ) )
- return false;
-# endif
-
return true;
}
JPG_DECLSPEC bool openplugin_uninit( void )
{
- boost::recursive_mutex mutex;
-
- reflib( -1 );
-
return true;
}
Deleted: lib/openlibraries/src/openimagelib/plugins/jpg/jpg_iw.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/jpg/jpg_iw.vcproj 2007-04-22 20:57:05 UTC (rev 100)
+++ lib/openlibraries/src/openimagelib/plugins/jpg/jpg_iw.vcproj 2007-04-22 22:25:15 UTC (rev 101)
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="jpg"
- OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
- ProjectGUID="{B8D82338-7F6B-4EFF-ABB4-F24FD066252A}"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- OptimizeForProcessor="2"
- AdditionalIncludeDirectories=""C:\Boost\include\boost-1_33";"$(SolutionDir)\src""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JPG_EXPORTS;OPENIMAGELIB_BUILD"
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- BufferSecurityCheck="TRUE"
- EnableEnhancedInstructionSet="2"
- TreatWChar_tAsBuiltInType="TRUE"
- ForceConformanceInForLoopScope="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- IgnoreImportLibrary="TRUE"
- AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)/openimagelib_jpg-iw90-d-0_1.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/jpg.pdb"
- SubSystem="2"
- ImportLibrary=""
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- OptimizeForProcessor="2"
- AdditionalIncludeDirectories=""C:\Boost\include\boost-1_33";"$(SolutionDir)\src""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JPG_EXPORTS;OPENIMAGELIB_BUILD"
- RuntimeLibrary="2"
- BufferSecurityCheck="FALSE"
- EnableEnhancedInstructionSet="2"
- TreatWChar_tAsBuiltInType="TRUE"
- ForceConformanceInForLoopScope="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- IgnoreImportLibrary="TRUE"
- AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)/openimagelib_jpg-iw90-0_1.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ImportLibrary=""
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File
- RelativePath=".\jpg.cpp">
- </File>
- <File
- RelativePath=".\jpg_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=".\jpg_plugin.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}">
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-04-22 20:57:05 UTC (rev 100)
+++ lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-04-22 22:25:15 UTC (rev 101)
@@ -1,7 +1,7 @@
// JPG - A JPG plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005-2007 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
@@ -17,52 +17,27 @@
namespace olib { namespace openimagelib { namespace plugins { namespace JPG {
-typedef il::image<unsigned char, il::surface_format> image_type;
-
namespace
{
- void destroy( image_type* im )
+ void destroy( il::image_type* im )
{ delete im; }
- std::wstring to_wstring( const std::string& str )
+ il::image_type_ptr jpeg_pixelformat_to_image_type( int components, int width, int height )
{
- std::vector<wchar_t> ws;
- ws.resize( str.size( ) + 1 );
-
-#if _MSC_VER >= 1400
- size_t size;
- mbstowcs_s( &size, &ws[ 0 ], ws.size( ), str.c_str( ), str.size( ) );
-#else
- mbstowcs( &ws[ 0 ], str.c_str( ), str.size( ) );
-#endif // _MSC_VER >= 0x1400
-
- return std::wstring( ws.begin( ), ws.end( ) );
- }
-
- boost::shared_ptr<image_type> jpeg_pixelformat_to_image_type( int components, int width, int height )
- {
- using namespace olib::openimagelib::il;
-
- typedef boost::shared_ptr<image_type> image_type_ptr;
- typedef image<unsigned char, r8g8b8> r8g8b8_image_type;
-
switch( components )
{
case 3:
- return image_type_ptr( new image_type( r8g8b8_image_type( width, height, 1 ) ), destroy );
+ return il::allocate( L"r8g8b8", width, height );
default:
- return image_type_ptr( static_cast<image_type*>( 0 ) );
+ return il::image_type_ptr( );
}
}
- // TODO: use IFL on IRIX machines.
- JPG_plugin::image_type_ptr load_jpg_unix( const boost::filesystem::path& path )
+ il::image_type_ptr load_jpg( const boost::filesystem::path& path )
{
- typedef boost::shared_ptr<image_type> image_type_ptr;
-
FILE* infile = fopen( path.native_directory_string( ).c_str( ), "rb" );
- if( infile == NULL ) return JPG_plugin::image_type_ptr( image_type_ptr( ) );
+ if( infile == NULL ) return il::image_type_ptr( );
// TODO: some proper exception handling is needed. can't really be bothered
// with that setjmp thingie...
@@ -76,8 +51,8 @@
jpeg_read_header( &info, TRUE );
jpeg_start_decompress( &info );
- image_type_ptr image = jpeg_pixelformat_to_image_type( info.output_components, info.output_width, info.output_height );
- if( !image ) return JPG_plugin::image_type_ptr( image_type_ptr( ) );
+ il::image_type_ptr image = jpeg_pixelformat_to_image_type( info.output_components, info.output_width, info.output_height );
+ if( !image ) return il::image_type_ptr( );
int stride = info.output_width * info.output_components;
JSAMPARRAY buffer = ( *info.mem->alloc_sarray )( ( j_common_ptr ) &info, JPOOL_IMAGE, stride, 1 );
@@ -97,10 +72,10 @@
fclose( infile );
- return JPG_plugin::image_type_ptr( image );
+ return image;
}
- bool store_jpg( const boost::filesystem::path& path, const boost::shared_ptr<image_type>& img )
+ bool store_jpg( const boost::filesystem::path& path, il::image_type_ptr img )
{
int i;
struct jpeg_compress_struct cinfo;
@@ -108,7 +83,7 @@
unsigned char *line;
FILE *out = fopen( path.native_directory_string( ).c_str( ), "wb" );
- boost::shared_ptr<image_type> image = il::convert( img, L"r8g8b8" );
+ il::image_type_ptr image = il::convert( img, L"r8g8b8" );
image = il::conform( image, 0 );
if ( out != NULL )
@@ -137,11 +112,10 @@
}
}
-JPG_plugin::image_type_ptr JPG_plugin::load( const boost::filesystem::path& path )
-{ return JPG_plugin::image_type_ptr( load_jpg_unix( path ) ); }
+il::image_type_ptr JPG_plugin::load( const boost::filesystem::path& path )
+{ return load_jpg( path ); }
-bool JPG_plugin::store( const boost::filesystem::path& path, const JPG_plugin::image_type_ptr& image )
+bool JPG_plugin::store( const boost::filesystem::path& path, const il::image_type_ptr& image )
{ return store_jpg( path, image ); }
} } } }
-
Modified: lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.hpp 2007-04-22 20:57:05 UTC (rev 100)
+++ lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.hpp 2007-04-22 22:25:15 UTC (rev 101)
@@ -1,7 +1,7 @@
// JPG - A JPG plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005-2007 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
@@ -15,15 +15,11 @@
namespace olib { namespace openimagelib { namespace plugins { namespace JPG {
-class JPG_DECLSPEC JPG_plugin : public olib::openimagelib::il::openimagelib_plugin
+class JPG_DECLSPEC JPG_plugin : public il::openimagelib_plugin
{
public:
- typedef il::image<unsigned char, il::surface_format> image_type;
- typedef boost::shared_ptr<image_type> image_type_ptr;
-
-public:
- virtual image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const image_type_ptr& image );
+ virtual il::image_type_ptr load( const boost::filesystem::path& path );
+ virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
};
} } } }
Modified: lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-04-22 20:57:05 UTC (rev 100)
+++ lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-04-22 22:25:15 UTC (rev 101)
@@ -40,14 +40,14 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1";"C:\Program Files\HDR\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JPG_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ RuntimeLibrary="1"
BufferSecurityCheck="true"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
@@ -69,10 +69,11 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)/openimagelib_jpg-vc80-d-0_2.dll"
+ AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
+ OutputFile="$(OutDir)/openimagelib_jpg-vc80-d-0_4_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\HDR\lib""
+ IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/jpg.pdb"
SubSystem="2"
@@ -129,12 +130,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_33_1";"C:\Program Files\HDR\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JPG_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="2"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
TreatWChar_tAsBuiltInType="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
@@ -156,10 +158,10 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)/openimagelib_jpg-vc80-r-0_2.dll"
+ AdditionalDependencies="libjpeg.lib"
+ OutputFile="$(OutDir)/openimagelib_jpg-vc80-r-0_4_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\HDR\lib""
GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
