[trunk] WIP: fix build error with windows configuration induced by rev 960
This commit is contained in:
parent
ee0e8a3aad
commit
fd67d46be7
3
CHANGES
3
CHANGES
|
@ -5,6 +5,9 @@ What's New for OpenJPEG
|
||||||
! : changed
|
! : changed
|
||||||
+ : added
|
+ : added
|
||||||
|
|
||||||
|
October 06, 2011
|
||||||
|
* [mickael] WIP: fix build errors with windows configuration induced by rev 960
|
||||||
|
|
||||||
October 05, 2011
|
October 05, 2011
|
||||||
+ [mickael] WIP: fix the decoding process with conformance files and V2 framework
|
+ [mickael] WIP: fix the decoding process with conformance files and V2 framework
|
||||||
|
|
||||||
|
|
|
@ -579,7 +579,7 @@ int main(int argc, char **argv)
|
||||||
opj_image_t image;
|
opj_image_t image;
|
||||||
opj_stream_t *cio = NULL; /* Stream */
|
opj_stream_t *cio = NULL; /* Stream */
|
||||||
opj_codec_t* dinfo = NULL; /* Handle to a decompressor */
|
opj_codec_t* dinfo = NULL; /* Handle to a decompressor */
|
||||||
|
opj_bool bRes1, bRes2;
|
||||||
|
|
||||||
|
|
||||||
char indexfilename[OPJ_PATH_LEN]; /* index file name */
|
char indexfilename[OPJ_PATH_LEN]; /* index file name */
|
||||||
|
@ -715,8 +715,8 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
|
|
||||||
/* Get the decoded image */
|
/* Get the decoded image */
|
||||||
opj_bool bRes1 = opj_decode_v2(dinfo, cio, &image);
|
bRes1 = opj_decode_v2(dinfo, cio, &image);
|
||||||
opj_bool bRes2 = opj_end_decompress(dinfo,cio);
|
bRes2 = opj_end_decompress(dinfo,cio);
|
||||||
|
|
||||||
/*if ( !(opj_decode_v2(dinfo, cio, &image)) || !(opj_end_decompress(dinfo,cio)) ) {*/
|
/*if ( !(opj_decode_v2(dinfo, cio, &image)) || !(opj_end_decompress(dinfo,cio)) ) {*/
|
||||||
if ( !bRes1 || !bRes2) {
|
if ( !bRes1 || !bRes2) {
|
||||||
|
|
Loading…
Reference in New Issue