walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] apply patch from winfried on the mailing list. For more info see: https://groups.google.com/group/openjpeg/msg/e631d586a31c6de4

This commit is contained in:
Mathieu Malaterre 2012-04-23 13:28:20 +00:00
parent df7e656034
commit 8231897b26
9 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -34,7 +34,6 @@ CMake/OpenJPEGConfig.cmake.in \
CMakeLists.txt \ CMakeLists.txt \
CTestConfig.cmake \ CTestConfig.cmake \
AUTHORS \ AUTHORS \
CHANGES \
INSTALL \ INSTALL \
LICENSE \ LICENSE \
NEWS \ NEWS \

2
applications/jpip/libopenjpip/Makefile.am
View File

@ -80,6 +80,8 @@ dec_clientmsg_handler.h
libopenjpip_server_la_CPPFLAGS = \ libopenjpip_server_la_CPPFLAGS = \
-I. \ -I. \
-I$(top_srcdir)/libopenjpeg \
-I$(top_builddir)/libopenjpeg \
-I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip \
-I$(top_builddir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip \
@FCGI_CFLAGS@ \ @FCGI_CFLAGS@ \

10
applications/jpip/util/Makefile.am
View File

@ -13,6 +13,8 @@ endif
opj_server_CPPFLAGS = \ opj_server_CPPFLAGS = \
@FCGI_CFLAGS@ \ @FCGI_CFLAGS@ \
-I. \ -I. \
-I$(top_srcdir)/libopenjpeg \
-I$(top_builddir)/libopenjpeg \
-I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip \
-I$(top_builddir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip \
-DSERVER \ -DSERVER \
@ -25,6 +27,8 @@ opj_server_SOURCES = opj_server.c
#------------- #-------------
opj_dec_server_CPPFLAGS = \ opj_dec_server_CPPFLAGS = \
-I. \ -I. \
-I$(top_srcdir)/libopenjpeg \
-I$(top_builddir)/libopenjpeg \
-I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip \
-I$(top_builddir)/applications/jpip/libopenjpip -I$(top_builddir)/applications/jpip/libopenjpip
# #
@ -35,6 +39,8 @@ opj_dec_server_SOURCES = opj_dec_server.c
#------------- #-------------
jpip_to_jp2_CPPFLAGS = \ jpip_to_jp2_CPPFLAGS = \
-I. \ -I. \
-I$(top_srcdir)/libopenjpeg \
-I$(top_builddir)/libopenjpeg \
-I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip \
-I$(top_builddir)/applications/jpip/libopenjpip -I$(top_builddir)/applications/jpip/libopenjpip
# #
@ -45,6 +51,8 @@ jpip_to_jp2_SOURCES = jpip_to_jp2.c
#------------- #-------------
jpip_to_j2k_CPPFLAGS = \ jpip_to_j2k_CPPFLAGS = \
-I. \ -I. \
-I$(top_srcdir)/libopenjpeg \
-I$(top_builddir)/libopenjpeg \
-I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip \
-I$(top_builddir)/applications/jpip/libopenjpip -I$(top_builddir)/applications/jpip/libopenjpip
# #
@ -55,6 +63,8 @@ jpip_to_j2k_SOURCES = jpip_to_j2k.c
#------------- #-------------
test_index_CPPFLAGS = \ test_index_CPPFLAGS = \
-I. \ -I. \
-I$(top_srcdir)/libopenjpeg \
-I$(top_builddir)/libopenjpeg \
-I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip \
-I$(top_builddir)/applications/jpip/libopenjpip -I$(top_builddir)/applications/jpip/libopenjpip
# #

6
configure.ac
View File

@ -59,7 +59,11 @@ esac
AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"]) AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"])
AM_CONDITIONAL([HAVE_DARWIN], [test "x${have_darwin}" = "xyes"]) AM_CONDITIONAL([HAVE_DARWIN], [test "x${have_darwin}" = "xyes"])
AC_TYPE_SSIZE_T
if test "x$ac_cv_type_ssize_t" = xyes; then
AC_DEFINE([HAVE_SSIZE_T], [1],[Define to 1 if you have ssize_t.],
[AC_MSG([ssize_t not found])])
fi
### Additional options to configure ### Additional options to configure
# debug # debug

2
doc/Makefile.am
View File

@ -34,7 +34,7 @@ doc:
endif endif
docsdir = $(docdir)-$(MAJOR_NR).$(MINOR_NR) docsdir = $(docdir)-$(MAJOR_NR).$(MINOR_NR)
docs_DATA = $(top_builddir)/LICENSE $(top_builddir)/CHANGES docs_DATA = $(top_builddir)/LICENSE
dist_man1_MANS = \ dist_man1_MANS = \
man/man1/image_to_j2k.1 \ man/man1/image_to_j2k.1 \

2
libopenjpeg/Makefile.am
View File

@ -7,7 +7,7 @@ SUBDIRS += jpwl
endif endif
includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR) includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
includes_HEADERS = openjpeg.h includes_HEADERS = openjpeg.h opj_stdint.h
lib_LTLIBRARIES = libopenjpeg.la lib_LTLIBRARIES = libopenjpeg.la

2
libopenjpeg/openjpeg.c
View File

@ -220,7 +220,7 @@ DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
const char* OPJ_CALLCONV opj_version(void) { const char* OPJ_CALLCONV opj_version(void) {
return OPJ_PACKAGE_VERSION; return PACKAGE_VERSION;
} }

4
libopenjpeg/opj_stdint.h
View File

@ -49,8 +49,12 @@ typedef size_t OPJ_SIZE_T;
typedef int64_t OPJ_OFF_T; typedef int64_t OPJ_OFF_T;
#ifndef HAVE_SSIZE_T #ifndef HAVE_SSIZE_T
#if defined(_WIN32)
#include <BaseTsd.h> #include <BaseTsd.h>
typedef SSIZE_T ssize_t; typedef SSIZE_T ssize_t;
#else
#error SSIZE_T is undefined
#endif /* _WIN32 */
#endif #endif
#endif /* OPJ_STDINT_H */ #endif /* OPJ_STDINT_H */

2
opj_config.h.cmake.in
View File

@ -1,5 +1,5 @@
/* create config.h for CMake */ /* create config.h for CMake */
#define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@" #define PACKAGE_VERSION "@PACKAGE_VERSION@"
#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@ #cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@ #cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@