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

[trunk] one more round of warnings fixes

This commit is contained in:
Mathieu Malaterre 2012-03-26 16:18:58 +00:00
parent 1228e0e925
commit f2c2b3fc7a
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
applications/jpip/libopenjpip/dec_clientmsg_handler.c
View File

@ -31,6 +31,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h>
#include <limits.h>
#include "dec_clientmsg_handler.h" #include "dec_clientmsg_handler.h"
#include "ihdrbox_manager.h" #include "ihdrbox_manager.h"
#include "jpipstream_manager.h" #include "jpipstream_manager.h"
@ -58,6 +60,7 @@ void handle_JPIPstreamMSG( SOCKET connected_socket, cachelist_param_t *cachelist
metadatalist = gene_metadatalist(); metadatalist = gene_metadatalist();
parse_metamsg( msgqueue, *jpipstream, *streamlen, metadatalist); parse_metamsg( msgqueue, *jpipstream, *streamlen, metadatalist);
assert( msgqueue->last->csn < INT_MAX );
/* cid registration*/ /* cid registration*/
if( target != NULL){ if( target != NULL){
if((cache = search_cache( target, cachelist))){ if((cache = search_cache( target, cachelist))){
@ -67,12 +70,12 @@ void handle_JPIPstreamMSG( SOCKET connected_socket, cachelist_param_t *cachelist
add_cachecid( cid, cache); add_cachecid( cid, cache);
} }
else{ else{
cache = gene_cache( target, msgqueue->last->csn, tid, cid); cache = gene_cache( target, (int)msgqueue->last->csn, tid, cid);
insert_cache_into_list( cache, cachelist); insert_cache_into_list( cache, cachelist);
} }
} }
else else
cache = search_cacheBycsn( msgqueue->last->csn, cachelist); cache = search_cacheBycsn( (int)msgqueue->last->csn, cachelist);
if( cache->metadatalist) if( cache->metadatalist)
delete_metadatalist( &cache->metadatalist); delete_metadatalist( &cache->metadatalist);
@ -92,6 +95,7 @@ void handle_PNMreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_par
char *CIDorTID, tmp[10]; char *CIDorTID, tmp[10];
cache_param_t *cache; cache_param_t *cache;
int fw, fh; int fw, fh;
int maxval;
CIDorTID = receive_string( connected_socket); CIDorTID = receive_string( connected_socket);
@ -110,9 +114,11 @@ void handle_PNMreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_par
fh = atoi( tmp); fh = atoi( tmp);
ihdrbox = NULL; ihdrbox = NULL;
pnmstream = jpipstream_to_pnm( jpipstream, msgqueue, cache->csn, fw, fh, &ihdrbox); assert( cache->csn >= 0 );
pnmstream = jpipstream_to_pnm( jpipstream, msgqueue, (Byte8_t)cache->csn, fw, fh, &ihdrbox);
send_PNMstream( connected_socket, pnmstream, ihdrbox->width, ihdrbox->height, ihdrbox->nc, ihdrbox->bpc > 8 ? 255 : (1 << ihdrbox->bpc) - 1); maxval = ihdrbox->bpc > 8 ? 255 : (1 << ihdrbox->bpc) - 1;
send_PNMstream( connected_socket, pnmstream, ihdrbox->width, ihdrbox->height, ihdrbox->nc, (Byte_t)maxval );
free( ihdrbox); free( ihdrbox);
free( pnmstream); free( pnmstream);
@ -163,7 +169,7 @@ void handle_CIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist)
{ {
char *target, *cid = NULL; char *target, *cid = NULL;
cache_param_t *cache; cache_param_t *cache;
int cidlen = 0; OPJ_SIZE_T cidlen = 0;
target = receive_string( connected_socket); target = receive_string( connected_socket);
cache = search_cache( target, cachelist); cache = search_cache( target, cachelist);
@ -212,8 +218,9 @@ void handle_SIZreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_par
width = height = 0; width = height = 0;
if( cache){ if( cache){
assert( cache->csn >= 0);
if( !cache->ihdrbox) if( !cache->ihdrbox)
cache->ihdrbox = get_SIZ_from_jpipstream( jpipstream, msgqueue, cache->csn); cache->ihdrbox = get_SIZ_from_jpipstream( jpipstream, msgqueue, (Byte8_t)cache->csn);
width = cache->ihdrbox->width; width = cache->ihdrbox->width;
height = cache->ihdrbox->height; height = cache->ihdrbox->height;
} }
@ -235,7 +242,8 @@ void handle_JP2saveMSG( SOCKET connected_socket, cachelist_param_t *cachelist, m
free( cid); free( cid);
jp2stream = recons_jp2( msgqueue, jpipstream, cache->csn, &jp2len); assert( cache->csn >= 0);
jp2stream = recons_jp2( msgqueue, jpipstream, (Byte8_t)cache->csn, &jp2len);
if( jp2stream){ if( jp2stream){
save_codestream( jp2stream, jp2len, "jp2"); save_codestream( jp2stream, jp2len, "jp2");