summaryrefslogtreecommitdiff
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-rw-r--r--applications/jpip/tools/Makefile.nix6
-rw-r--r--applications/jpip/tools/jpip_to_j2k.c (renamed from applications/jpip/tools/jpt_to_j2k.c)30
-rw-r--r--applications/jpip/tools/jpip_to_jp2.c (renamed from applications/jpip/tools/jpt_to_jp2.c)32
3 files changed, 36 insertions, 32 deletions
diff --git a/applications/jpip/tools/Makefile.nix b/applications/jpip/tools/Makefile.nix
index 50b83881..d522b473 100644
--- a/applications/jpip/tools/Makefile.nix
+++ b/applications/jpip/tools/Makefile.nix
@@ -3,17 +3,17 @@ LIBFNAME = $(LIBDIR)/libopenjpip_local.a
CFLAGS = -O3 -Wall -I$(LIBDIR)
LDFLAGS = -L$(LIBDIR) -lm -lopenjpip_local
-ALL = jpt_to_jp2 jpt_to_j2k test_index addXMLinJP2
+ALL = jpip_to_jp2 jpip_to_j2k test_index addXMLinJP2
all: t_indexer $(ALL)
t_indexer:
make -C indexer
-jpt_to_jp2: jpt_to_jp2.o $(LIBFNAME)
+jpip_to_jp2: jpip_to_jp2.o $(LIBFNAME)
$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
-jpt_to_j2k: jpt_to_j2k.o $(LIBFNAME)
+jpip_to_j2k: jpip_to_j2k.o $(LIBFNAME)
$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
test_index: test_index.o $(LIBFNAME)
diff --git a/applications/jpip/tools/jpt_to_j2k.c b/applications/jpip/tools/jpip_to_j2k.c
index e35777c9..df84354c 100644
--- a/applications/jpip/tools/jpt_to_j2k.c
+++ b/applications/jpip/tools/jpip_to_j2k.c
@@ -1,5 +1,5 @@
/*
- * $Id: jpt_to_j2k.c 46 2011-02-17 14:50:55Z kaori $
+ * $Id$
*
* Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
* Copyright (c) 2002-2011, Professor Benoit Macq
@@ -29,13 +29,15 @@
*/
/*! \file
- * \brief jpt_to_j2k is a program to convert JPT-stream to J2K file
+ * \brief jpip_to_j2k is a program to convert JPT- JPP- stream to J2K file
*
* \section impinst Implementing instructions
* This program takes two arguments. \n
- * -# Input JPT file
+ * -# Input JPT or JPP file
* -# Output J2K file\n
- * % ./jpt_to_j2k input.jpt output.j2k
+ * % ./jpip_to_j2k input.jpt output.j2k
+ * or
+ * % ./jpip_to_j2k input.jpp output.j2k
*/
#include <stdio.h>
@@ -51,13 +53,13 @@ int main(int argc,char *argv[])
{
msgqueue_param_t *msgqueue;
int infd, outfd;
- Byte8_t jptlen, j2klen;
+ Byte8_t jpiplen, j2klen;
struct stat sb;
- Byte_t *jptstream, *j2kstream;
+ Byte_t *jpipstream, *j2kstream;
if( argc < 3){
fprintf( stderr, "Too few arguments:\n");
- fprintf( stderr, " - input jpt file\n");
+ fprintf( stderr, " - input jpt or jpp file\n");
fprintf( stderr, " - output j2k file\n");
return -1;
}
@@ -71,26 +73,26 @@ int main(int argc,char *argv[])
fprintf( stderr, "input file stream is broken\n");
return -1;
}
- jptlen = (Byte8_t)sb.st_size;
+ jpiplen = (Byte8_t)sb.st_size;
- jptstream = (Byte_t *)malloc( jptlen);
+ jpipstream = (Byte_t *)malloc( jpiplen);
- if( read( infd, jptstream, jptlen) != jptlen){
+ if( read( infd, jpipstream, jpiplen) != jpiplen){
fprintf( stderr, "file reading error\n");
- free( jptstream);
+ free( jpipstream);
return -1;
}
close(infd);
msgqueue = gene_msgqueue( true, NULL);
- parse_JPIPstream( jptstream, jptlen, 0, msgqueue);
+ parse_JPIPstream( jpipstream, jpiplen, 0, msgqueue);
//print_msgqueue( msgqueue);
- j2kstream = recons_j2k( msgqueue, jptstream, msgqueue->first->csn, 0, &j2klen);
+ j2kstream = recons_j2k( msgqueue, jpipstream, msgqueue->first->csn, 0, &j2klen);
delete_msgqueue( &msgqueue);
- free( jptstream);
+ free( jpipstream);
if(( outfd = open( argv[2], O_WRONLY|O_CREAT, S_IRWXU|S_IRWXG)) == -1){
diff --git a/applications/jpip/tools/jpt_to_jp2.c b/applications/jpip/tools/jpip_to_jp2.c
index 99c4321c..7be7ef91 100644
--- a/applications/jpip/tools/jpt_to_jp2.c
+++ b/applications/jpip/tools/jpip_to_jp2.c
@@ -1,5 +1,5 @@
/*
- * $Id: jpt_to_jp2.c 46 2011-02-17 14:50:55Z kaori $
+ * $Id$
*
* Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
* Copyright (c) 2002-2011, Professor Benoit Macq
@@ -29,13 +29,15 @@
*/
/*! \file
- * \brief jpt_to_jp2 is a program to convert JPT-stream to JP2 file
+ * \brief jpip_to_jp2 is a program to convert JPT- JPP- stream to JP2 file
*
* \section impinst Implementing instructions
* This program takes two arguments. \n
- * -# Input JPT file
+ * -# Input JPT or JPP file
* -# Output JP2 file\n
* % ./jpt_to_jp2 input.jpt output.jp2
+ * or
+ * % ./jpt_to_jp2 input.jpp output.jp2
*/
#include <stdio.h>
@@ -53,15 +55,15 @@ int main(int argc,char *argv[])
{
msgqueue_param_t *msgqueue;
int infd, outfd;
- Byte8_t jptlen, jp2len;
+ Byte8_t jpiplen, jp2len;
struct stat sb;
- Byte_t *jptstream, *jp2stream;
+ Byte_t *jpipstream, *jp2stream;
metadatalist_param_t *metadatalist;
ihdrbox_param_t *ihdrbox;
if( argc < 3){
fprintf( stderr, "Too few arguments:\n");
- fprintf( stderr, " - input jpt file\n");
+ fprintf( stderr, " - input jpt or jpp file\n");
fprintf( stderr, " - output jp2 file\n");
return -1;
}
@@ -75,30 +77,30 @@ int main(int argc,char *argv[])
fprintf( stderr, "input file stream is broken\n");
return -1;
}
- jptlen = (Byte8_t)sb.st_size;
+ jpiplen = (Byte8_t)sb.st_size;
- jptstream = (Byte_t *)malloc( jptlen);
+ jpipstream = (Byte_t *)malloc( jpiplen);
- if( read( infd, jptstream, jptlen) != jptlen){
+ if( read( infd, jpipstream, jpiplen) != jpiplen){
fprintf( stderr, "file reading error\n");
- free( jptstream);
+ free( jpipstream);
return -1;
}
close(infd);
metadatalist = gene_metadatalist();
msgqueue = gene_msgqueue( true, NULL);
- parse_JPIPstream( jptstream, jptlen, 0, msgqueue);
- parse_metamsg( msgqueue, jptstream, jptlen, metadatalist);
+ parse_JPIPstream( jpipstream, jpiplen, 0, msgqueue);
+ parse_metamsg( msgqueue, jpipstream, jpiplen, metadatalist);
print_msgqueue( msgqueue);
//print_allmetadata( metadatalist);
- ihdrbox = get_ihdrbox( metadatalist, jptstream);
+ ihdrbox = get_ihdrbox( metadatalist, jpipstream);
printf("W*H: %d*%d\n", ihdrbox->height, ihdrbox->width);
printf("NC: %d, bpc: %d\n", ihdrbox->nc, ihdrbox->bpc);
- jp2stream = recons_jp2( msgqueue, jptstream, msgqueue->first->csn, &jp2len);
+ jp2stream = recons_jp2( msgqueue, jpipstream, msgqueue->first->csn, &jp2len);
if(( outfd = open( argv[2], O_WRONLY|O_CREAT, S_IRWXU|S_IRWXG)) == -1){
fprintf( stderr, "file %s open error\n", argv[2]);
@@ -117,7 +119,7 @@ int main(int argc,char *argv[])
delete_msgqueue( &msgqueue);
delete_metadatalist( &metadatalist);
- free( jptstream);
+ free( jpipstream);
return 0;
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-26 14:43:12 +0000