diff options
author | dan miller | 2007-10-18 08:19:20 +0000 |
---|---|---|
committer | dan miller | 2007-10-18 08:19:20 +0000 |
commit | 3a4b53077d1eac0512a11496341ba31dd7d6e57d (patch) | |
tree | 6fe95f1ceafa8b84a89c6524f0c5ab998122bf2c | |
parent | Add gryc's patch to run commands in a shutdown_commands.txt file when the sim... (diff) | |
download | opensim-SC_OLD-3a4b53077d1eac0512a11496341ba31dd7d6e57d.zip opensim-SC_OLD-3a4b53077d1eac0512a11496341ba31dd7d6e57d.tar.gz opensim-SC_OLD-3a4b53077d1eac0512a11496341ba31dd7d6e57d.tar.bz2 opensim-SC_OLD-3a4b53077d1eac0512a11496341ba31dd7d6e57d.tar.xz |
putting openjpeg-libsl source in /libraries; updating binaries
Diffstat (limited to '')
-rw-r--r-- | bin/libopenjpeg-libsl-2.1.2.0.so | bin | 119780 -> 123876 bytes | |||
-rw-r--r-- | bin/openjpeg-libsl.dll | bin | 208896 -> 208896 bytes | |||
-rw-r--r-- | libraries/openjpeg-libsl/DllOpenJPEG.dsp | 273 | ||||
-rw-r--r-- | libraries/openjpeg-libsl/DllOpenJPEG.sln | 20 | ||||
-rw-r--r-- | libraries/openjpeg-libsl/README.msvc | 40 |
5 files changed, 333 insertions, 0 deletions
diff --git a/bin/libopenjpeg-libsl-2.1.2.0.so b/bin/libopenjpeg-libsl-2.1.2.0.so index b0bf0bb..0e3eebf 100644 --- a/bin/libopenjpeg-libsl-2.1.2.0.so +++ b/bin/libopenjpeg-libsl-2.1.2.0.so | |||
Binary files differ | |||
diff --git a/bin/openjpeg-libsl.dll b/bin/openjpeg-libsl.dll index 3bb527b..f3b56ad 100644 --- a/bin/openjpeg-libsl.dll +++ b/bin/openjpeg-libsl.dll | |||
Binary files differ | |||
diff --git a/libraries/openjpeg-libsl/DllOpenJPEG.dsp b/libraries/openjpeg-libsl/DllOpenJPEG.dsp new file mode 100644 index 0000000..6408c63 --- /dev/null +++ b/libraries/openjpeg-libsl/DllOpenJPEG.dsp | |||
@@ -0,0 +1,273 @@ | |||
1 | # Microsoft Developer Studio Project File - Name="DllOpenJPEG" - Package Owner=<4> | ||
2 | # Microsoft Developer Studio Generated Build File, Format Version 6.00 | ||
3 | # ** DO NOT EDIT ** | ||
4 | |||
5 | # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 | ||
6 | |||
7 | CFG=DllOpenJPEG - Win32 Debug | ||
8 | !MESSAGE This is not a valid makefile. To build this project using NMAKE, | ||
9 | !MESSAGE use the Export Makefile command and run | ||
10 | !MESSAGE | ||
11 | !MESSAGE NMAKE /f "DllOpenJPEG.mak". | ||
12 | !MESSAGE | ||
13 | !MESSAGE You can specify a configuration when running NMAKE | ||
14 | !MESSAGE by defining the macro CFG on the command line. For example: | ||
15 | !MESSAGE | ||
16 | !MESSAGE NMAKE /f "DllOpenJPEG.mak" CFG="DllOpenJPEG - Win32 Debug" | ||
17 | !MESSAGE | ||
18 | !MESSAGE Possible choices for configuration are: | ||
19 | !MESSAGE | ||
20 | !MESSAGE "DllOpenJPEG - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") | ||
21 | !MESSAGE "DllOpenJPEG - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") | ||
22 | !MESSAGE | ||
23 | |||
24 | # Begin Project | ||
25 | # PROP AllowPerConfigDependencies 0 | ||
26 | # PROP Scc_ProjName "" | ||
27 | # PROP Scc_LocalPath "" | ||
28 | CPP=cl.exe | ||
29 | MTL=midl.exe | ||
30 | RSC=rc.exe | ||
31 | |||
32 | !IF "$(CFG)" == "DllOpenJPEG - Win32 Release" | ||
33 | |||
34 | # PROP BASE Use_MFC 0 | ||
35 | # PROP BASE Use_Debug_Libraries 0 | ||
36 | # PROP BASE Output_Dir "Release" | ||
37 | # PROP BASE Intermediate_Dir "Release" | ||
38 | # PROP BASE Target_Dir "" | ||
39 | # PROP Use_MFC 0 | ||
40 | # PROP Use_Debug_Libraries 0 | ||
41 | # PROP Output_Dir "Release" | ||
42 | # PROP Intermediate_Dir "Release" | ||
43 | # PROP Ignore_Export_Lib 0 | ||
44 | # PROP Target_Dir "" | ||
45 | # 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 | ||
46 | # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OPJ_EXPORTS" /FD /c | ||
47 | # SUBTRACT CPP /YX /Yc /Yu | ||
48 | # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 | ||
49 | # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 | ||
50 | # ADD BASE RSC /l 0x40c /d "NDEBUG" | ||
51 | # ADD RSC /l 0x40c /d "NDEBUG" | ||
52 | BSC32=bscmake.exe | ||
53 | # ADD BASE BSC32 /nologo | ||
54 | # ADD BSC32 /nologo | ||
55 | LINK32=link.exe | ||
56 | # 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 | ||
57 | # 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" | ||
58 | # Begin Special Build Tool | ||
59 | SOURCE="$(InputPath)" | ||
60 | PostBuild_Cmds=if not exist dist mkdir dist copy libopenjpeg\openjpeg.h dist copy Release\OpenJPEG.dll dist copy Release\OpenJPEG.lib dist | ||
61 | # End Special Build Tool | ||
62 | |||
63 | !ELSEIF "$(CFG)" == "DllOpenJPEG - Win32 Debug" | ||
64 | |||
65 | # PROP BASE Use_MFC 0 | ||
66 | # PROP BASE Use_Debug_Libraries 1 | ||
67 | # PROP BASE Output_Dir "Debug" | ||
68 | # PROP BASE Intermediate_Dir "Debug" | ||
69 | # PROP BASE Target_Dir "" | ||
70 | # PROP Use_MFC 0 | ||
71 | # PROP Use_Debug_Libraries 1 | ||
72 | # PROP Output_Dir "Debug" | ||
73 | # PROP Intermediate_Dir "Debug" | ||
74 | # PROP Ignore_Export_Lib 0 | ||
75 | # PROP Target_Dir "" | ||
76 | # 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 | ||
77 | # 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 | ||
78 | # SUBTRACT CPP /YX /Yc /Yu | ||
79 | # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 | ||
80 | # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 | ||
81 | # ADD BASE RSC /l 0x40c /d "_DEBUG" | ||
82 | # ADD RSC /l 0x40c /d "_DEBUG" | ||
83 | BSC32=bscmake.exe | ||
84 | # ADD BASE BSC32 /nologo | ||
85 | # ADD BSC32 /nologo | ||
86 | LINK32=link.exe | ||
87 | # 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 | ||
88 | # 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 | ||
89 | # Begin Special Build Tool | ||
90 | SOURCE="$(InputPath)" | ||
91 | PostBuild_Cmds=if not exist dist mkdir dist copy libopenjpeg\openjpeg.h dist copy Debug\OpenJPEGd.dll dist copy Debug\OpenJPEGd.lib dist | ||
92 | # End Special Build Tool | ||
93 | |||
94 | !ENDIF | ||
95 | |||
96 | # Begin Target | ||
97 | |||
98 | # Name "DllOpenJPEG - Win32 Release" | ||
99 | # Name "DllOpenJPEG - Win32 Debug" | ||
100 | # Begin Group "Source Files" | ||
101 | |||
102 | # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" | ||
103 | # Begin Source File | ||
104 | |||
105 | SOURCE=.\libopenjpeg\bio.c | ||
106 | # End Source File | ||
107 | # Begin Source File | ||
108 | |||
109 | SOURCE=.\libopenjpeg\cio.c | ||
110 | # End Source File | ||
111 | # Begin Source File | ||
112 | |||
113 | SOURCE=.\libopenjpeg\dwt.c | ||
114 | # End Source File | ||
115 | # Begin Source File | ||
116 | |||
117 | SOURCE=.\libopenjpeg\event.c | ||
118 | # End Source File | ||
119 | # Begin Source File | ||
120 | |||
121 | SOURCE=.\libopenjpeg\image.c | ||
122 | # End Source File | ||
123 | # Begin Source File | ||
124 | |||
125 | SOURCE=.\libopenjpeg\j2k.c | ||
126 | # End Source File | ||
127 | # Begin Source File | ||
128 | |||
129 | SOURCE=.\libopenjpeg\j2k_lib.c | ||
130 | # End Source File | ||
131 | # Begin Source File | ||
132 | |||
133 | SOURCE=.\libopenjpeg\jp2.c | ||
134 | # End Source File | ||
135 | # Begin Source File | ||
136 | |||
137 | SOURCE=.\libopenjpeg\jpt.c | ||
138 | # End Source File | ||
139 | # Begin Source File | ||
140 | |||
141 | SOURCE=.\libopenjpeg\mct.c | ||
142 | # End Source File | ||
143 | # Begin Source File | ||
144 | |||
145 | SOURCE=.\libopenjpeg\mqc.c | ||
146 | # End Source File | ||
147 | # Begin Source File | ||
148 | |||
149 | SOURCE=.\libopenjpeg\openjpeg.c | ||
150 | # End Source File | ||
151 | # Begin Source File | ||
152 | |||
153 | SOURCE=.\libopenjpeg\pi.c | ||
154 | # End Source File | ||
155 | # Begin Source File | ||
156 | |||
157 | SOURCE=.\libopenjpeg\raw.c | ||
158 | # End Source File | ||
159 | # Begin Source File | ||
160 | |||
161 | SOURCE=.\libopenjpeg\t1.c | ||
162 | # End Source File | ||
163 | # Begin Source File | ||
164 | |||
165 | SOURCE=.\libopenjpeg\t2.c | ||
166 | # End Source File | ||
167 | # Begin Source File | ||
168 | |||
169 | SOURCE=.\libopenjpeg\tcd.c | ||
170 | # End Source File | ||
171 | # Begin Source File | ||
172 | |||
173 | SOURCE=.\libopenjpeg\tgt.c | ||
174 | # End Source File | ||
175 | # End Group | ||
176 | # Begin Group "Header Files" | ||
177 | |||
178 | # PROP Default_Filter "h;hpp;hxx;hm;inl" | ||
179 | # Begin Source File | ||
180 | |||
181 | SOURCE=.\libopenjpeg\bio.h | ||
182 | # End Source File | ||
183 | # Begin Source File | ||
184 | |||
185 | SOURCE=.\libopenjpeg\cio.h | ||
186 | # End Source File | ||
187 | # Begin Source File | ||
188 | |||
189 | SOURCE=.\libopenjpeg\dwt.h | ||
190 | # End Source File | ||
191 | # Begin Source File | ||
192 | |||
193 | SOURCE=.\libopenjpeg\event.h | ||
194 | # End Source File | ||
195 | # Begin Source File | ||
196 | |||
197 | SOURCE=.\libopenjpeg\fix.h | ||
198 | # End Source File | ||
199 | # Begin Source File | ||
200 | |||
201 | SOURCE=.\libopenjpeg\image.h | ||
202 | # End Source File | ||
203 | # Begin Source File | ||
204 | |||
205 | SOURCE=.\libopenjpeg\int.h | ||
206 | # End Source File | ||
207 | # Begin Source File | ||
208 | |||
209 | SOURCE=.\libopenjpeg\j2k.h | ||
210 | # End Source File | ||
211 | # Begin Source File | ||
212 | |||
213 | SOURCE=.\libopenjpeg\j2k_lib.h | ||
214 | # End Source File | ||
215 | # Begin Source File | ||
216 | |||
217 | SOURCE=.\libopenjpeg\jp2.h | ||
218 | # End Source File | ||
219 | # Begin Source File | ||
220 | |||
221 | SOURCE=.\libopenjpeg\jpt.h | ||
222 | # End Source File | ||
223 | # Begin Source File | ||
224 | |||
225 | SOURCE=.\libopenjpeg\mct.h | ||
226 | # End Source File | ||
227 | # Begin Source File | ||
228 | |||
229 | SOURCE=.\libopenjpeg\mqc.h | ||
230 | # End Source File | ||
231 | # Begin Source File | ||
232 | |||
233 | SOURCE=.\libopenjpeg\openjpeg.h | ||
234 | # End Source File | ||
235 | # Begin Source File | ||
236 | |||
237 | SOURCE=.\libopenjpeg\opj_includes.h | ||
238 | # End Source File | ||
239 | # Begin Source File | ||
240 | |||
241 | SOURCE=.\libopenjpeg\pi.h | ||
242 | # End Source File | ||
243 | # Begin Source File | ||
244 | |||
245 | SOURCE=.\libopenjpeg\raw.h | ||
246 | # End Source File | ||
247 | # Begin Source File | ||
248 | |||
249 | SOURCE=.\libopenjpeg\t1.h | ||
250 | # End Source File | ||
251 | # Begin Source File | ||
252 | |||
253 | SOURCE=.\libopenjpeg\t2.h | ||
254 | # End Source File | ||
255 | # Begin Source File | ||
256 | |||
257 | SOURCE=.\libopenjpeg\tcd.h | ||
258 | # End Source File | ||
259 | # Begin Source File | ||
260 | |||
261 | SOURCE=.\libopenjpeg\tgt.h | ||
262 | # End Source File | ||
263 | # End Group | ||
264 | # Begin Group "Resource Files" | ||
265 | |||
266 | # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" | ||
267 | # Begin Source File | ||
268 | |||
269 | SOURCE=.\OpenJPEG.rc | ||
270 | # End Source File | ||
271 | # End Group | ||
272 | # End Target | ||
273 | # End Project | ||
diff --git a/libraries/openjpeg-libsl/DllOpenJPEG.sln b/libraries/openjpeg-libsl/DllOpenJPEG.sln new file mode 100644 index 0000000..ed30780 --- /dev/null +++ b/libraries/openjpeg-libsl/DllOpenJPEG.sln | |||
@@ -0,0 +1,20 @@ | |||
1 | | ||
2 | Microsoft Visual Studio Solution File, Format Version 9.00 | ||
3 | # Visual C++ Express 2005 | ||
4 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DllOpenJPEG", "DllOpenJPEG.vcproj", "{D1F3D377-653A-4B9B-B01F-C8DF3FA5C86F}" | ||
5 | EndProject | ||
6 | Global | ||
7 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
8 | Debug|Win32 = Debug|Win32 | ||
9 | Release|Win32 = Release|Win32 | ||
10 | EndGlobalSection | ||
11 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
12 | {D1F3D377-653A-4B9B-B01F-C8DF3FA5C86F}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
13 | {D1F3D377-653A-4B9B-B01F-C8DF3FA5C86F}.Debug|Win32.Build.0 = Debug|Win32 | ||
14 | {D1F3D377-653A-4B9B-B01F-C8DF3FA5C86F}.Release|Win32.ActiveCfg = Release|Win32 | ||
15 | {D1F3D377-653A-4B9B-B01F-C8DF3FA5C86F}.Release|Win32.Build.0 = Release|Win32 | ||
16 | EndGlobalSection | ||
17 | GlobalSection(SolutionProperties) = preSolution | ||
18 | HideSolutionNode = FALSE | ||
19 | EndGlobalSection | ||
20 | EndGlobal | ||
diff --git a/libraries/openjpeg-libsl/README.msvc b/libraries/openjpeg-libsl/README.msvc new file mode 100644 index 0000000..fc9ea89 --- /dev/null +++ b/libraries/openjpeg-libsl/README.msvc | |||
@@ -0,0 +1,40 @@ | |||
1 | How to compile the library under MS VC++ 6.0 | ||
2 | -------------------------------------------- | ||
3 | |||
4 | The library comes in two versions : | ||
5 | - a static library that can be linked against any C/C++ program | ||
6 | - a Dynamic Link Library (Windows DLL) that can be used in any C/C++ program and in most interpreted languages (e.g. VB, C#, ...). | ||
7 | |||
8 | In order to compile the library version *or* the DLL version, you will have to : | ||
9 | |||
10 | 1) Open the MSVC workspace named LibOpenJPEG.dsw | ||
11 | 2) Set the choosen target as the active project, that means : | ||
12 | a) Go to the Menu 'Build -> Set Active Configuration' | ||
13 | b) Choose one of the following configuration : | ||
14 | - DllOpenJPEG - Win32 Release => creates a DLL in release mode named OpenJPEG.dll | ||
15 | - DllOpenJPEG - Win32 Debug => creates a DLL in debug mode named OpenJPEGd.dll | ||
16 | - LibOpenJPEG - Win32 Release => creates a static library in release mode named LibOpenJPEG.lib | ||
17 | - LibOpenJPEG - Win32 Debug => creates a static library in debug mode named LibOpenJPEGd.lib | ||
18 | 3) Build the project : Menu -> Build -> Rebuild All | ||
19 | |||
20 | The build process will create a directory named 'dist' that will contain all you need in order to use the library. | ||
21 | |||
22 | Simple codec compilation | ||
23 | ------------------------ | ||
24 | |||
25 | 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: | ||
26 | - image_to_j2k.dsw | ||
27 | - j2k_to_image.dsw | ||
28 | |||
29 | IMPORTANT NOTE : | ||
30 | ---------------- | ||
31 | |||
32 | 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. | ||
33 | |||
34 | 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 | ||
35 | Look at the menu 'Project -> Settings -> C/C++ tab -> preprocessor definition' to see how this is configured. | ||
36 | When using OpenJPEG as a DLL, this compiler directive MUST NOT be used. | ||
37 | |||
38 | |||
39 | |||
40 | |||