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

Apply patch from w. szukalski (sent to list). Mon, Jun 21, 2010 at 5:49 PM

This commit is contained in:
Mathieu Malaterre 2010-06-22 11:55:36 +00:00
parent 2374885ac0
commit 6621494d9d
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
June 22, 2010
+ [MM] Apply patch from w. szukalski (sent to list)
June 21, 2010 June 21, 2010
+ [MM] Added a j2k_dump to simply dump the parameter of a J2K file + [MM] Added a j2k_dump to simply dump the parameter of a J2K file

9
codec/Makefile
View File

@ -1,8 +1,8 @@
# Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k # Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
CFLAGS = -O3 -lstdc++ # -g -p -pg CFLAGS = -Wall -O3 -lstdc++ # -g -p -pg
all: j2k_to_image image_to_j2k all: j2k_to_image image_to_j2k j2k_dump
j2k_to_image: j2k_to_image.c ../libopenjpeg.a j2k_to_image: j2k_to_image.c ../libopenjpeg.a
gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff -lpng gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff -lpng
@ -10,5 +10,8 @@ j2k_to_image: j2k_to_image.c ../libopenjpeg.a
image_to_j2k: image_to_j2k.c ../libopenjpeg.a image_to_j2k: image_to_j2k.c ../libopenjpeg.a
gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff -lpng gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff -lpng
j2k_dump: j2k_dump.c ../libopenjpeg.a
gcc $(CFLAGS) compat/getopt.c index.c j2k_dump.c -o j2k_dump -L.. -lopenjpeg -I ../libopenjpeg/ -lm
clean: clean:
rm -f j2k_to_image image_to_j2k rm -f j2k_to_image image_to_j2k j2k_dump

2
codec/j2k_dump.c
View File

@ -317,7 +317,7 @@ int main(int argc, char *argv[])
int file_length; int file_length;
int num_images; int num_images;
int i,imageno; int i,imageno;
dircnt_t *dirptr; dircnt_t *dirptr = NULL;
opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */ opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */
opj_cio_t *cio = NULL; opj_cio_t *cio = NULL;
opj_codestream_info_t cstr_info; /* Codestream information structure */ opj_codestream_info_t cstr_info; /* Codestream information structure */

1
libopenjpeg/j2k.h
View File

@ -438,6 +438,7 @@ Encode an image into a JPEG-2000 codestream
*/ */
bool j2k_encode(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info); bool j2k_encode(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp);
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/*@}*/ /*@}*/