From 0a9cd082dbc590d125f74292fc4a243a2ef6341f Mon Sep 17 00:00:00 2001 From: Kaori Hagihara Date: Tue, 5 Jul 2011 12:10:35 +0000 Subject: changed program and parameter names from jpt to jpip --- applications/jpip/tools/Makefile.nix | 6 +- applications/jpip/tools/jpip_to_j2k.c | 110 ++++++++++++++++++++++++++++++ applications/jpip/tools/jpip_to_jp2.c | 125 ++++++++++++++++++++++++++++++++++ applications/jpip/tools/jpt_to_j2k.c | 108 ----------------------------- applications/jpip/tools/jpt_to_jp2.c | 123 --------------------------------- 5 files changed, 238 insertions(+), 234 deletions(-) create mode 100644 applications/jpip/tools/jpip_to_j2k.c create mode 100644 applications/jpip/tools/jpip_to_jp2.c delete mode 100644 applications/jpip/tools/jpt_to_j2k.c delete mode 100644 applications/jpip/tools/jpt_to_jp2.c 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/jpip_to_j2k.c b/applications/jpip/tools/jpip_to_j2k.c new file mode 100644 index 00000000..df84354c --- /dev/null +++ b/applications/jpip/tools/jpip_to_j2k.c @@ -0,0 +1,110 @@ +/* + * $Id$ + * + * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2010-2011, Kaori Hagihara + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/*! \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 or JPP file + * -# Output J2K file\n + * % ./jpip_to_j2k input.jpt output.j2k + * or + * % ./jpip_to_j2k input.jpp output.j2k + */ + +#include +#include +#include +#include +#include +#include +#include "msgqueue_manager.h" + + +int main(int argc,char *argv[]) +{ + msgqueue_param_t *msgqueue; + int infd, outfd; + Byte8_t jpiplen, j2klen; + struct stat sb; + Byte_t *jpipstream, *j2kstream; + + if( argc < 3){ + fprintf( stderr, "Too few arguments:\n"); + fprintf( stderr, " - input jpt or jpp file\n"); + fprintf( stderr, " - output j2k file\n"); + return -1; + } + + if(( infd = open( argv[1], O_RDONLY)) == -1){ + fprintf( stderr, "file %s not exist\n", argv[1]); + return -1; + } + + if( fstat( infd, &sb) == -1){ + fprintf( stderr, "input file stream is broken\n"); + return -1; + } + jpiplen = (Byte8_t)sb.st_size; + + jpipstream = (Byte_t *)malloc( jpiplen); + + if( read( infd, jpipstream, jpiplen) != jpiplen){ + fprintf( stderr, "file reading error\n"); + free( jpipstream); + return -1; + } + close(infd); + + msgqueue = gene_msgqueue( true, NULL); + parse_JPIPstream( jpipstream, jpiplen, 0, msgqueue); + + //print_msgqueue( msgqueue); + + j2kstream = recons_j2k( msgqueue, jpipstream, msgqueue->first->csn, 0, &j2klen); + + delete_msgqueue( &msgqueue); + free( jpipstream); + + + if(( outfd = open( argv[2], O_WRONLY|O_CREAT, S_IRWXU|S_IRWXG)) == -1){ + fprintf( stderr, "file %s open error\n", argv[2]); + return -1; + } + + if( write( outfd, j2kstream, j2klen) != j2klen) + fprintf( stderr, "j2k file write error\n"); + + free( j2kstream); + close(outfd); + + return 0; +} diff --git a/applications/jpip/tools/jpip_to_jp2.c b/applications/jpip/tools/jpip_to_jp2.c new file mode 100644 index 00000000..7be7ef91 --- /dev/null +++ b/applications/jpip/tools/jpip_to_jp2.c @@ -0,0 +1,125 @@ +/* + * $Id$ + * + * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2010-2011, Kaori Hagihara + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/*! \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 or JPP file + * -# Output JP2 file\n + * % ./jpt_to_jp2 input.jpt output.jp2 + * or + * % ./jpt_to_jp2 input.jpp output.jp2 + */ + +#include +#include +#include +#include +#include +#include +#include "msgqueue_manager.h" +#include "byte_manager.h" +#include "ihdrbox_manager.h" +#include "metadata_manager.h" + +int main(int argc,char *argv[]) +{ + msgqueue_param_t *msgqueue; + int infd, outfd; + Byte8_t jpiplen, jp2len; + struct stat sb; + 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 or jpp file\n"); + fprintf( stderr, " - output jp2 file\n"); + return -1; + } + + if(( infd = open( argv[1], O_RDONLY)) == -1){ + fprintf( stderr, "file %s not exist\n", argv[1]); + return -1; + } + + if( fstat( infd, &sb) == -1){ + fprintf( stderr, "input file stream is broken\n"); + return -1; + } + jpiplen = (Byte8_t)sb.st_size; + + jpipstream = (Byte_t *)malloc( jpiplen); + + if( read( infd, jpipstream, jpiplen) != jpiplen){ + fprintf( stderr, "file reading error\n"); + free( jpipstream); + return -1; + } + close(infd); + + metadatalist = gene_metadatalist(); + msgqueue = gene_msgqueue( true, NULL); + parse_JPIPstream( jpipstream, jpiplen, 0, msgqueue); + parse_metamsg( msgqueue, jpipstream, jpiplen, metadatalist); + print_msgqueue( msgqueue); + //print_allmetadata( metadatalist); + + 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, 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]); + return -1; + } + + if( write( outfd, jp2stream, jp2len) != jp2len) + fprintf( stderr, "jp2 file write error\n"); + + //print_msgqueue( msgqueue); + + free( ihdrbox); + free( jp2stream); + close(outfd); + + delete_msgqueue( &msgqueue); + delete_metadatalist( &metadatalist); + + free( jpipstream); + + return 0; +} diff --git a/applications/jpip/tools/jpt_to_j2k.c b/applications/jpip/tools/jpt_to_j2k.c deleted file mode 100644 index e35777c9..00000000 --- a/applications/jpip/tools/jpt_to_j2k.c +++ /dev/null @@ -1,108 +0,0 @@ -/* - * $Id: jpt_to_j2k.c 46 2011-02-17 14:50:55Z kaori $ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/*! \file - * \brief jpt_to_j2k is a program to convert JPT-stream to J2K file - * - * \section impinst Implementing instructions - * This program takes two arguments. \n - * -# Input JPT file - * -# Output J2K file\n - * % ./jpt_to_j2k input.jpt output.j2k - */ - -#include -#include -#include -#include -#include -#include -#include "msgqueue_manager.h" - - -int main(int argc,char *argv[]) -{ - msgqueue_param_t *msgqueue; - int infd, outfd; - Byte8_t jptlen, j2klen; - struct stat sb; - Byte_t *jptstream, *j2kstream; - - if( argc < 3){ - fprintf( stderr, "Too few arguments:\n"); - fprintf( stderr, " - input jpt file\n"); - fprintf( stderr, " - output j2k file\n"); - return -1; - } - - if(( infd = open( argv[1], O_RDONLY)) == -1){ - fprintf( stderr, "file %s not exist\n", argv[1]); - return -1; - } - - if( fstat( infd, &sb) == -1){ - fprintf( stderr, "input file stream is broken\n"); - return -1; - } - jptlen = (Byte8_t)sb.st_size; - - jptstream = (Byte_t *)malloc( jptlen); - - if( read( infd, jptstream, jptlen) != jptlen){ - fprintf( stderr, "file reading error\n"); - free( jptstream); - return -1; - } - close(infd); - - msgqueue = gene_msgqueue( true, NULL); - parse_JPIPstream( jptstream, jptlen, 0, msgqueue); - - //print_msgqueue( msgqueue); - - j2kstream = recons_j2k( msgqueue, jptstream, msgqueue->first->csn, 0, &j2klen); - - delete_msgqueue( &msgqueue); - free( jptstream); - - - if(( outfd = open( argv[2], O_WRONLY|O_CREAT, S_IRWXU|S_IRWXG)) == -1){ - fprintf( stderr, "file %s open error\n", argv[2]); - return -1; - } - - if( write( outfd, j2kstream, j2klen) != j2klen) - fprintf( stderr, "j2k file write error\n"); - - free( j2kstream); - close(outfd); - - return 0; -} diff --git a/applications/jpip/tools/jpt_to_jp2.c b/applications/jpip/tools/jpt_to_jp2.c deleted file mode 100644 index 99c4321c..00000000 --- a/applications/jpip/tools/jpt_to_jp2.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * $Id: jpt_to_jp2.c 46 2011-02-17 14:50:55Z kaori $ - * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq - * Copyright (c) 2010-2011, Kaori Hagihara - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/*! \file - * \brief jpt_to_jp2 is a program to convert JPT-stream to JP2 file - * - * \section impinst Implementing instructions - * This program takes two arguments. \n - * -# Input JPT file - * -# Output JP2 file\n - * % ./jpt_to_jp2 input.jpt output.jp2 - */ - -#include -#include -#include -#include -#include -#include -#include "msgqueue_manager.h" -#include "byte_manager.h" -#include "ihdrbox_manager.h" -#include "metadata_manager.h" - -int main(int argc,char *argv[]) -{ - msgqueue_param_t *msgqueue; - int infd, outfd; - Byte8_t jptlen, jp2len; - struct stat sb; - Byte_t *jptstream, *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, " - output jp2 file\n"); - return -1; - } - - if(( infd = open( argv[1], O_RDONLY)) == -1){ - fprintf( stderr, "file %s not exist\n", argv[1]); - return -1; - } - - if( fstat( infd, &sb) == -1){ - fprintf( stderr, "input file stream is broken\n"); - return -1; - } - jptlen = (Byte8_t)sb.st_size; - - jptstream = (Byte_t *)malloc( jptlen); - - if( read( infd, jptstream, jptlen) != jptlen){ - fprintf( stderr, "file reading error\n"); - free( jptstream); - return -1; - } - close(infd); - - metadatalist = gene_metadatalist(); - msgqueue = gene_msgqueue( true, NULL); - parse_JPIPstream( jptstream, jptlen, 0, msgqueue); - parse_metamsg( msgqueue, jptstream, jptlen, metadatalist); - print_msgqueue( msgqueue); - //print_allmetadata( metadatalist); - - ihdrbox = get_ihdrbox( metadatalist, jptstream); - - 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); - - if(( outfd = open( argv[2], O_WRONLY|O_CREAT, S_IRWXU|S_IRWXG)) == -1){ - fprintf( stderr, "file %s open error\n", argv[2]); - return -1; - } - - if( write( outfd, jp2stream, jp2len) != jp2len) - fprintf( stderr, "jp2 file write error\n"); - - //print_msgqueue( msgqueue); - - free( ihdrbox); - free( jp2stream); - close(outfd); - - delete_msgqueue( &msgqueue); - delete_metadatalist( &metadatalist); - - free( jptstream); - - return 0; -} -- cgit v1.2.3