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

JPIP : fixed autotools to work with recent name changes

This commit is contained in:
Antonin Descampe 2011-07-06 10:21:25 +00:00
parent 9350a47153
commit 875ac79d0e
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/jpip/CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPIP
! : changed ! : changed
+ : added + : added
July 6, 2011
* [antonin] JPIP : fixed autotools to work with recent name changes
July 5, 2011 July 5, 2011
! [kaori] changed parameter, file names, message names regarding JPT-stream to JPIP-stream, which handles also JPP-stream ! [kaori] changed parameter, file names, message names regarding JPT-stream to JPIP-stream, which handles also JPP-stream

4
applications/jpip/mainpage.h
View File

@ -39,8 +39,8 @@
* - opj_server.c JPIP server supporting HTTP connection and JPT-stream * - opj_server.c JPIP server supporting HTTP connection and JPT-stream
* - opj_dec_server.c Server to decode JPT-stream and communicate locally with JPIP client, which is coded in java * - opj_dec_server.c Server to decode JPT-stream and communicate locally with JPIP client, which is coded in java
* - addXMLinJP2.c To Embed metadata into JP2 file * - addXMLinJP2.c To Embed metadata into JP2 file
* - jpt_to_jp2.c To Convert JPT-stream to JP2 * - jpip_to_jp2.c To Convert JPT-stream to JP2
* - jpt_to_j2k.c To Convert JPT-stream to J2K * - jpip_to_j2k.c To Convert JPT-stream to J2K
* - test_index.c To test index code format of a JP2 file * - test_index.c To test index code format of a JP2 file
* *
* \section license License * \section license License

4
applications/jpip/opj_client/opj_dec_server/Makefile.am
View File

@ -19,8 +19,8 @@ imgsock_manager.c \
imgsock_manager.h \ imgsock_manager.h \
jp2k_decoder.c \ jp2k_decoder.c \
jp2k_decoder.h \ jp2k_decoder.h \
jptstream_manager.c \ jpipstream_manager.c \
jptstream_manager.h \ jpipstream_manager.h \
opj_dec_server.c opj_dec_server.c

22
applications/jpip/tools/Makefile.am
View File

@ -2,27 +2,27 @@ MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = indexer SUBDIRS = indexer
bin_PROGRAMS = jpt_to_jp2 jpt_to_j2k test_index addXMLinJP2 bin_PROGRAMS = jpip_to_jp2 jpip_to_j2k test_index addXMLinJP2
jpt_to_jp2_CPPFLAGS = \ jpip_to_jp2_CPPFLAGS = \
-I. \ -I. \
-I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip \
-I$(top_builddir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip \
-I$(top_srcdir)/applications/jpip/libopenjpip/tools \ -I$(top_srcdir)/applications/jpip/libopenjpip/tools \
-I$(top_builddir)/applications/jpip/libopenjpip/tools -I$(top_builddir)/applications/jpip/libopenjpip/tools
jpt_to_jp2_CFLAGS = jpip_to_jp2_CFLAGS =
jpt_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la jpip_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
jpt_to_jp2_SOURCES = jpt_to_jp2.c jpip_to_jp2_SOURCES = jpip_to_jp2.c
jpt_to_j2k_CPPFLAGS = \ jpip_to_j2k_CPPFLAGS = \
-I. \ -I. \
-I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_srcdir)/applications/jpip/libopenjpip \
-I$(top_builddir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip \
-I$(top_srcdir)/applications/jpip/libopenjpip/tools \ -I$(top_srcdir)/applications/jpip/libopenjpip/tools \
-I$(top_builddir)/applications/jpip/libopenjpip/tools -I$(top_builddir)/applications/jpip/libopenjpip/tools
jpt_to_j2k_CFLAGS = jpip_to_j2k_CFLAGS =
jpt_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la jpip_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
jpt_to_j2k_SOURCES = jpt_to_j2k.c jpip_to_j2k_SOURCES = jpip_to_j2k.c
test_index_CPPFLAGS = \ test_index_CPPFLAGS = \
-I. \ -I. \
@ -43,7 +43,7 @@ addXMLinJP2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_lo
addXMLinJP2_SOURCES = addXMLinJP2.c addXMLinJP2_SOURCES = addXMLinJP2.c
install-data-hook: install-data-hook:
@echo -e " (B)\t$(bindir)/jpt_to_jp2$(EXEEXT)" >> $(top_builddir)/report.txt @echo -e " (B)\t$(bindir)/jpip_to_jp2$(EXEEXT)" >> $(top_builddir)/report.txt
@echo -e " (B)\t$(bindir)/jpt_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt @echo -e " (B)\t$(bindir)/jpip_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
@echo -e " (B)\t$(bindir)/test_index$(EXEEXT)" >> $(top_builddir)/report.txt @echo -e " (B)\t$(bindir)/test_index$(EXEEXT)" >> $(top_builddir)/report.txt
@echo -e " (B)\t$(bindir)/addXMLinJP2$(EXEEXT)" >> $(top_builddir)/report.txt @echo -e " (B)\t$(bindir)/addXMLinJP2$(EXEEXT)" >> $(top_builddir)/report.txt

4
applications/jpip/tools/jpip_to_jp2.c
View File

@ -35,9 +35,9 @@
* This program takes two arguments. \n * This program takes two arguments. \n
* -# Input JPT or JPP file * -# Input JPT or JPP file
* -# Output JP2 file\n * -# Output JP2 file\n
* % ./jpt_to_jp2 input.jpt output.jp2 * % ./jpip_to_jp2 input.jpt output.jp2
* or * or
* % ./jpt_to_jp2 input.jpp output.jp2 * % ./jpip_to_jp2 input.jpp output.jp2
*/ */
#include <stdio.h> #include <stdio.h>