Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "OpenJPEG 1.4 stable"

Browse Source 
This reverts commit 3fca56df23.
This commit is contained in:
Siana Gearz
2011-04-09 20:29:12 +02:00
parent 156bb5415d
commit 711a4fdacd
20 changed files with 260 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/libopenjpeg/openjpeg.c
View File

@@ -24,15 +24,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef _WIN32
#ifdef WIN32
#include <windows.h>
#endif /* _WIN32 */
#endif /* WIN32 */
#include "opj_config.h"
#include "opj_includes.h"
/* ---------------------------------------------------------------------- */
#ifdef _WIN32
#ifdef WIN32
#ifndef OPJ_STATIC
BOOL APIENTRY
DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
@@ -49,13 +48,13 @@ DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
return TRUE;
}
#endif /* OPJ_STATIC */
#endif /* _WIN32 */
#endif /* WIN32 */
/* ---------------------------------------------------------------------- */
const char* OPJ_CALLCONV opj_version(void) {
return PACKAGE_VERSION;
return OPENJPEG_VERSION;
}
opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format) {