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

bug fixed for error concerning parameter name modification, Makefile.nix also corrected

This commit is contained in:
Kaori Hagihara 2011-07-06 19:40:26 +00:00
parent 875ac79d0e
commit 0358177c3f
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
applications/jpip/Makefile.nix
View File

@ -1,19 +1,19 @@
default: t_libopenjpip t_opj_server t_opj_dec_server t_tools default: t_libopenjpip t_opj_server t_opj_dec_server t_tools
t_libopenjpip: t_libopenjpip:
make -C libopenjpip make -C libopenjpip -f Makefile.nix
t_opj_server: t_opj_server:
make -C opj_server make -C opj_server -f Makefile.nix
t_opj_dec_server: t_opj_dec_server:
make -C opj_client/opj_dec_server make -C opj_client/opj_dec_server -f Makefile.nix
t_tools: t_tools:
make -C tools make -C tools -f Makefile.nix
clean: clean:
make clean -C libopenjpip make clean -C libopenjpip -f Makefile.nix
make clean -C opj_server make clean -C opj_server -f Makefile.nix
make clean -C opj_client/opj_dec_server make clean -C opj_client/opj_dec_server -f Makefile.nix
make clean -C tools make clean -C tools -f Makefile.nix

6
applications/jpip/libopenjpip/msgqueue_manager.c
View File

@ -744,7 +744,7 @@ Byte_t * recons_codestream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte
// main header first // main header first
ptr = msgqueue->first; ptr = msgqueue->first;
while(( ptr = search_message( MAINHEADER_MSG, -1, csn, ptr))!=NULL){ while(( ptr = search_message( MAINHEADER_MSG, -1, csn, ptr))!=NULL){
codestream = add_msgstream( ptr, stream, codestream, codelen); codestream = add_msgstream( ptr, jpipstream, codestream, codelen);
ptr = ptr->next; ptr = ptr->next;
} }
@ -755,14 +755,14 @@ Byte_t * recons_codestream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte
ptr = msgqueue->first; ptr = msgqueue->first;
while(( ptr = search_message( TILE_MSG, tileID, csn, ptr))!=NULL){ while(( ptr = search_message( TILE_MSG, tileID, csn, ptr))!=NULL){
found = true; found = true;
codestream = add_msgstream( ptr, stream, codestream, codelen); codestream = add_msgstream( ptr, jpipstream, codestream, codelen);
ptr = ptr->next; ptr = ptr->next;
} }
ptr = msgqueue->first; ptr = msgqueue->first;
while(( ptr = search_message( EXT_TILE_MSG, tileID, csn, ptr))!=NULL){ while(( ptr = search_message( EXT_TILE_MSG, tileID, csn, ptr))!=NULL){
if( ptr->aux >= minlev){ if( ptr->aux >= minlev){
found = true; found = true;
codestream = add_msgstream( ptr, stream, codestream, codelen); codestream = add_msgstream( ptr, jpipstream, codestream, codelen);
} }
ptr = ptr->next; ptr = ptr->next;
} }

4
applications/jpip/tools/Makefile.nix
View File

@ -8,7 +8,7 @@ ALL = jpip_to_jp2 jpip_to_j2k test_index addXMLinJP2
all: t_indexer $(ALL) all: t_indexer $(ALL)
t_indexer: t_indexer:
make -C indexer make -C indexer -f Makefile.nix
jpip_to_jp2: jpip_to_jp2.o $(LIBFNAME) jpip_to_jp2: jpip_to_jp2.o $(LIBFNAME)
$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
@ -21,4 +21,4 @@ test_index: test_index.o $(LIBFNAME)
clean: clean:
rm -f $(ALL) *.o *~ rm -f $(ALL) *.o *~
make clean -C indexer make clean -C indexer -f Makefile.nix