diff --git a/bin/libopenjpeg-libsl-2.1.2.0.so b/bin/libopenjpeg-libsl-2.1.2.0.so index b0bf0bbf55..0e3eebf3d6 100644 Binary files a/bin/libopenjpeg-libsl-2.1.2.0.so and b/bin/libopenjpeg-libsl-2.1.2.0.so differ diff --git a/bin/openjpeg-libsl.dll b/bin/openjpeg-libsl.dll index 3bb527baa4..f3b56ad9cf 100644 Binary files a/bin/openjpeg-libsl.dll and b/bin/openjpeg-libsl.dll differ diff --git a/libraries/openjpeg-libsl/DllOpenJPEG.dsp b/libraries/openjpeg-libsl/DllOpenJPEG.dsp new file mode 100644 index 0000000000..6408c63954 --- /dev/null +++ b/libraries/openjpeg-libsl/DllOpenJPEG.dsp @@ -0,0 +1,273 @@ +# Microsoft Developer Studio Project File - Name="DllOpenJPEG" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=DllOpenJPEG - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "DllOpenJPEG.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "DllOpenJPEG.mak" CFG="DllOpenJPEG - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "DllOpenJPEG - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "DllOpenJPEG - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "DllOpenJPEG - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLLOPENJPEG_EXPORTS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OPJ_EXPORTS" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x40c /d "NDEBUG" +# ADD RSC /l 0x40c /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Release/OpenJPEG.dll" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=if not exist dist mkdir dist copy libopenjpeg\openjpeg.h dist copy Release\OpenJPEG.dll dist copy Release\OpenJPEG.lib dist +# End Special Build Tool + +!ELSEIF "$(CFG)" == "DllOpenJPEG - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLLOPENJPEG_EXPORTS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OPJ_EXPORTS" /FD /GZ /c +# SUBTRACT CPP /YX /Yc /Yu +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x40c /d "_DEBUG" +# ADD RSC /l 0x40c /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/OpenJPEGd.dll" /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=if not exist dist mkdir dist copy libopenjpeg\openjpeg.h dist copy Debug\OpenJPEGd.dll dist copy Debug\OpenJPEGd.lib dist +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "DllOpenJPEG - Win32 Release" +# Name "DllOpenJPEG - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\libopenjpeg\bio.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\cio.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\dwt.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\event.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\image.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\j2k.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\j2k_lib.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\jp2.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\jpt.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\mct.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\mqc.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\openjpeg.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\pi.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\raw.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\t1.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\t2.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\tcd.c +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\tgt.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\libopenjpeg\bio.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\cio.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\dwt.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\event.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\fix.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\image.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\int.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\j2k.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\j2k_lib.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\jp2.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\jpt.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\mct.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\mqc.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\openjpeg.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\opj_includes.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\pi.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\raw.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\t1.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\t2.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\tcd.h +# End Source File +# Begin Source File + +SOURCE=.\libopenjpeg\tgt.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=.\OpenJPEG.rc +# End Source File +# End Group +# End Target +# End Project diff --git a/libraries/openjpeg-libsl/DllOpenJPEG.sln b/libraries/openjpeg-libsl/DllOpenJPEG.sln new file mode 100644 index 0000000000..ed30780a47 --- /dev/null +++ b/libraries/openjpeg-libsl/DllOpenJPEG.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DllOpenJPEG", "DllOpenJPEG.vcproj", "{D1F3D377-653A-4B9B-B01F-C8DF3FA5C86F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D1F3D377-653A-4B9B-B01F-C8DF3FA5C86F}.Debug|Win32.ActiveCfg = Debug|Win32 + {D1F3D377-653A-4B9B-B01F-C8DF3FA5C86F}.Debug|Win32.Build.0 = Debug|Win32 + {D1F3D377-653A-4B9B-B01F-C8DF3FA5C86F}.Release|Win32.ActiveCfg = Release|Win32 + {D1F3D377-653A-4B9B-B01F-C8DF3FA5C86F}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/libraries/openjpeg-libsl/README.msvc b/libraries/openjpeg-libsl/README.msvc new file mode 100644 index 0000000000..fc9ea8943a --- /dev/null +++ b/libraries/openjpeg-libsl/README.msvc @@ -0,0 +1,40 @@ +How to compile the library under MS VC++ 6.0 +-------------------------------------------- + +The library comes in two versions : +- a static library that can be linked against any C/C++ program +- a Dynamic Link Library (Windows DLL) that can be used in any C/C++ program and in most interpreted languages (e.g. VB, C#, ...). + +In order to compile the library version *or* the DLL version, you will have to : + +1) Open the MSVC workspace named LibOpenJPEG.dsw +2) Set the choosen target as the active project, that means : + a) Go to the Menu 'Build -> Set Active Configuration' + b) Choose one of the following configuration : + - DllOpenJPEG - Win32 Release => creates a DLL in release mode named OpenJPEG.dll + - DllOpenJPEG - Win32 Debug => creates a DLL in debug mode named OpenJPEGd.dll + - LibOpenJPEG - Win32 Release => creates a static library in release mode named LibOpenJPEG.lib + - LibOpenJPEG - Win32 Debug => creates a static library in debug mode named LibOpenJPEGd.lib +3) Build the project : Menu -> Build -> Rebuild All + +The build process will create a directory named 'dist' that will contain all you need in order to use the library. + +Simple codec compilation +------------------------ + +Once you've built the library, you might want to test it with a basic codec. To do this, go to the codec directory and use one of the following projects to build an encoder and decoder respectively: +- image_to_j2k.dsw +- j2k_to_image.dsw + +IMPORTANT NOTE : +---------------- + +The encoder and decoder samples are configured to use the static version of the library. A link to the LibOpenJPEG static project is included in these projects so that you can build both a codec and the library in a single pass. + +However, you MUST NOTE that in order to use LibOpenJPEG as a static library in your program, you NEED to add the following compiler directive to your project : OPJ_STATIC +Look at the menu 'Project -> Settings -> C/C++ tab -> preprocessor definition' to see how this is configured. +When using OpenJPEG as a DLL, this compiler directive MUST NOT be used. + + + +