diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x64).sln freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x64).sln --- freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x64).sln Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x64).sln Fri Jul 29 16:55:48 2011 @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeImage (x64)", "FreeImage (x64).vcxproj", "{2A0C7E5C-7CCF-4CF3-A635-BFFF01109FA5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2A0C7E5C-7CCF-4CF3-A635-BFFF01109FA5}.Debug|x64.ActiveCfg = Debug|x64 + {2A0C7E5C-7CCF-4CF3-A635-BFFF01109FA5}.Debug|x64.Build.0 = Debug|x64 + {2A0C7E5C-7CCF-4CF3-A635-BFFF01109FA5}.Release|x64.ActiveCfg = Release|x64 + {2A0C7E5C-7CCF-4CF3-A635-BFFF01109FA5}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Binary files freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x64).suo and freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x64).suo differ diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x64).vcxproj freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x64).vcxproj --- freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x64).vcxproj Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x64).vcxproj Fri Jul 29 22:29:18 2011 @@ -0,0 +1,202 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {2A0C7E5C-7CCF-4CF3-A635-BFFF01109FA5} + Win32Proj + FreeImage + FreeImage (x64) + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + true + bin\x64\$(Configuration)\ + obj\x64\$(Configuration)\ + FreeImage + + + false + bin\x64\$(Configuration)\ + obj\x64\$(Configuration)\ + FreeImage + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PNG_IMPEXP=/**/;OPJ_STATIC;NO_LCMS;LIBRAW_NODLL;_CRT_SECURE_NO_WARNINGS;FREEIMAGE_EXPORTS;%(PreprocessorDefinitions) + true + StreamingSIMDExtensions2 + .\Redirectors\FreeImage\;..\..\Source\;..\..\..\zlib-1.2.5\;..\..\..\libjpeg-8c\;..\..\..\openexr-1.7.0\IlmImf\;..\..\..\ilmbase-1.0.2\Imath\;..\..\..\ilmbase-1.0.2\Iex\;..\..\..\ilmbase-1.0.2\Half\ + + + Windows + true + ..\..\..\libjpeg-8c\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\libpng-1.5.4\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\libtiff-3.9.5\build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\libmng-1.0.10\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\libraw-0.13.7\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\ilmbase-1.0.2\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\openexr-1.7.0\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\openjpeg-1.4-r697\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\zlib-1.2.5\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\ + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;libjpeg.$(ConfigurationName).lib;libpng.$(ConfigurationName).lib;libtiff.$(ConfigurationName).lib;libmng.$(ConfigurationName).lib;libraw.$(ConfigurationName).lib;ilmbase.$(ConfigurationName).lib;openexr.$(ConfigurationName).lib;openjpeg.$(ConfigurationName).lib;zlib.$(ConfigurationName).lib;%(AdditionalDependencies) + + + + + Level3 + + + Full + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;PNG_IMPEXP=/**/;OPJ_STATIC;NO_LCMS;LIBRAW_NODLL;_CRT_SECURE_NO_WARNINGS;FREEIMAGE_EXPORTS;%(PreprocessorDefinitions) + AnySuitable + Speed + true + false + true + StreamingSIMDExtensions2 + .\Redirectors\FreeImage\;..\..\Source\;..\..\..\zlib-1.2.5\;..\..\..\libjpeg-8c\;..\..\..\openexr-1.7.0\IlmImf\;..\..\..\ilmbase-1.0.2\Imath\;..\..\..\ilmbase-1.0.2\Iex\;..\..\..\ilmbase-1.0.2\Half\ + + + Windows + true + true + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;libjpeg.$(ConfigurationName).lib;libpng.$(ConfigurationName).lib;libtiff.$(ConfigurationName).lib;libmng.$(ConfigurationName).lib;libraw.$(ConfigurationName).lib;ilmbase.$(ConfigurationName).lib;openexr.$(ConfigurationName).lib;openjpeg.$(ConfigurationName).lib;zlib.$(ConfigurationName).lib;%(AdditionalDependencies) + ..\..\..\libjpeg-8c\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\libpng-1.5.4\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\libtiff-3.9.5\build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\libmng-1.0.10\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\libraw-0.13.7\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\ilmbase-1.0.2\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\openexr-1.7.0\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\openjpeg-1.4-r697\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\;..\..\..\zlib-1.2.5\Build\MSVC 10.0\bin\x64\$(ConfigurationName)\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x64).vcxproj.filters freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x64).vcxproj.filters --- freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x64).vcxproj.filters Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x64).vcxproj.filters Fri Jul 29 16:55:48 2011 @@ -0,0 +1,323 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + h;hpp;hxx;hm;inl;inc;xsd;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {080f7705-5482-4301-99c7-f48d272982ef} + + + {22096e42-1f0f-48e5-9c46-64821a748329} + + + {82231dc2-ec6e-484c-88bf-a43407ceb5a1} + + + {d2581787-42b5-47b8-a953-51d736d5cc54} + + + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source\Metadata + + + Source\Metadata + + + Source\DeprecationManager + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImage + + + + + Source\Metadata + + + Source\Metadata + + + Source\Metadata + + + Source\Metadata + + + Source\Metadata + + + Source\Metadata + + + Source\Metadata + + + Source\DeprecationManager + + + Source\DeprecationManager + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x86).sln freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x86).sln --- freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x86).sln Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x86).sln Fri Jul 29 17:03:48 2011 @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeImage (x86)", "FreeImage (x86).vcxproj", "{71EC4F4E-A0E8-4C57-830B-602EC82F4206}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {71EC4F4E-A0E8-4C57-830B-602EC82F4206}.Debug|x86.ActiveCfg = Debug|Win32 + {71EC4F4E-A0E8-4C57-830B-602EC82F4206}.Debug|x86.Build.0 = Debug|Win32 + {71EC4F4E-A0E8-4C57-830B-602EC82F4206}.Release|x86.ActiveCfg = Release|Win32 + {71EC4F4E-A0E8-4C57-830B-602EC82F4206}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Binary files freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x86).suo and freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x86).suo differ diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x86).vcxproj freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x86).vcxproj --- freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x86).vcxproj Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x86).vcxproj Fri Jul 29 23:10:49 2011 @@ -0,0 +1,210 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {71EC4F4E-A0E8-4C57-830B-602EC82F4206} + Win32Proj + FreeImage + FreeImage (x86) + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + true + bin\x86\$(Configuration)\ + obj\x86\$(Configuration)\ + FreeImage + + + false + bin\x86\$(Configuration)\ + obj\x86\$(Configuration)\ + FreeImage + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PNG_IMPEXP=/**/;OPJ_STATIC;NO_LCMS;LIBRAW_NODLL;_CRT_SECURE_NO_WARNINGS;FREEIMAGE_EXPORTS;%(PreprocessorDefinitions) + .\Redirectors\FreeImage\;..\..\Source\;..\..\..\zlib-1.2.5\;..\..\..\libjpeg-8c\;..\..\..\openexr-1.7.0\IlmImf\;..\..\..\ilmbase-1.0.2\Imath\;..\..\..\ilmbase-1.0.2\Iex\;..\..\..\ilmbase-1.0.2\Half\ + true + StreamingSIMDExtensions2 + + + Windows + true + ..\..\..\libjpeg-8c\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\libpng-1.5.4\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\libtiff-3.9.5\build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\libmng-1.0.10\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\libraw-0.13.7\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\ilmbase-1.0.2\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\openexr-1.7.0\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\openjpeg-1.4-r697\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\zlib-1.2.5\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\ + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;libjpeg.$(ConfigurationName).lib;libpng.$(ConfigurationName).lib;libtiff.$(ConfigurationName).lib;libmng.$(ConfigurationName).lib;libraw.$(ConfigurationName).lib;ilmbase.$(ConfigurationName).lib;openexr.$(ConfigurationName).lib;openjpeg.$(ConfigurationName).lib;zlib.$(ConfigurationName).lib;%(AdditionalDependencies) + FreeImage.def + + + + + Level3 + + + Full + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;PNG_IMPEXP=/**/;OPJ_STATIC;NO_LCMS;LIBRAW_NODLL;_CRT_SECURE_NO_WARNINGS;FREEIMAGE_EXPORTS;%(PreprocessorDefinitions) + .\Redirectors\FreeImage\;..\..\Source\;..\..\..\zlib-1.2.5\;..\..\..\libjpeg-8c\;..\..\..\openexr-1.7.0\IlmImf\;..\..\..\ilmbase-1.0.2\Imath\;..\..\..\ilmbase-1.0.2\Iex\;..\..\..\ilmbase-1.0.2\Half\ + AnySuitable + Speed + true + false + true + StreamingSIMDExtensions2 + + + Windows + true + true + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;libjpeg.$(ConfigurationName).lib;libpng.$(ConfigurationName).lib;libtiff.$(ConfigurationName).lib;libmng.$(ConfigurationName).lib;libraw.$(ConfigurationName).lib;ilmbase.$(ConfigurationName).lib;openexr.$(ConfigurationName).lib;openjpeg.$(ConfigurationName).lib;zlib.$(ConfigurationName).lib;%(AdditionalDependencies) + ..\..\..\libjpeg-8c\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\libpng-1.5.4\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\libtiff-3.9.5\build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\libmng-1.0.10\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\libraw-0.13.7\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\ilmbase-1.0.2\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\openexr-1.7.0\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\openjpeg-1.4-r697\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\;..\..\..\zlib-1.2.5\Build\MSVC 10.0\bin\x86\$(ConfigurationName)\ + FreeImage.def + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x86).vcxproj.filters freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x86).vcxproj.filters --- freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage (x86).vcxproj.filters Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\FreeImage (x86).vcxproj.filters Fri Jul 29 23:10:49 2011 @@ -0,0 +1,333 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + h;hpp;hxx;hm;inl;inc;xsd;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {92d23338-0cc7-4d6c-9dc6-a5711a743720} + + + {40d49116-3c31-4e56-ad5d-da84f553834b} + + + {8efd9e52-3b4c-4c18-840a-af232be084ae} + + + {9ce1ccb2-adf6-4143-9092-f9dd5303afcb} + + + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source\FreeImage + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\DeprecationManager + + + Source\Metadata + + + Source\Metadata + + + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImage + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\FreeImageToolkit + + + Source\DeprecationManager + + + Source\DeprecationManager + + + Source\Metadata + + + Source\Metadata + + + Source\Metadata + + + Source\Metadata + + + Source\Metadata + + + Source\Metadata + + + Source\Metadata + + + + + Resources + + + + + Source + + + \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage.def freeimage-3.15.1\Build\MSVC 10.0\FreeImage.def --- freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage.def Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\FreeImage.def Fri Jul 29 23:11:25 2011 @@ -0,0 +1,239 @@ +LIBRARY + +EXPORTS +FreeImage_AcquireMemory +FreeImage_AdjustBrightness +FreeImage_AdjustColors +FreeImage_AdjustContrast +FreeImage_AdjustCurve +FreeImage_AdjustGamma +FreeImage_Allocate +FreeImage_AllocateEx +FreeImage_AllocateExT +FreeImage_AllocateHeader +FreeImage_AllocateHeaderT +FreeImage_AllocateT +FreeImage_AppendPage +FreeImage_ApplyColorMapping +FreeImage_ApplyPaletteIndexMapping +FreeImage_Clone +FreeImage_CloneMetadata +FreeImage_CloneTag +FreeImage_CloseMemory +FreeImage_CloseMultiBitmap +FreeImage_ColorQuantize +FreeImage_ColorQuantizeEx +FreeImage_Composite +FreeImage_ConvertFromRawBits +FreeImage_ConvertLine16To24_555 +FreeImage_ConvertLine16To24_565 +FreeImage_ConvertLine16To32_555 +FreeImage_ConvertLine16To32_565 +FreeImage_ConvertLine16To4_555 +FreeImage_ConvertLine16To4_565 +FreeImage_ConvertLine16To8_555 +FreeImage_ConvertLine16To8_565 +FreeImage_ConvertLine16_555_To16_565 +FreeImage_ConvertLine16_565_To16_555 +FreeImage_ConvertLine1To16_555 +FreeImage_ConvertLine1To16_565 +FreeImage_ConvertLine1To24 +FreeImage_ConvertLine1To32 +FreeImage_ConvertLine1To4 +FreeImage_ConvertLine1To8 +FreeImage_ConvertLine24To16_555 +FreeImage_ConvertLine24To16_565 +FreeImage_ConvertLine24To32 +FreeImage_ConvertLine24To4 +FreeImage_ConvertLine24To8 +FreeImage_ConvertLine32To16_555 +FreeImage_ConvertLine32To16_565 +FreeImage_ConvertLine32To24 +FreeImage_ConvertLine32To4 +FreeImage_ConvertLine32To8 +FreeImage_ConvertLine4To16_555 +FreeImage_ConvertLine4To16_565 +FreeImage_ConvertLine4To24 +FreeImage_ConvertLine4To32 +FreeImage_ConvertLine4To8 +FreeImage_ConvertLine8To16_555 +FreeImage_ConvertLine8To16_565 +FreeImage_ConvertLine8To24 +FreeImage_ConvertLine8To32 +FreeImage_ConvertLine8To4 +FreeImage_ConvertTo16Bits555 +FreeImage_ConvertTo16Bits565 +FreeImage_ConvertTo24Bits +FreeImage_ConvertTo32Bits +FreeImage_ConvertTo4Bits +FreeImage_ConvertTo8Bits +FreeImage_ConvertToFloat +FreeImage_ConvertToGreyscale +FreeImage_ConvertToRGB16 +FreeImage_ConvertToRGBF +FreeImage_ConvertToRawBits +FreeImage_ConvertToStandardType +FreeImage_ConvertToType +FreeImage_ConvertToUINT16 +FreeImage_Copy +FreeImage_CreateICCProfile +FreeImage_CreateTag +FreeImage_DeInitialise +FreeImage_DeletePage +FreeImage_DeleteTag +FreeImage_DestroyICCProfile +FreeImage_Dither +FreeImage_EnlargeCanvas +FreeImage_FIFSupportsExportBPP +FreeImage_FIFSupportsExportType +FreeImage_FIFSupportsICCProfiles +FreeImage_FIFSupportsNoPixels +FreeImage_FIFSupportsReading +FreeImage_FIFSupportsWriting +FreeImage_FillBackground +FreeImage_FindCloseMetadata +FreeImage_FindFirstMetadata +FreeImage_FindNextMetadata +FreeImage_FlipHorizontal +FreeImage_FlipVertical +FreeImage_GetAdjustColorsLookupTable +FreeImage_GetBPP +FreeImage_GetBackgroundColor +FreeImage_GetBits +FreeImage_GetBlueMask +FreeImage_GetChannel +FreeImage_GetColorType +FreeImage_GetColorsUsed +FreeImage_GetComplexChannel +FreeImage_GetCopyrightMessage +FreeImage_GetDIBSize +FreeImage_GetDotsPerMeterX +FreeImage_GetDotsPerMeterY +FreeImage_GetFIFCount +FreeImage_GetFIFDescription +FreeImage_GetFIFExtensionList +FreeImage_GetFIFFromFilename +FreeImage_GetFIFFromFilenameU +FreeImage_GetFIFFromFormat +FreeImage_GetFIFFromMime +FreeImage_GetFIFMimeType +FreeImage_GetFIFRegExpr +FreeImage_GetFileType +FreeImage_GetFileTypeFromHandle +FreeImage_GetFileTypeFromMemory +FreeImage_GetFileTypeU +FreeImage_GetFormatFromFIF +FreeImage_GetGreenMask +FreeImage_GetHeight +FreeImage_GetHistogram +FreeImage_GetICCProfile +FreeImage_GetImageType +FreeImage_GetInfo +FreeImage_GetInfoHeader +FreeImage_GetLine +FreeImage_GetLockedPageNumbers +FreeImage_GetMetadata +FreeImage_GetMetadataCount +FreeImage_GetPageCount +FreeImage_GetPalette +FreeImage_GetPitch +FreeImage_GetPixelColor +FreeImage_GetPixelIndex +FreeImage_GetRedMask +FreeImage_GetScanLine +FreeImage_GetTagCount +FreeImage_GetTagDescription +FreeImage_GetTagID +FreeImage_GetTagKey +FreeImage_GetTagLength +FreeImage_GetTagType +FreeImage_GetTagValue +FreeImage_GetThumbnail +FreeImage_GetTransparencyCount +FreeImage_GetTransparencyTable +FreeImage_GetTransparentIndex +FreeImage_GetVersion +FreeImage_GetWidth +FreeImage_HasBackgroundColor +FreeImage_HasPixels +FreeImage_Initialise +FreeImage_InsertPage +FreeImage_Invert +FreeImage_IsLittleEndian +FreeImage_IsPluginEnabled +FreeImage_IsTransparent +FreeImage_JPEGCrop +FreeImage_JPEGCropU +FreeImage_JPEGTransform +FreeImage_JPEGTransformU +FreeImage_Load +FreeImage_LoadFromHandle +FreeImage_LoadFromMemory +FreeImage_LoadMultiBitmapFromMemory +FreeImage_LoadU +FreeImage_LockPage +FreeImage_LookupSVGColor +FreeImage_LookupX11Color +FreeImage_MakeThumbnail +FreeImage_MovePage +FreeImage_MultigridPoissonSolver +FreeImage_OpenMemory +FreeImage_OpenMultiBitmap +FreeImage_OpenMultiBitmapFromHandle +FreeImage_OutputMessageProc +FreeImage_Paste +FreeImage_PreMultiplyWithAlpha +FreeImage_ReadMemory +FreeImage_RegisterExternalPlugin +FreeImage_RegisterLocalPlugin +FreeImage_Rescale +FreeImage_Rotate +FreeImage_RotateClassic +FreeImage_RotateEx +FreeImage_Save +FreeImage_SaveMultiBitmapToHandle +FreeImage_SaveMultiBitmapToMemory +FreeImage_SaveToHandle +FreeImage_SaveToMemory +FreeImage_SaveU +FreeImage_SeekMemory +FreeImage_SetBackgroundColor +FreeImage_SetChannel +FreeImage_SetComplexChannel +FreeImage_SetDotsPerMeterX +FreeImage_SetDotsPerMeterY +FreeImage_SetMetadata +FreeImage_SetOutputMessage +FreeImage_SetOutputMessageStdCall +FreeImage_SetPixelColor +FreeImage_SetPixelIndex +FreeImage_SetPluginEnabled +FreeImage_SetTagCount +FreeImage_SetTagDescription +FreeImage_SetTagID +FreeImage_SetTagKey +FreeImage_SetTagLength +FreeImage_SetTagType +FreeImage_SetTagValue +FreeImage_SetThumbnail +FreeImage_SetTransparencyTable +FreeImage_SetTransparent +FreeImage_SetTransparentIndex +FreeImage_SwapColors +FreeImage_SwapPaletteIndices +FreeImage_TagToString +FreeImage_TellMemory +FreeImage_Threshold +FreeImage_TmoDrago03 +FreeImage_TmoFattal02 +FreeImage_TmoReinhard05 +FreeImage_TmoReinhard05Ex +FreeImage_ToneMapping +FreeImage_Unload +FreeImage_UnlockPage +FreeImage_WriteMemory +FreeImage_ZLibCRC32 +FreeImage_ZLibCompress +FreeImage_ZLibGUnzip +FreeImage_ZLibGZip +FreeImage_ZLibUncompress diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage.NET (net-4.0).csproj freeimage-3.15.1\Build\MSVC 10.0\FreeImage.NET (net-4.0).csproj --- freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage.NET (net-4.0).csproj Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\FreeImage.NET (net-4.0).csproj Fri Jul 29 23:18:31 2011 @@ -0,0 +1,256 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {699654D8-C794-421D-8C61-9E9D0C9E0E71} + Library + Properties + FreeImage.NET + FreeImage.NET + v4.0 + 512 + Client + + + true + full + false + bin\net-4.0\Debug\ + DEBUG;TRACE + prompt + 4 + bin\net-4.0\Debug\FreeImage.NET.xml + true + + + pdbonly + true + bin\net-4.0\Release\ + TRACE + prompt + 4 + bin\net-4.0\Release\FreeImage.NET.xml + true + + + true + + + ..\..\..\..\..\..\nuclex.snk + + + + + + + + + + + + + + Source\Classes\FreeImageBitmap.cs + + + Source\Classes\FreeImageEngine.cs + + + Source\Classes\FreeImagePlugin.cs + + + Source\Classes\FreeImageStreamIO.cs + + + Source\Classes\GifInformation.cs + + + Source\Classes\ImageMetadata.cs + + + Source\Classes\LocalPlugin.cs + + + Source\Classes\MemoryArray.cs + + + Source\Classes\MetadataModel.cs + + + Source\Classes\MetadataModels.cs + + + Source\Classes\MetadataTag.cs + + + Source\Classes\Palette.cs + + + Source\Classes\PluginRepository.cs + + + Source\Classes\Scanline.cs + + + Source\Classes\StreamWrapper.cs + + + Source\Delegates.cs + + + Source\Enumerations\DisposalMethodType.cs + + + Source\Enumerations\FREE_IMAGE_COLOR_CHANNEL.cs + + + Source\Enumerations\FREE_IMAGE_COLOR_DEPTH.cs + + + Source\Enumerations\FREE_IMAGE_COLOR_OPTIONS.cs + + + Source\Enumerations\FREE_IMAGE_COLOR_TYPE.cs + + + Source\Enumerations\FREE_IMAGE_COMPARE_FLAGS.cs + + + Source\Enumerations\FREE_IMAGE_DITHER.cs + + + Source\Enumerations\FREE_IMAGE_FILTER.cs + + + Source\Enumerations\FREE_IMAGE_FORMAT.cs + + + Source\Enumerations\FREE_IMAGE_JPEG_OPERATION.cs + + + Source\Enumerations\FREE_IMAGE_LOAD_FLAGS.cs + + + Source\Enumerations\FREE_IMAGE_MDMODEL.cs + + + Source\Enumerations\FREE_IMAGE_MDTYPE.cs + + + Source\Enumerations\FREE_IMAGE_METADATA_COPY.cs + + + Source\Enumerations\FREE_IMAGE_QUANTIZE.cs + + + Source\Enumerations\FREE_IMAGE_SAVE_FLAGS.cs + + + Source\Enumerations\FREE_IMAGE_TMO.cs + + + Source\Enumerations\FREE_IMAGE_TYPE.cs + + + Source\Enumerations\ICC_FLAGS.cs + + + Source\Enumerations\MD_SEARCH_FLAGS.cs + + + Source\FreeImageStaticImports.cs + + + Source\FreeImageWrapper.cs + + + Properties\AssemblyInfo.cs + + + Source\Structs\BITMAP.cs + + + Source\Structs\BITMAPINFO.cs + + + Source\Structs\BITMAPINFOHEADER.cs + + + Source\Structs\FI16RGB555.cs + + + Source\Structs\FI16RGB565.cs + + + Source\Structs\FI1BIT.cs + + + Source\Structs\FI4BIT.cs + + + Source\Structs\FIBITMAP.cs + + + Source\Structs\FICOMPLEX.cs + + + Source\Structs\FIICCPROFILE.cs + + + Source\Structs\FIMEMORY.cs + + + Source\Structs\FIMETADATA.cs + + + Source\Structs\FIMULTIBITMAP.cs + + + Source\Structs\FIRational.cs + + + Source\Structs\FIRGB16.cs + + + Source\Structs\FIRGBA16.cs + + + Source\Structs\FIRGBAF.cs + + + Source\Structs\FIRGBF.cs + + + Source\Structs\FITAG.cs + + + Source\Structs\FIURational.cs + + + Source\Structs\fi_handle.cs + + + Source\Structs\FreeImageIO.cs + + + Source\Structs\Plugin.cs + + + Source\Structs\RGBQUAD.cs + + + Source\Structs\RGBTRIPLE.cs + + + + + \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage.NET (net-4.0).sln freeimage-3.15.1\Build\MSVC 10.0\FreeImage.NET (net-4.0).sln --- freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage.NET (net-4.0).sln Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\FreeImage.NET (net-4.0).sln Fri Jul 29 23:18:31 2011 @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C# Express 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeImage.NET (net-4.0)", "FreeImage.NET (net-4.0).csproj", "{699654D8-C794-421D-8C61-9E9D0C9E0E71}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {699654D8-C794-421D-8C61-9E9D0C9E0E71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {699654D8-C794-421D-8C61-9E9D0C9E0E71}.Debug|Any CPU.Build.0 = Debug|Any CPU + {699654D8-C794-421D-8C61-9E9D0C9E0E71}.Release|Any CPU.ActiveCfg = Release|Any CPU + {699654D8-C794-421D-8C61-9E9D0C9E0E71}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Binary files freeimage-3.15.1-original\Build\MSVC 10.0\FreeImage.NET (net-4.0).suo and freeimage-3.15.1\Build\MSVC 10.0\FreeImage.NET (net-4.0).suo differ diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibJPEG\jerror.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibJPEG\jerror.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibJPEG\jerror.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibJPEG\jerror.h Fri Jul 29 18:17:41 2011 @@ -0,0 +1 @@ +#include <../../../../../libjpeg-8c/jerror.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibJPEG\jinclude.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibJPEG\jinclude.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibJPEG\jinclude.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibJPEG\jinclude.h Fri Jul 29 18:17:25 2011 @@ -0,0 +1 @@ +#include <../../../../../libjpeg-8c/jinclude.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibJPEG\jpeglib.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibJPEG\jpeglib.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibJPEG\jpeglib.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibJPEG\jpeglib.h Fri Jul 29 18:17:31 2011 @@ -0,0 +1 @@ +#include <../../../../../libjpeg-8c/jpeglib.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibJPEG\transupp.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibJPEG\transupp.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibJPEG\transupp.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibJPEG\transupp.h Fri Jul 29 18:19:13 2011 @@ -0,0 +1 @@ +#include <../../../../../libjpeg-8c/transupp.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibMNG\libmng.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibMNG\libmng.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibMNG\libmng.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibMNG\libmng.h Fri Jul 29 18:16:48 2011 @@ -0,0 +1 @@ +#include <../../../../../libmng-1.0.10/libmng.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibOpenJPEG\openjpeg.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibOpenJPEG\openjpeg.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibOpenJPEG\openjpeg.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibOpenJPEG\openjpeg.h Fri Jul 29 22:25:59 2011 @@ -0,0 +1 @@ +#include <..\..\..\..\..\OpenJPEG-1.4-r697\libopenjpeg\openjpeg.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibPNG\png.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibPNG\png.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibPNG\png.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibPNG\png.h Fri Jul 29 18:20:33 2011 @@ -0,0 +1 @@ +#include <..\..\..\..\..\libpng-1.5.4\png.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibRawLite\libraw\libraw.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibRawLite\libraw\libraw.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibRawLite\libraw\libraw.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibRawLite\libraw\libraw.h Fri Jul 29 18:24:36 2011 @@ -0,0 +1 @@ +#include <..\..\..\..\..\libraw-0.13.7\libraw\libraw.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibTIFF\tiffiop.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibTIFF\tiffiop.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\LibTIFF\tiffiop.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\LibTIFF\tiffiop.h Fri Jul 29 18:18:29 2011 @@ -0,0 +1 @@ +#include <../../../../../libtiff-3.9.5/libtiff/tiffiop.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\Half\Half.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\Half\Half.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\Half\Half.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\Half\Half.h Fri Jul 29 18:21:06 2011 @@ -0,0 +1 @@ +#include <../../../../../ilmbase-1.0.2/Half/half.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\Iex\Iex.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\Iex\Iex.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\Iex\Iex.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\Iex\Iex.h Fri Jul 29 18:21:31 2011 @@ -0,0 +1 @@ +#include <../../../../../ilmbase-1.0.2/Iex/Iex.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfArray.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfArray.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfArray.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfArray.h Fri Jul 29 18:23:44 2011 @@ -0,0 +1 @@ +#include <../../../../../OpenEXR-1.7.0/IlmImf/ImfArray.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfChannelList.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfChannelList.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfChannelList.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfChannelList.h Fri Jul 29 18:23:23 2011 @@ -0,0 +1 @@ +#include <../../../../../OpenEXR-1.7.0/IlmImf/ImfChannelList.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfInputFile.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfInputFile.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfInputFile.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfInputFile.h Fri Jul 29 18:22:45 2011 @@ -0,0 +1 @@ +#include <../../../../../OpenEXR-1.7.0/IlmImf/ImfInputFile.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfIO.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfIO.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfIO.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfIO.h Fri Jul 29 18:19:32 2011 @@ -0,0 +1 @@ +#include <../../../../../OpenEXR-1.7.0/IlmImf/ImfIO.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfOutputFile.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfOutputFile.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfOutputFile.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfOutputFile.h Fri Jul 29 18:22:33 2011 @@ -0,0 +1 @@ +#include <../../../../../OpenEXR-1.7.0/IlmImf/ImfOutputFile.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfPreviewImage.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfPreviewImage.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfPreviewImage.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfPreviewImage.h Fri Jul 29 18:23:57 2011 @@ -0,0 +1 @@ +#include <../../../../../OpenEXR-1.7.0/IlmImf/ImfPreviewImage.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfRgba.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfRgba.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfRgba.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfRgba.h Fri Jul 29 18:23:34 2011 @@ -0,0 +1 @@ +#include <../../../../../OpenEXR-1.7.0/IlmImf/ImfRgba.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfRgbaFile.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfRgbaFile.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfRgbaFile.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\OpenEXR\IlmImf\ImfRgbaFile.h Fri Jul 29 18:23:10 2011 @@ -0,0 +1 @@ +#include <../../../../../OpenEXR-1.7.0/IlmImf/ImfRgbaFile.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\ZLib\zlib.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\ZLib\zlib.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\ZLib\zlib.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\ZLib\zlib.h Fri Jul 29 18:17:09 2011 @@ -0,0 +1 @@ +#include <../../../../../ZLib-1.2.5/zlib.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\ZLib\zutil.h freeimage-3.15.1\Build\MSVC 10.0\Redirectors\ZLib\zutil.h --- freeimage-3.15.1-original\Build\MSVC 10.0\Redirectors\ZLib\zutil.h Thu Jan 01 01:00:00 1970 +++ freeimage-3.15.1\Build\MSVC 10.0\Redirectors\ZLib\zutil.h Fri Jul 29 18:21:41 2011 @@ -0,0 +1 @@ +#include <../../../../../ZLib-1.2.5/zutil.h> \ No newline at end of file diff -r -u -N -w freeimage-3.15.1-original\Source\DeprecationManager\DeprecationMgr.cpp freeimage-3.15.1\Source\DeprecationManager\DeprecationMgr.cpp --- freeimage-3.15.1-original\Source\DeprecationManager\DeprecationMgr.cpp Thu Jul 28 00:05:21 2011 +++ freeimage-3.15.1\Source\DeprecationManager\DeprecationMgr.cpp Fri Jul 29 22:34:22 2011 @@ -38,8 +38,8 @@ DeprecationMgr::~DeprecationMgr() { #ifdef _WIN32 if (!m_functions.empty()) { - OutputDebugString( "*************************************************************************************\n" ); - OutputDebugString( "This is a warning, because you use one or more deprecated functions.\nContinuing to use these functions might eventually render your program uncompilable.\nThe following functions are deprecated:\n\n" ); + OutputDebugStringA( "*************************************************************************************\n" ); + OutputDebugStringA( "This is a warning, because you use one or more deprecated functions.\nContinuing to use these functions might eventually render your program uncompilable.\nThe following functions are deprecated:\n\n" ); for (std::map::iterator i = m_functions.begin(); i != m_functions.end(); ++i) { DeprecatedFunction *function = &((*i).second); @@ -48,10 +48,10 @@ sprintf(txt, " * %s called from %i different places. Instead use %s.\n", function->old_function_name, function->called_from.size(), function->new_function_name); - OutputDebugString(txt); + OutputDebugStringA(txt); } - OutputDebugString( "*************************************************************************************\n" ); + OutputDebugStringA( "*************************************************************************************\n" ); m_functions.clear(); } diff -r -u -N -w freeimage-3.15.1-original\Source\FreeImage\Plugin.cpp freeimage-3.15.1\Source\FreeImage\Plugin.cpp --- freeimage-3.15.1-original\Source\FreeImage\Plugin.cpp Thu Jul 28 00:05:22 2011 +++ freeimage-3.15.1\Source\FreeImage\Plugin.cpp Fri Jul 29 22:35:14 2011 @@ -268,14 +268,14 @@ // store the current directory. then set the directory to the application location - if (GetCurrentDirectory(2 * _MAX_PATH, current_dir) != 0) { - if (GetModuleFileName(NULL, module, 2 * _MAX_PATH) != 0) { + if (GetCurrentDirectoryA(2 * _MAX_PATH, current_dir) != 0) { + if (GetModuleFileNameA(NULL, module, 2 * _MAX_PATH) != 0) { char *last_point = strrchr(module, '\\'); if (last_point) { *last_point = '\0'; - bOk = SetCurrentDirectory(module); + bOk = SetCurrentDirectoryA(module); } } } @@ -294,7 +294,7 @@ strcpy(buffer, s_search_list[count]); strncat(buffer, find_data.name, MAX_PATH + 200); - HINSTANCE instance = LoadLibrary(buffer); + HINSTANCE instance = LoadLibraryA(buffer); if (instance != NULL) { FARPROC proc_address = GetProcAddress(instance, "_Init@8"); @@ -316,7 +316,7 @@ // restore the current directory if (bOk) { - SetCurrentDirectory(current_dir); + SetCurrentDirectoryA(current_dir); } } #endif // _WIN32 @@ -507,7 +507,7 @@ FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_RegisterExternalPlugin(const char *path, const char *format, const char *description, const char *extension, const char *regexpr) { if (path != NULL) { - HINSTANCE instance = LoadLibrary(path); + HINSTANCE instance = LoadLibraryA(path); if (instance != NULL) { FARPROC proc_address = GetProcAddress(instance, "_Init@8");