*
* JasPer License Version 2.0
*
+ * Copyright (c) 2001-2006 Michael David Adams
* Copyright (c) 1999-2000 Image Power, Inc.
* Copyright (c) 1999-2000 The University of British Columbia
- * Copyright (c) 2001-2003 Michael David Adams
*
* All rights reserved.
*
/*
* JPEG-2000 Code Stream Library
*
- * $Id: jpc_cs.c,v 1.1 2007/01/15 16:09:24 vp153 Exp $
+ * $Id: jpc_cs.c,v 1.2 2008/05/26 09:40:52 vp153 Exp $
*/
/******************************************************************************\
}
if (JAS_CAST(ulong, jas_stream_tell(tmpstream)) != ms->len) {
- fprintf(stderr,
- "warning: trailing garbage in marker segment (%ld bytes)\n",
+ jas_eprintf("warning: trailing garbage in marker segment (%ld bytes)\n",
ms->len - jas_stream_tell(tmpstream));
}
cod->compparms.cblksty);
if (cod->csty & JPC_COX_PRT) {
for (i = 0; i < cod->compparms.numrlvls; ++i) {
- fprintf(stderr, "prcwidth[%d] = %d, prcheight[%d] = %d\n",
+ jas_eprintf("prcwidth[%d] = %d, prcheight[%d] = %d\n",
i, cod->compparms.rlvls[i].parwidthval,
i, cod->compparms.rlvls[i].parheightval);
}
compparms->numstepsizes = (len - n) / 2;
break;
}
-if (compparms->numstepsizes > 0) {
- compparms->stepsizes = jas_malloc(compparms->numstepsizes *
- sizeof(uint_fast32_t));
- assert(compparms->stepsizes);
- for (i = 0; i < compparms->numstepsizes; ++i) {
- if (compparms->qntsty == JPC_QCX_NOQNT) {
- jpc_getuint8(in, &tmp);
- compparms->stepsizes[i] = JPC_QCX_EXPN(tmp >> 3);
- } else {
- jpc_getuint16(in, &compparms->stepsizes[i]);
+ if (compparms->numstepsizes > 0) {
+ compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+ sizeof(uint_fast16_t));
+ assert(compparms->stepsizes);
+ for (i = 0; i < compparms->numstepsizes; ++i) {
+ if (compparms->qntsty == JPC_QCX_NOQNT) {
+ jpc_getuint8(in, &tmp);
+ compparms->stepsizes[i] = JPC_QCX_EXPN(tmp >> 3);
+ } else {
+ jpc_getuint16(in, &compparms->stepsizes[i]);
+ }
}
+ } else {
+ compparms->stepsizes = 0;
}
-} else {
- compparms->stepsizes = 0;
-}
if (jas_stream_error(in) || jas_stream_eof(in)) {
jpc_qcx_destroycompparms(compparms);
return -1;