diff --git a/libraries/openjpeg-libsl/DllOpenJPEG.suo b/libraries/openjpeg-libsl/DllOpenJPEG.suo new file mode 100644 index 0000000000..82ebaca212 Binary files /dev/null and b/libraries/openjpeg-libsl/DllOpenJPEG.suo differ diff --git a/libraries/openjpeg-libsl/DllOpenJPEG.vcproj b/libraries/openjpeg-libsl/DllOpenJPEG.vcproj new file mode 100644 index 0000000000..a2204241f2 --- /dev/null +++ b/libraries/openjpeg-libsl/DllOpenJPEG.vcproj @@ -0,0 +1,700 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libraries/openjpeg-libsl/DllOpenJPEG.vcproj.dan-PC.dan.user b/libraries/openjpeg-libsl/DllOpenJPEG.vcproj.dan-PC.dan.user new file mode 100644 index 0000000000..45ef146829 --- /dev/null +++ b/libraries/openjpeg-libsl/DllOpenJPEG.vcproj.dan-PC.dan.user @@ -0,0 +1,65 @@ + + + + + + + + + + + diff --git a/libraries/openjpeg-libsl/Makefile b/libraries/openjpeg-libsl/Makefile new file mode 100644 index 0000000000..9912759254 --- /dev/null +++ b/libraries/openjpeg-libsl/Makefile @@ -0,0 +1,66 @@ +# Linux makefile for OpenJPEG + +VER_MAJOR = 2 +VER_MINOR = 1.2.0 + +SRCS = ./libopenjpeg/bio.c ./libopenjpeg/cio.c ./libopenjpeg/dwt.c ./libopenjpeg/event.c ./libopenjpeg/image.c ./libopenjpeg/j2k.c ./libopenjpeg/j2k_lib.c ./libopenjpeg/jp2.c ./libopenjpeg/jpt.c ./libopenjpeg/mct.c ./libopenjpeg/mqc.c ./libopenjpeg/openjpeg.c ./libopenjpeg/pi.c ./libopenjpeg/raw.c ./libopenjpeg/t1.c ./libopenjpeg/t2.c ./libopenjpeg/tcd.c ./libopenjpeg/tgt.c +CPPSRCS = ./libsl/libsl.cpp +INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h ./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h ./libopenjpeg/int.h ./libopenjpeg/j2k.h ./libopenjpeg/j2k_lib.h ./libopenjpeg/jp2.h ./libopenjpeg/jpt.h ./libopenjpeg/mct.h ./libopenjpeg/mqc.h ./libopenjpeg/openjpeg.h ./libopenjpeg/pi.h ./libopenjpeg/raw.h ./libopenjpeg/t1.h ./libopenjpeg/t2.h ./libopenjpeg/tcd.h ./libopenjpeg/tgt.h ./libopenjpeg/opj_includes.h ./libsl/libsl.h +INCLUDE = -Ilibopenjpeg + +# General configuration variables: +CC = gcc +AR = ar + +# Converts cr/lf to just lf +DOS2UNIX = dos2unix + +COMPILERFLAGS = -O3 -fPIC +LIBRARIES = -lstdc++ + +MODULES = $(SRCS:.c=.o) +CPPMODULES = $(CPPSRCS:.cpp=.o) +CFLAGS = $(COMPILERFLAGS) $(INCLUDE) + +TARGET = openjpeg-libsl +SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so +LIBNAME = lib$(TARGET).so.$(VER_MAJOR) + + +default: all + +all: OpenJPEG + +dist: OpenJPEG + install -d ../bin + cp $(SHAREDLIB) ../bin/ + +dos2unix: + @$(DOS2UNIX) $(SRCS) $(INCLS) + +OpenJPEG: $(SHAREDLIB) + +$(MODULES): %.o: %.c + $(CC) $(CFLAGS) -c $< -o $@ + +$(CPPMODULES): %.o: %.cpp + $(CC) $(CFLAGS) -c $< -o $@ + +$(SHAREDLIB): $(MODULES) $(CPPMODULES) + $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(CPPMODULES) $(LIBRARIES) + +install: OpenJPEG + install -d ../bin + cp $(SHAREDLIB) ../bin/ + +clean: + rm -rf core dist/ u2dtmp* $(MODULES) $(CPPMODULES) $(SHAREDLIB) $(LIBNAME) + +osx: + make -f Makefile.osx + +osxinstall: + make -f Makefile.osx install + +osxclean: + make -f Makefile.osx clean \ No newline at end of file diff --git a/libraries/openjpeg-libsl/Makefile.osx b/libraries/openjpeg-libsl/Makefile.osx new file mode 100644 index 0000000000..5d2a5c695a --- /dev/null +++ b/libraries/openjpeg-libsl/Makefile.osx @@ -0,0 +1,57 @@ +# MacOSX makefile for OpenJPEG + +VER_MAJOR = 2 +VER_MINOR = 1.2.0 + +SRCS = ./libopenjpeg/bio.c ./libopenjpeg/cio.c ./libopenjpeg/dwt.c ./libopenjpeg/event.c ./libopenjpeg/image.c ./libopenjpeg/j2k.c ./libopenjpeg/j2k_lib.c ./libopenjpeg/jp2.c ./libopenjpeg/jpt.c ./libopenjpeg/mct.c ./libopenjpeg/mqc.c ./libopenjpeg/openjpeg.c ./libopenjpeg/pi.c ./libopenjpeg/raw.c ./libopenjpeg/t1.c ./libopenjpeg/t2.c ./libopenjpeg/tcd.c ./libopenjpeg/tgt.c +CPPSRCS = ./libsl/libsl.cpp +INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h ./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h ./libopenjpeg/int.h ./libopenjpeg/j2k.h ./libopenjpeg/j2k_lib.h ./libopenjpeg/jp2.h ./libopenjpeg/jpt.h ./libopenjpeg/mct.h ./libopenjpeg/mqc.h ./libopenjpeg/openjpeg.h ./libopenjpeg/pi.h ./libopenjpeg/raw.h ./libopenjpeg/t1.h ./libopenjpeg/t2.h ./libopenjpeg/tcd.h ./libopenjpeg/tgt.h ./libopenjpeg/opj_includes.h ./libsl/libsl.h +INCLUDE = -Ilibopenjpeg + +# General configuration variables: +CC = gcc + + +LIBTOOLSTAT = libtool +LIBTOOLDYN = gcc + +COMPILERFLAGS = -O3 -fPIC +LIBRARIES = -lstdc++ + +MODULES = $(SRCS:.c=.o) +CPPMODULES = $(CPPSRCS:.cpp=.o) +CFLAGS = $(COMPILERFLAGS) $(INCLUDE) + +TARGET = openjpeg-libsl +SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).dylib +LIBNAME = lib$(TARGET).dylib + + +default: all + +all: OpenJPEG + +dist: OpenJPEG + install -d ../bin + cp $(SHAREDLIB) ../bin/ + +dos2unix: + @$(DOS2UNIX) $(SRCS) $(INCLS) + +OpenJPEG: $(SHAREDLIB) + +.c.o: + $(CC) $(CFLAGS) -c $< -o $@ + +.cpp.o: + $(CC) $(CFLAGS) -c $< -o $@ + +$(SHAREDLIB): $(MODULES) $(CPPMODULES) + $(LIBTOOLDYN) -dynamiclib -o $@ $(MODULES) $(CPPMODULES) $(LIBRARIES) + +install: + install -d ../bin + cp $(SHAREDLIB) ../bin/ + +clean: + rm -rf core dist/ u2dtmp* $(MODULES) $(CPPMODULES) $(SHAREDLIB) $(LIBNAME) diff --git a/libraries/openjpeg-libsl/OpenJPEG.rc b/libraries/openjpeg-libsl/OpenJPEG.rc new file mode 100644 index 0000000000..2905005dc5 --- /dev/null +++ b/libraries/openjpeg-libsl/OpenJPEG.rc @@ -0,0 +1,109 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +//#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// French (France) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) +#ifdef _WIN32 +//LANGUAGE LANG_FRENCH, SUBLANG_FRENCH +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,1,0,0 + PRODUCTVERSION 1,1,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "Comments", "The OpenJPEG library is an open-source JPEG 2000 codec. \0" + VALUE "CompanyName", "OpenJPEG\0" + VALUE "FileDescription", "OpenJPEG\0" + VALUE "FileVersion", "1, 1, 0, 0\0" + VALUE "InternalName", "openjpeg-libsl\0" + VALUE "LegalCopyright", "Copyright © 2002-2006, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium\0" + VALUE "LegalTrademarks", "See http://www.openjpeg.org for details\0" + VALUE "OriginalFilename", "openjpeg-libsl.dll\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "openjpeg-libsl\0" + VALUE "ProductVersion", "2, 1, 2, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // French (France) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/libraries/openjpeg-libsl/Release/BuildLog.htm b/libraries/openjpeg-libsl/Release/BuildLog.htm new file mode 100644 index 0000000000..4d404db66b Binary files /dev/null and b/libraries/openjpeg-libsl/Release/BuildLog.htm differ diff --git a/libraries/openjpeg-libsl/Release/OpenJPEG.res b/libraries/openjpeg-libsl/Release/OpenJPEG.res new file mode 100644 index 0000000000..669dab3aba Binary files /dev/null and b/libraries/openjpeg-libsl/Release/OpenJPEG.res differ diff --git a/libraries/openjpeg-libsl/Release/RCa02180 b/libraries/openjpeg-libsl/Release/RCa02180 new file mode 100644 index 0000000000..810737ca96 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/RCa02180 differ diff --git a/libraries/openjpeg-libsl/Release/RCa03132 b/libraries/openjpeg-libsl/Release/RCa03132 new file mode 100644 index 0000000000..810737ca96 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/RCa03132 differ diff --git a/libraries/openjpeg-libsl/Release/bio.obj b/libraries/openjpeg-libsl/Release/bio.obj new file mode 100644 index 0000000000..398bbe83fd Binary files /dev/null and b/libraries/openjpeg-libsl/Release/bio.obj differ diff --git a/libraries/openjpeg-libsl/Release/cio.obj b/libraries/openjpeg-libsl/Release/cio.obj new file mode 100644 index 0000000000..0962e51c20 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/cio.obj differ diff --git a/libraries/openjpeg-libsl/Release/dwt.obj b/libraries/openjpeg-libsl/Release/dwt.obj new file mode 100644 index 0000000000..1bee64f3d7 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/dwt.obj differ diff --git a/libraries/openjpeg-libsl/Release/event.obj b/libraries/openjpeg-libsl/Release/event.obj new file mode 100644 index 0000000000..49100c146e Binary files /dev/null and b/libraries/openjpeg-libsl/Release/event.obj differ diff --git a/libraries/openjpeg-libsl/Release/image.obj b/libraries/openjpeg-libsl/Release/image.obj new file mode 100644 index 0000000000..0d5a6a47b1 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/image.obj differ diff --git a/libraries/openjpeg-libsl/Release/j2k.obj b/libraries/openjpeg-libsl/Release/j2k.obj new file mode 100644 index 0000000000..01f7878e1b Binary files /dev/null and b/libraries/openjpeg-libsl/Release/j2k.obj differ diff --git a/libraries/openjpeg-libsl/Release/j2k_lib.obj b/libraries/openjpeg-libsl/Release/j2k_lib.obj new file mode 100644 index 0000000000..0b01c9c669 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/j2k_lib.obj differ diff --git a/libraries/openjpeg-libsl/Release/jp2.obj b/libraries/openjpeg-libsl/Release/jp2.obj new file mode 100644 index 0000000000..ee4ac78903 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/jp2.obj differ diff --git a/libraries/openjpeg-libsl/Release/jpt.obj b/libraries/openjpeg-libsl/Release/jpt.obj new file mode 100644 index 0000000000..96c934b1b0 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/jpt.obj differ diff --git a/libraries/openjpeg-libsl/Release/libsl.obj b/libraries/openjpeg-libsl/Release/libsl.obj new file mode 100644 index 0000000000..c631fbe0fd Binary files /dev/null and b/libraries/openjpeg-libsl/Release/libsl.obj differ diff --git a/libraries/openjpeg-libsl/Release/mct.obj b/libraries/openjpeg-libsl/Release/mct.obj new file mode 100644 index 0000000000..cf01050e7b Binary files /dev/null and b/libraries/openjpeg-libsl/Release/mct.obj differ diff --git a/libraries/openjpeg-libsl/Release/mqc.obj b/libraries/openjpeg-libsl/Release/mqc.obj new file mode 100644 index 0000000000..19a8d64ec5 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/mqc.obj differ diff --git a/libraries/openjpeg-libsl/Release/mt.dep b/libraries/openjpeg-libsl/Release/mt.dep new file mode 100644 index 0000000000..071991d1f1 --- /dev/null +++ b/libraries/openjpeg-libsl/Release/mt.dep @@ -0,0 +1 @@ +Manifest resource last updated at 0:39:27.68 on Thu 10/18/2007 diff --git a/libraries/openjpeg-libsl/Release/openjpeg-libsl.dll b/libraries/openjpeg-libsl/Release/openjpeg-libsl.dll new file mode 100644 index 0000000000..f3b56ad9cf Binary files /dev/null and b/libraries/openjpeg-libsl/Release/openjpeg-libsl.dll differ diff --git a/libraries/openjpeg-libsl/Release/openjpeg-libsl.dll.intermediate.manifest b/libraries/openjpeg-libsl/Release/openjpeg-libsl.dll.intermediate.manifest new file mode 100644 index 0000000000..cdaa604c88 --- /dev/null +++ b/libraries/openjpeg-libsl/Release/openjpeg-libsl.dll.intermediate.manifest @@ -0,0 +1,3 @@ + + + diff --git a/libraries/openjpeg-libsl/Release/openjpeg-libsl.exp b/libraries/openjpeg-libsl/Release/openjpeg-libsl.exp new file mode 100644 index 0000000000..836a7c3c8e Binary files /dev/null and b/libraries/openjpeg-libsl/Release/openjpeg-libsl.exp differ diff --git a/libraries/openjpeg-libsl/Release/openjpeg-libsl.lib b/libraries/openjpeg-libsl/Release/openjpeg-libsl.lib new file mode 100644 index 0000000000..9f07abec40 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/openjpeg-libsl.lib differ diff --git a/libraries/openjpeg-libsl/Release/openjpeg.obj b/libraries/openjpeg-libsl/Release/openjpeg.obj new file mode 100644 index 0000000000..fc6c39b9ad Binary files /dev/null and b/libraries/openjpeg-libsl/Release/openjpeg.obj differ diff --git a/libraries/openjpeg-libsl/Release/pi.obj b/libraries/openjpeg-libsl/Release/pi.obj new file mode 100644 index 0000000000..d26bfb0ae2 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/pi.obj differ diff --git a/libraries/openjpeg-libsl/Release/raw.obj b/libraries/openjpeg-libsl/Release/raw.obj new file mode 100644 index 0000000000..3b9d0918d6 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/raw.obj differ diff --git a/libraries/openjpeg-libsl/Release/t1.obj b/libraries/openjpeg-libsl/Release/t1.obj new file mode 100644 index 0000000000..0003ce9f44 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/t1.obj differ diff --git a/libraries/openjpeg-libsl/Release/t2.obj b/libraries/openjpeg-libsl/Release/t2.obj new file mode 100644 index 0000000000..86c0b827f5 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/t2.obj differ diff --git a/libraries/openjpeg-libsl/Release/tcd.obj b/libraries/openjpeg-libsl/Release/tcd.obj new file mode 100644 index 0000000000..642051e150 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/tcd.obj differ diff --git a/libraries/openjpeg-libsl/Release/tgt.obj b/libraries/openjpeg-libsl/Release/tgt.obj new file mode 100644 index 0000000000..562fe9cda7 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/tgt.obj differ diff --git a/libraries/openjpeg-libsl/Release/vc80.idb b/libraries/openjpeg-libsl/Release/vc80.idb new file mode 100644 index 0000000000..ef55aba279 Binary files /dev/null and b/libraries/openjpeg-libsl/Release/vc80.idb differ diff --git a/libraries/openjpeg-libsl/Resource.h b/libraries/openjpeg-libsl/Resource.h new file mode 100644 index 0000000000..08177e50ce --- /dev/null +++ b/libraries/openjpeg-libsl/Resource.h @@ -0,0 +1,17 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by foob.rc +// + +#define IDS_APP_TITLE 103 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/libraries/openjpeg-libsl/license.txt b/libraries/openjpeg-libsl/license.txt new file mode 100644 index 0000000000..518281c8e8 --- /dev/null +++ b/libraries/openjpeg-libsl/license.txt @@ -0,0 +1 @@ +/* * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium * Copyright (c) 2002-2007, Professor Benoit Macq * Copyright (c) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ \ No newline at end of file