X-Git-Url: https://main.carlh.net/gitweb/?p=openjpeg.git;a=blobdiff_plain;f=src%2Fbin%2Fjp2%2Fconvert.c;h=fa02e31c5a458a7d1a7e41b231756bc82d20ad0e;hp=d56f3904b9a9a3c87fa46cbfac809e63933ea276;hb=98363e244e027c731f73ee8239d3c19451a9153b;hpb=f1bae45c769e4360d9ed2e78fff5cb52fa6e4a8c diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c index d56f3904..fa02e31c 100644 --- a/src/bin/jp2/convert.c +++ b/src/bin/jp2/convert.c @@ -1,6 +1,6 @@ /* - * The copyright in this software is being made available under the 2-clauses - * BSD License, included below. This software may be subject to other third + * The copyright in this software is being made available under the 2-clauses + * BSD License, included below. This software may be subject to other third * party and contributor rights, including patent rights, and no such rights * are granted under this license. * @@ -8,7 +8,7 @@ * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2007, Francois-Olivier Devaux * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan @@ -41,15 +41,7 @@ #include #include #include - -#ifdef OPJ_HAVE_LIBTIFF -#include -#endif /* OPJ_HAVE_LIBTIFF */ - -#ifdef OPJ_HAVE_LIBPNG -#include -#include -#endif /* OPJ_HAVE_LIBPNG */ +#include #include "openjpeg.h" #include "convert.h" @@ -59,7 +51,8 @@ * * log2(a) */ -static int int_floorlog2(int a) { +static int int_floorlog2(int a) +{ int l; for (l = 0; a > 1; l++) { a >>= 1; @@ -70,80 +63,492 @@ static int int_floorlog2(int a) { /* Component precision scaling */ void clip_component(opj_image_comp_t* component, OPJ_UINT32 precision) { - OPJ_SIZE_T i; - OPJ_SIZE_T len; - OPJ_UINT32 umax = (OPJ_UINT32)((OPJ_INT32)-1); - - len = (OPJ_SIZE_T)component->w * (OPJ_SIZE_T)component->h; - if (precision < 32) { - umax = (1U << precision) - 1U; - } - - if (component->sgnd) { - OPJ_INT32* l_data = component->data; - OPJ_INT32 max = (OPJ_INT32)(umax / 2U); - OPJ_INT32 min = -max - 1; - for (i = 0; i < len; ++i) { - if (l_data[i] > max) { - l_data[i] = max; - } else if (l_data[i] < min) { - l_data[i] = min; - } - } - } else { - OPJ_UINT32* l_data = (OPJ_UINT32*)component->data; - for (i = 0; i < len; ++i) { - if (l_data[i] > umax) { - l_data[i] = umax; - } - } - } - component->prec = precision; + OPJ_SIZE_T i; + OPJ_SIZE_T len; + OPJ_UINT32 umax = (OPJ_UINT32)((OPJ_INT32) - 1); + + len = (OPJ_SIZE_T)component->w * (OPJ_SIZE_T)component->h; + if (precision < 32) { + umax = (1U << precision) - 1U; + } + + if (component->sgnd) { + OPJ_INT32* l_data = component->data; + OPJ_INT32 max = (OPJ_INT32)(umax / 2U); + OPJ_INT32 min = -max - 1; + for (i = 0; i < len; ++i) { + if (l_data[i] > max) { + l_data[i] = max; + } else if (l_data[i] < min) { + l_data[i] = min; + } + } + } else { + OPJ_UINT32* l_data = (OPJ_UINT32*)component->data; + for (i = 0; i < len; ++i) { + if (l_data[i] > umax) { + l_data[i] = umax; + } + } + } + component->prec = precision; } /* Component precision scaling */ +static void scale_component_up(opj_image_comp_t* component, + OPJ_UINT32 precision) +{ + OPJ_SIZE_T i, len; + + len = (OPJ_SIZE_T)component->w * (OPJ_SIZE_T)component->h; + if (component->sgnd) { + OPJ_INT64 newMax = (OPJ_INT64)(1U << (precision - 1)); + OPJ_INT64 oldMax = (OPJ_INT64)(1U << (component->prec - 1)); + OPJ_INT32* l_data = component->data; + for (i = 0; i < len; ++i) { + l_data[i] = (OPJ_INT32)(((OPJ_INT64)l_data[i] * newMax) / oldMax); + } + } else { + OPJ_UINT64 newMax = (OPJ_UINT64)((1U << precision) - 1U); + OPJ_UINT64 oldMax = (OPJ_UINT64)((1U << component->prec) - 1U); + OPJ_UINT32* l_data = (OPJ_UINT32*)component->data; + for (i = 0; i < len; ++i) { + l_data[i] = (OPJ_UINT32)(((OPJ_UINT64)l_data[i] * newMax) / oldMax); + } + } + component->prec = precision; + component->bpp = precision; +} void scale_component(opj_image_comp_t* component, OPJ_UINT32 precision) { - int shift; - OPJ_SIZE_T i; - OPJ_SIZE_T len; - - if (component->prec == precision) { - return; - } - if (component->prec < precision) { - shift = (int)(precision - component->prec); - } else { - shift = (int)(component->prec - precision); - } - len = (OPJ_SIZE_T)component->w * (OPJ_SIZE_T)component->h; - - if (component->sgnd) { - OPJ_INT32* l_data = component->data; - if (component->prec < precision) { - for (i = 0; i < len; ++i) { - l_data[i] <<= shift; - } - } else { - for (i = 0; i < len; ++i) { - l_data[i] >>= shift; - } - } - } else { - OPJ_UINT32* l_data = (OPJ_UINT32*)component->data; - if (component->prec < precision) { - for (i = 0; i < len; ++i) { - l_data[i] <<= shift; - } - } else { - for (i = 0; i < len; ++i) { - l_data[i] >>= shift; - } - } - } - component->prec = precision; + int shift; + OPJ_SIZE_T i, len; + + if (component->prec == precision) { + return; + } + if (component->prec < precision) { + scale_component_up(component, precision); + return; + } + shift = (int)(component->prec - precision); + len = (OPJ_SIZE_T)component->w * (OPJ_SIZE_T)component->h; + if (component->sgnd) { + OPJ_INT32* l_data = component->data; + for (i = 0; i < len; ++i) { + l_data[i] >>= shift; + } + } else { + OPJ_UINT32* l_data = (OPJ_UINT32*)component->data; + for (i = 0; i < len; ++i) { + l_data[i] >>= shift; + } + } + component->bpp = precision; + component->prec = precision; +} + + +/* planar / interleaved conversions */ +/* used by PNG/TIFF */ +static void convert_32s_C1P1(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst, + OPJ_SIZE_T length) +{ + memcpy(pDst[0], pSrc, length * sizeof(OPJ_INT32)); +} +static void convert_32s_C2P2(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + OPJ_INT32* pDst0 = pDst[0]; + OPJ_INT32* pDst1 = pDst[1]; + + for (i = 0; i < length; i++) { + pDst0[i] = pSrc[2 * i + 0]; + pDst1[i] = pSrc[2 * i + 1]; + } +} +static void convert_32s_C3P3(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + OPJ_INT32* pDst0 = pDst[0]; + OPJ_INT32* pDst1 = pDst[1]; + OPJ_INT32* pDst2 = pDst[2]; + + for (i = 0; i < length; i++) { + pDst0[i] = pSrc[3 * i + 0]; + pDst1[i] = pSrc[3 * i + 1]; + pDst2[i] = pSrc[3 * i + 2]; + } +} +static void convert_32s_C4P4(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + OPJ_INT32* pDst0 = pDst[0]; + OPJ_INT32* pDst1 = pDst[1]; + OPJ_INT32* pDst2 = pDst[2]; + OPJ_INT32* pDst3 = pDst[3]; + + for (i = 0; i < length; i++) { + pDst0[i] = pSrc[4 * i + 0]; + pDst1[i] = pSrc[4 * i + 1]; + pDst2[i] = pSrc[4 * i + 2]; + pDst3[i] = pSrc[4 * i + 3]; + } +} +const convert_32s_CXPX convert_32s_CXPX_LUT[5] = { + NULL, + convert_32s_C1P1, + convert_32s_C2P2, + convert_32s_C3P3, + convert_32s_C4P4 +}; + +static void convert_32s_P1C1(OPJ_INT32 const* const* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length, OPJ_INT32 adjust) +{ + OPJ_SIZE_T i; + const OPJ_INT32* pSrc0 = pSrc[0]; + + for (i = 0; i < length; i++) { + pDst[i] = pSrc0[i] + adjust; + } +} +static void convert_32s_P2C2(OPJ_INT32 const* const* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length, OPJ_INT32 adjust) +{ + OPJ_SIZE_T i; + const OPJ_INT32* pSrc0 = pSrc[0]; + const OPJ_INT32* pSrc1 = pSrc[1]; + + for (i = 0; i < length; i++) { + pDst[2 * i + 0] = pSrc0[i] + adjust; + pDst[2 * i + 1] = pSrc1[i] + adjust; + } +} +static void convert_32s_P3C3(OPJ_INT32 const* const* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length, OPJ_INT32 adjust) +{ + OPJ_SIZE_T i; + const OPJ_INT32* pSrc0 = pSrc[0]; + const OPJ_INT32* pSrc1 = pSrc[1]; + const OPJ_INT32* pSrc2 = pSrc[2]; + + for (i = 0; i < length; i++) { + pDst[3 * i + 0] = pSrc0[i] + adjust; + pDst[3 * i + 1] = pSrc1[i] + adjust; + pDst[3 * i + 2] = pSrc2[i] + adjust; + } +} +static void convert_32s_P4C4(OPJ_INT32 const* const* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length, OPJ_INT32 adjust) +{ + OPJ_SIZE_T i; + const OPJ_INT32* pSrc0 = pSrc[0]; + const OPJ_INT32* pSrc1 = pSrc[1]; + const OPJ_INT32* pSrc2 = pSrc[2]; + const OPJ_INT32* pSrc3 = pSrc[3]; + + for (i = 0; i < length; i++) { + pDst[4 * i + 0] = pSrc0[i] + adjust; + pDst[4 * i + 1] = pSrc1[i] + adjust; + pDst[4 * i + 2] = pSrc2[i] + adjust; + pDst[4 * i + 3] = pSrc3[i] + adjust; + } +} +const convert_32s_PXCX convert_32s_PXCX_LUT[5] = { + NULL, + convert_32s_P1C1, + convert_32s_P2C2, + convert_32s_P3C3, + convert_32s_P4C4 +}; + +/* bit depth conversions */ +/* used by PNG/TIFF up to 8bpp */ +static void convert_1u32s_C1R(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)7U); i += 8U) { + OPJ_UINT32 val = *pSrc++; + pDst[i + 0] = (OPJ_INT32)(val >> 7); + pDst[i + 1] = (OPJ_INT32)((val >> 6) & 0x1U); + pDst[i + 2] = (OPJ_INT32)((val >> 5) & 0x1U); + pDst[i + 3] = (OPJ_INT32)((val >> 4) & 0x1U); + pDst[i + 4] = (OPJ_INT32)((val >> 3) & 0x1U); + pDst[i + 5] = (OPJ_INT32)((val >> 2) & 0x1U); + pDst[i + 6] = (OPJ_INT32)((val >> 1) & 0x1U); + pDst[i + 7] = (OPJ_INT32)(val & 0x1U); + } + if (length & 7U) { + OPJ_UINT32 val = *pSrc++; + length = length & 7U; + pDst[i + 0] = (OPJ_INT32)(val >> 7); + + if (length > 1U) { + pDst[i + 1] = (OPJ_INT32)((val >> 6) & 0x1U); + if (length > 2U) { + pDst[i + 2] = (OPJ_INT32)((val >> 5) & 0x1U); + if (length > 3U) { + pDst[i + 3] = (OPJ_INT32)((val >> 4) & 0x1U); + if (length > 4U) { + pDst[i + 4] = (OPJ_INT32)((val >> 3) & 0x1U); + if (length > 5U) { + pDst[i + 5] = (OPJ_INT32)((val >> 2) & 0x1U); + if (length > 6U) { + pDst[i + 6] = (OPJ_INT32)((val >> 1) & 0x1U); + } + } + } + } + } + } + } +} +static void convert_2u32s_C1R(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)3U); i += 4U) { + OPJ_UINT32 val = *pSrc++; + pDst[i + 0] = (OPJ_INT32)(val >> 6); + pDst[i + 1] = (OPJ_INT32)((val >> 4) & 0x3U); + pDst[i + 2] = (OPJ_INT32)((val >> 2) & 0x3U); + pDst[i + 3] = (OPJ_INT32)(val & 0x3U); + } + if (length & 3U) { + OPJ_UINT32 val = *pSrc++; + length = length & 3U; + pDst[i + 0] = (OPJ_INT32)(val >> 6); + + if (length > 1U) { + pDst[i + 1] = (OPJ_INT32)((val >> 4) & 0x3U); + if (length > 2U) { + pDst[i + 2] = (OPJ_INT32)((val >> 2) & 0x3U); + + } + } + } +} +static void convert_4u32s_C1R(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)1U); i += 2U) { + OPJ_UINT32 val = *pSrc++; + pDst[i + 0] = (OPJ_INT32)(val >> 4); + pDst[i + 1] = (OPJ_INT32)(val & 0xFU); + } + if (length & 1U) { + OPJ_UINT8 val = *pSrc++; + pDst[i + 0] = (OPJ_INT32)(val >> 4); + } +} +static void convert_6u32s_C1R(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)3U); i += 4U) { + OPJ_UINT32 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + OPJ_UINT32 val2 = *pSrc++; + pDst[i + 0] = (OPJ_INT32)(val0 >> 2); + pDst[i + 1] = (OPJ_INT32)(((val0 & 0x3U) << 4) | (val1 >> 4)); + pDst[i + 2] = (OPJ_INT32)(((val1 & 0xFU) << 2) | (val2 >> 6)); + pDst[i + 3] = (OPJ_INT32)(val2 & 0x3FU); + + } + if (length & 3U) { + OPJ_UINT32 val0 = *pSrc++; + length = length & 3U; + pDst[i + 0] = (OPJ_INT32)(val0 >> 2); + + if (length > 1U) { + OPJ_UINT32 val1 = *pSrc++; + pDst[i + 1] = (OPJ_INT32)(((val0 & 0x3U) << 4) | (val1 >> 4)); + if (length > 2U) { + OPJ_UINT32 val2 = *pSrc++; + pDst[i + 2] = (OPJ_INT32)(((val1 & 0xFU) << 2) | (val2 >> 6)); + } + } + } +} +static void convert_8u32s_C1R(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < length; i++) { + pDst[i] = pSrc[i]; + } +} +const convert_XXx32s_C1R convert_XXu32s_C1R_LUT[9] = { + NULL, + convert_1u32s_C1R, + convert_2u32s_C1R, + NULL, + convert_4u32s_C1R, + NULL, + convert_6u32s_C1R, + NULL, + convert_8u32s_C1R +}; + + +static void convert_32s1u_C1R(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)7U); i += 8U) { + OPJ_UINT32 src0 = (OPJ_UINT32)pSrc[i + 0]; + OPJ_UINT32 src1 = (OPJ_UINT32)pSrc[i + 1]; + OPJ_UINT32 src2 = (OPJ_UINT32)pSrc[i + 2]; + OPJ_UINT32 src3 = (OPJ_UINT32)pSrc[i + 3]; + OPJ_UINT32 src4 = (OPJ_UINT32)pSrc[i + 4]; + OPJ_UINT32 src5 = (OPJ_UINT32)pSrc[i + 5]; + OPJ_UINT32 src6 = (OPJ_UINT32)pSrc[i + 6]; + OPJ_UINT32 src7 = (OPJ_UINT32)pSrc[i + 7]; + + *pDst++ = (OPJ_BYTE)((src0 << 7) | (src1 << 6) | (src2 << 5) | (src3 << 4) | + (src4 << 3) | (src5 << 2) | (src6 << 1) | src7); + } + + if (length & 7U) { + OPJ_UINT32 src0 = (OPJ_UINT32)pSrc[i + 0]; + OPJ_UINT32 src1 = 0U; + OPJ_UINT32 src2 = 0U; + OPJ_UINT32 src3 = 0U; + OPJ_UINT32 src4 = 0U; + OPJ_UINT32 src5 = 0U; + OPJ_UINT32 src6 = 0U; + length = length & 7U; + + if (length > 1U) { + src1 = (OPJ_UINT32)pSrc[i + 1]; + if (length > 2U) { + src2 = (OPJ_UINT32)pSrc[i + 2]; + if (length > 3U) { + src3 = (OPJ_UINT32)pSrc[i + 3]; + if (length > 4U) { + src4 = (OPJ_UINT32)pSrc[i + 4]; + if (length > 5U) { + src5 = (OPJ_UINT32)pSrc[i + 5]; + if (length > 6U) { + src6 = (OPJ_UINT32)pSrc[i + 6]; + } + } + } + } + } + } + *pDst++ = (OPJ_BYTE)((src0 << 7) | (src1 << 6) | (src2 << 5) | (src3 << 4) | + (src4 << 3) | (src5 << 2) | (src6 << 1)); + } +} + +static void convert_32s2u_C1R(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)3U); i += 4U) { + OPJ_UINT32 src0 = (OPJ_UINT32)pSrc[i + 0]; + OPJ_UINT32 src1 = (OPJ_UINT32)pSrc[i + 1]; + OPJ_UINT32 src2 = (OPJ_UINT32)pSrc[i + 2]; + OPJ_UINT32 src3 = (OPJ_UINT32)pSrc[i + 3]; + + *pDst++ = (OPJ_BYTE)((src0 << 6) | (src1 << 4) | (src2 << 2) | src3); + } + + if (length & 3U) { + OPJ_UINT32 src0 = (OPJ_UINT32)pSrc[i + 0]; + OPJ_UINT32 src1 = 0U; + OPJ_UINT32 src2 = 0U; + length = length & 3U; + + if (length > 1U) { + src1 = (OPJ_UINT32)pSrc[i + 1]; + if (length > 2U) { + src2 = (OPJ_UINT32)pSrc[i + 2]; + } + } + *pDst++ = (OPJ_BYTE)((src0 << 6) | (src1 << 4) | (src2 << 2)); + } +} + +static void convert_32s4u_C1R(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)1U); i += 2U) { + OPJ_UINT32 src0 = (OPJ_UINT32)pSrc[i + 0]; + OPJ_UINT32 src1 = (OPJ_UINT32)pSrc[i + 1]; + + *pDst++ = (OPJ_BYTE)((src0 << 4) | src1); + } + + if (length & 1U) { + OPJ_UINT32 src0 = (OPJ_UINT32)pSrc[i + 0]; + *pDst++ = (OPJ_BYTE)((src0 << 4)); + } } +static void convert_32s6u_C1R(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)3U); i += 4U) { + OPJ_UINT32 src0 = (OPJ_UINT32)pSrc[i + 0]; + OPJ_UINT32 src1 = (OPJ_UINT32)pSrc[i + 1]; + OPJ_UINT32 src2 = (OPJ_UINT32)pSrc[i + 2]; + OPJ_UINT32 src3 = (OPJ_UINT32)pSrc[i + 3]; + + *pDst++ = (OPJ_BYTE)((src0 << 2) | (src1 >> 4)); + *pDst++ = (OPJ_BYTE)(((src1 & 0xFU) << 4) | (src2 >> 2)); + *pDst++ = (OPJ_BYTE)(((src2 & 0x3U) << 6) | src3); + } + + if (length & 3U) { + OPJ_UINT32 src0 = (OPJ_UINT32)pSrc[i + 0]; + OPJ_UINT32 src1 = 0U; + OPJ_UINT32 src2 = 0U; + length = length & 3U; + + if (length > 1U) { + src1 = (OPJ_UINT32)pSrc[i + 1]; + if (length > 2U) { + src2 = (OPJ_UINT32)pSrc[i + 2]; + } + } + *pDst++ = (OPJ_BYTE)((src0 << 2) | (src1 >> 4)); + if (length > 1U) { + *pDst++ = (OPJ_BYTE)(((src1 & 0xFU) << 4) | (src2 >> 2)); + if (length > 2U) { + *pDst++ = (OPJ_BYTE)(((src2 & 0x3U) << 6)); + } + } + } +} +static void convert_32s8u_C1R(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < length; ++i) { + pDst[i] = (OPJ_BYTE)pSrc[i]; + } +} +const convert_32sXXx_C1R convert_32sXXu_C1R_LUT[9] = { + NULL, + convert_32s1u_C1R, + convert_32s2u_C1R, + NULL, + convert_32s4u_C1R, + NULL, + convert_32s6u_C1R, + NULL, + convert_32s8u_C1R +}; /* -->> -->> -->> -->> @@ -153,8 +558,7 @@ void scale_component(opj_image_comp_t* component, OPJ_UINT32 precision) #ifdef INFORMATION_ONLY /* TGA header definition. */ -struct tga_header -{ +struct tga_header { unsigned char id_length; /* Image id field length */ unsigned char colour_map_type; /* Colour map type */ unsigned char image_type; /* Image type */ @@ -176,67 +580,64 @@ struct tga_header }; #endif /* INFORMATION_ONLY */ -static unsigned short get_ushort(unsigned short val) { - -#ifdef OPJ_BIG_ENDIAN - return( ((val & 0xff) << 8) + (val >> 8) ); -#else - return( val ); -#endif - +/* Returns a ushort from a little-endian serialized value */ +static unsigned short get_tga_ushort(const unsigned char *data) +{ + return (unsigned short)(data[0] | (data[1] << 8)); } #define TGA_HEADER_SIZE 18 -static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, +static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, unsigned int *width, unsigned int *height, int *flip_image) { int palette_size; - unsigned char *tga ; + unsigned char tga[TGA_HEADER_SIZE]; unsigned char id_len, /*cmap_type,*/ image_type; unsigned char pixel_depth, image_desc; unsigned short /*cmap_index,*/ cmap_len, cmap_entry_size; unsigned short /*x_origin, y_origin,*/ image_w, image_h; - if (!bits_per_pixel || !width || !height || !flip_image) + if (!bits_per_pixel || !width || !height || !flip_image) { return 0; - tga = (unsigned char*)malloc(18); + } - if ( fread(tga, TGA_HEADER_SIZE, 1, fp) != 1 ) - { - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + if (fread(tga, TGA_HEADER_SIZE, 1, fp) != 1) { + fprintf(stderr, + "\nError: fread return a number of element different from the expected.\n"); return 0 ; } - id_len = (unsigned char)tga[0]; - /*cmap_type = (unsigned char)tga[1];*/ - image_type = (unsigned char)tga[2]; - /*cmap_index = get_ushort(*(unsigned short*)(&tga[3]));*/ - cmap_len = get_ushort(*(unsigned short*)(&tga[5])); - cmap_entry_size = (unsigned char)tga[7]; + id_len = tga[0]; + /*cmap_type = tga[1];*/ + image_type = tga[2]; + /*cmap_index = get_tga_ushort(&tga[3]);*/ + cmap_len = get_tga_ushort(&tga[5]); + cmap_entry_size = tga[7]; #if 0 - x_origin = get_ushort(*(unsigned short*)(&tga[8])); - y_origin = get_ushort(*(unsigned short*)(&tga[10])); + x_origin = get_tga_ushort(&tga[8]); + y_origin = get_tga_ushort(&tga[10]); #endif - image_w = get_ushort(*(unsigned short*)(&tga[12])); - image_h = get_ushort(*(unsigned short*)(&tga[14])); - pixel_depth = (unsigned char)tga[16]; - image_desc = (unsigned char)tga[17]; - - free(tga); + image_w = get_tga_ushort(&tga[12]); + image_h = get_tga_ushort(&tga[14]); + pixel_depth = tga[16]; + image_desc = tga[17]; *bits_per_pixel = (unsigned int)pixel_depth; *width = (unsigned int)image_w; *height = (unsigned int)image_h; /* Ignore tga identifier, if present ... */ - if (id_len) - { + if (id_len) { unsigned char *id = (unsigned char *) malloc(id_len); - if ( !fread(id, id_len, 1, fp) ) - { - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + if (id == 0) { + fprintf(stderr, "tga_readheader: memory out\n"); + return 0; + } + if (!fread(id, id_len, 1, fp)) { + fprintf(stderr, + "\nError: fread return a number of element different from the expected.\n"); free(id); return 0 ; } @@ -245,9 +646,8 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, /* Test for compressed formats ... not yet supported ... // Note :- 9 - RLE encoded palettized. - // 10 - RLE encoded RGB. */ - if (image_type > 8) - { + // 10 - RLE encoded RGB. */ + if (image_type > 8) { fprintf(stderr, "Sorry, compressed tga files are not currently supported.\n"); return 0 ; } @@ -255,10 +655,9 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, *flip_image = !(image_desc & 32); /* Palettized formats are not yet supported, skip over the palette, if present ... */ - palette_size = cmap_len * (cmap_entry_size/8); + palette_size = cmap_len * (cmap_entry_size / 8); - if (palette_size>0) - { + if (palette_size > 0) { fprintf(stderr, "File contains a palette - not yet supported."); fseek(fp, palette_size, SEEK_CUR); } @@ -267,68 +666,97 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, #ifdef OPJ_BIG_ENDIAN -static INLINE int16_t swap16(int16_t x) +static INLINE OPJ_UINT16 swap16(OPJ_UINT16 x) { - return((((u_int16_t)x & 0x00ffU) << 8) | - (((u_int16_t)x & 0xff00U) >> 8)); + return (OPJ_UINT16)(((x & 0x00ffU) << 8) | ((x & 0xff00U) >> 8)); } #endif -static int tga_writeheader(FILE *fp, int bits_per_pixel, int width, int height, +static int tga_writeheader(FILE *fp, int bits_per_pixel, int width, int height, OPJ_BOOL flip_image) { - unsigned short image_w, image_h, us0; + OPJ_UINT16 image_w, image_h, us0; unsigned char uc0, image_type; unsigned char pixel_depth, image_desc; - if (!bits_per_pixel || !width || !height) + if (!bits_per_pixel || !width || !height) { return 0; + } pixel_depth = 0; - if ( bits_per_pixel < 256 ) + if (bits_per_pixel < 256) { pixel_depth = (unsigned char)bits_per_pixel; - else{ - fprintf(stderr,"ERROR: Wrong bits per pixel inside tga_header"); + } else { + fprintf(stderr, "ERROR: Wrong bits per pixel inside tga_header"); return 0; } uc0 = 0; - if(fwrite(&uc0, 1, 1, fp) != 1) goto fails; /* id_length */ - if(fwrite(&uc0, 1, 1, fp) != 1) goto fails; /* colour_map_type */ + if (fwrite(&uc0, 1, 1, fp) != 1) { + goto fails; /* id_length */ + } + if (fwrite(&uc0, 1, 1, fp) != 1) { + goto fails; /* colour_map_type */ + } image_type = 2; /* Uncompressed. */ - if(fwrite(&image_type, 1, 1, fp) != 1) goto fails; + if (fwrite(&image_type, 1, 1, fp) != 1) { + goto fails; + } us0 = 0; - if(fwrite(&us0, 2, 1, fp) != 1) goto fails; /* colour_map_index */ - if(fwrite(&us0, 2, 1, fp) != 1) goto fails; /* colour_map_length */ - if(fwrite(&uc0, 1, 1, fp) != 1) goto fails; /* colour_map_entry_size */ + if (fwrite(&us0, 2, 1, fp) != 1) { + goto fails; /* colour_map_index */ + } + if (fwrite(&us0, 2, 1, fp) != 1) { + goto fails; /* colour_map_length */ + } + if (fwrite(&uc0, 1, 1, fp) != 1) { + goto fails; /* colour_map_entry_size */ + } - if(fwrite(&us0, 2, 1, fp) != 1) goto fails; /* x_origin */ - if(fwrite(&us0, 2, 1, fp) != 1) goto fails; /* y_origin */ + if (fwrite(&us0, 2, 1, fp) != 1) { + goto fails; /* x_origin */ + } + if (fwrite(&us0, 2, 1, fp) != 1) { + goto fails; /* y_origin */ + } image_w = (unsigned short)width; image_h = (unsigned short) height; #ifndef OPJ_BIG_ENDIAN - if(fwrite(&image_w, 2, 1, fp) != 1) goto fails; - if(fwrite(&image_h, 2, 1, fp) != 1) goto fails; + if (fwrite(&image_w, 2, 1, fp) != 1) { + goto fails; + } + if (fwrite(&image_h, 2, 1, fp) != 1) { + goto fails; + } #else image_w = swap16(image_w); image_h = swap16(image_h); - if(fwrite(&image_w, 2, 1, fp) != 1) goto fails; - if(fwrite(&image_h, 2, 1, fp) != 1) goto fails; + if (fwrite(&image_w, 2, 1, fp) != 1) { + goto fails; + } + if (fwrite(&image_h, 2, 1, fp) != 1) { + goto fails; + } #endif - if(fwrite(&pixel_depth, 1, 1, fp) != 1) goto fails; + if (fwrite(&pixel_depth, 1, 1, fp) != 1) { + goto fails; + } image_desc = 8; /* 8 bits per component. */ - if (flip_image) + if (flip_image) { image_desc |= 32; - if(fwrite(&image_desc, 1, 1, fp) != 1) goto fails; + } + if (fwrite(&image_desc, 1, 1, fp) != 1) { + goto fails; + } return 1; @@ -337,13 +765,14 @@ fails: return 0; } -opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters) { +opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters) +{ FILE *f; opj_image_t *image; unsigned int image_width, image_height, pixel_bit_depth; unsigned int x, y; - int flip_image=0; - opj_image_cmptparm_t cmptparm[4]; /* maximum 4 components */ + int flip_image = 0; + opj_image_cmptparm_t cmptparm[4]; /* maximum 4 components */ int numcomps; OPJ_COLOR_SPACE color_space; OPJ_BOOL mono ; @@ -357,28 +786,53 @@ opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters) { return 0; } - if (!tga_readheader(f, &pixel_bit_depth, &image_width, &image_height, &flip_image)) + if (!tga_readheader(f, &pixel_bit_depth, &image_width, &image_height, + &flip_image)) { + fclose(f); return NULL; + } /* We currently only support 24 & 32 bit tga's ... */ - if (!((pixel_bit_depth == 24) || (pixel_bit_depth == 32))) + if (!((pixel_bit_depth == 24) || (pixel_bit_depth == 32))) { + fclose(f); return NULL; + } /* initialize image components */ memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t)); - mono = (pixel_bit_depth == 8) || (pixel_bit_depth == 16); /* Mono with & without alpha. */ - save_alpha = (pixel_bit_depth == 16) || (pixel_bit_depth == 32); /* Mono with alpha, or RGB with alpha */ + mono = (pixel_bit_depth == 8) || + (pixel_bit_depth == 16); /* Mono with & without alpha. */ + save_alpha = (pixel_bit_depth == 16) || + (pixel_bit_depth == 32); /* Mono with alpha, or RGB with alpha */ if (mono) { color_space = OPJ_CLRSPC_GRAY; numcomps = save_alpha ? 2 : 1; - } - else { + } else { numcomps = save_alpha ? 4 : 3; color_space = OPJ_CLRSPC_SRGB; } + /* If the declared file size is > 10 MB, check that the file is big */ + /* enough to avoid excessive memory allocations */ + if (image_height != 0 && + image_width > 10000000U / image_height / (OPJ_UINT32)numcomps) { + char ch; + OPJ_UINT64 expected_file_size = + (OPJ_UINT64)image_width * image_height * (OPJ_UINT32)numcomps; + long curpos = ftell(f); + if (expected_file_size > (OPJ_UINT64)INT_MAX) { + expected_file_size = (OPJ_UINT64)INT_MAX; + } + fseek(f, (long)expected_file_size - 1, SEEK_SET); + if (fread(&ch, 1, 1, f) != 1) { + fclose(f); + return NULL; + } + fseek(f, curpos, SEEK_SET); + } + subsampling_dx = parameters->subsampling_dx; subsampling_dy = parameters->subsampling_dy; @@ -395,107 +849,117 @@ opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters) { /* create the image */ image = opj_image_create((OPJ_UINT32)numcomps, &cmptparm[0], color_space); - if (!image) + if (!image) { + fclose(f); return NULL; + } + /* set image offset and reference grid */ image->x0 = (OPJ_UINT32)parameters->image_offset_x0; image->y0 = (OPJ_UINT32)parameters->image_offset_y0; - image->x1 = !image->x0 ? (OPJ_UINT32)(image_width - 1) * (OPJ_UINT32)subsampling_dx + 1 : image->x0 + (OPJ_UINT32)(image_width - 1) * (OPJ_UINT32)subsampling_dx + 1; - image->y1 = !image->y0 ? (OPJ_UINT32)(image_height - 1) * (OPJ_UINT32)subsampling_dy + 1 : image->y0 + (OPJ_UINT32)(image_height - 1) * (OPJ_UINT32)subsampling_dy + 1; + image->x1 = !image->x0 ? (OPJ_UINT32)(image_width - 1) * + (OPJ_UINT32)subsampling_dx + 1 : image->x0 + (OPJ_UINT32)(image_width - 1) * + (OPJ_UINT32)subsampling_dx + 1; + image->y1 = !image->y0 ? (OPJ_UINT32)(image_height - 1) * + (OPJ_UINT32)subsampling_dy + 1 : image->y0 + (OPJ_UINT32)(image_height - 1) * + (OPJ_UINT32)subsampling_dy + 1; /* set image data */ - for (y=0; y < image_height; y++) - { + for (y = 0; y < image_height; y++) { int index; - if (flip_image) - index = (int)((image_height-y-1)*image_width); - else - index = (int)(y*image_width); + if (flip_image) { + index = (int)((image_height - y - 1) * image_width); + } else { + index = (int)(y * image_width); + } - if (numcomps==3) - { - for (x=0;xcomps[0].data[index]=r; - image->comps[1].data[index]=g; - image->comps[2].data[index]=b; + image->comps[0].data[index] = r; + image->comps[1].data[index] = g; + image->comps[2].data[index] = b; index++; } - } - else if (numcomps==4) - { - for (x=0;xcomps[0].data[index]=r; - image->comps[1].data[index]=g; - image->comps[2].data[index]=b; - image->comps[3].data[index]=a; + image->comps[0].data[index] = r; + image->comps[1].data[index] = g; + image->comps[2].data[index] = b; + image->comps[3].data[index] = a; index++; } - } - else { + } else { fprintf(stderr, "Currently unsupported bit depth : %s\n", filename); } } + fclose(f); return image; } -int imagetotga(opj_image_t * image, const char *outfile) { +int imagetotga(opj_image_t * image, const char *outfile) +{ int width, height, bpp, x, y; OPJ_BOOL write_alpha; unsigned int i; - int adjustR, adjustG, adjustB, fails; + int adjustR, adjustG = 0, adjustB = 0, fails; unsigned int alpha_channel; - float r,g,b,a; + float r, g, b, a; unsigned char value; float scale; FILE *fdest; @@ -508,11 +972,14 @@ int imagetotga(opj_image_t * image, const char *outfile) { return 1; } - for (i = 0; i < image->numcomps-1; i++) { - if ((image->comps[0].dx != image->comps[i+1].dx) - ||(image->comps[0].dy != image->comps[i+1].dy) - ||(image->comps[0].prec != image->comps[i+1].prec)) { - fprintf(stderr, "Unable to create a tga file with such J2K image charateristics."); + for (i = 0; i < image->numcomps - 1; i++) { + if ((image->comps[0].dx != image->comps[i + 1].dx) + || (image->comps[0].dy != image->comps[i + 1].dy) + || (image->comps[0].prec != image->comps[i + 1].prec) + || (image->comps[0].sgnd != image->comps[i + 1].sgnd)) { + fclose(fdest); + fprintf(stderr, + "Unable to create a tga file with such J2K image charateristics.\n"); return 1; } } @@ -521,90 +988,100 @@ int imagetotga(opj_image_t * image, const char *outfile) { height = (int)image->comps[0].h; /* Mono with alpha, or RGB with alpha. */ - write_alpha = (image->numcomps==2) || (image->numcomps==4); + write_alpha = (image->numcomps == 2) || (image->numcomps == 4); /* Write TGA header */ bpp = write_alpha ? 32 : 24; - if (!tga_writeheader(fdest, bpp, width , height, OPJ_TRUE)) - goto fin; + if (!tga_writeheader(fdest, bpp, width, height, OPJ_TRUE)) { + goto fin; + } - alpha_channel = image->numcomps-1; + alpha_channel = image->numcomps - 1; - scale = 255.0f / (float)((1<comps[0].prec)-1); + scale = 255.0f / (float)((1 << image->comps[0].prec) - 1); adjustR = (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0); - adjustG = (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0); - adjustB = (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0); - - for (y=0; y < height; y++) - { - unsigned int index= (unsigned int)(y*width); - - for (x=0; x < width; x++, index++) - { - r = (float)(image->comps[0].data[index] + adjustR); - - if (image->numcomps > 2) - { - g = (float)(image->comps[1].data[index] + adjustG); - b = (float)(image->comps[2].data[index] + adjustB); - } - else - {/* Greyscale ... */ - g = r; - b = r; - } - -/* TGA format writes BGR ... */ - if(b > 255.) b = 255.; else if(b < 0.) b = 0.; - value = (unsigned char)(b*scale); - res = fwrite(&value,1,1,fdest); - - if( res < 1 ) - { - fprintf(stderr, "failed to write 1 byte for %s\n", outfile); - goto fin; - } - if(g > 255.) g = 255.; else if(g < 0.) g = 0.; - value = (unsigned char)(g*scale); - res = fwrite(&value,1,1,fdest); - - if( res < 1 ) - { - fprintf(stderr, "failed to write 1 byte for %s\n", outfile); - goto fin; - } - if(r > 255.) r = 255.; else if(r < 0.) r = 0.; - value = (unsigned char)(r*scale); - res = fwrite(&value,1,1,fdest); - - if( res < 1 ) - { - fprintf(stderr, "failed to write 1 byte for %s\n", outfile); - goto fin; - } - - if (write_alpha) - { - a = (float)(image->comps[alpha_channel].data[index]); - if(a > 255.) a = 255.; else if(a < 0.) a = 0.; - value = (unsigned char)(a*scale); - res = fwrite(&value,1,1,fdest); - - if( res < 1 ) - { - fprintf(stderr, "failed to write 1 byte for %s\n", outfile); - goto fin; - } - } - } - } - fails = 0; + if (image->numcomps >= 3) { + adjustG = (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0); + adjustB = (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0); + } + + for (y = 0; y < height; y++) { + unsigned int index = (unsigned int)(y * width); + + for (x = 0; x < width; x++, index++) { + r = (float)(image->comps[0].data[index] + adjustR); + + if (image->numcomps > 2) { + g = (float)(image->comps[1].data[index] + adjustG); + b = (float)(image->comps[2].data[index] + adjustB); + } else { + /* Greyscale ... */ + g = r; + b = r; + } + + /* TGA format writes BGR ... */ + if (b > 255.) { + b = 255.; + } else if (b < 0.) { + b = 0.; + } + value = (unsigned char)(b * scale); + res = fwrite(&value, 1, 1, fdest); + + if (res < 1) { + fprintf(stderr, "failed to write 1 byte for %s\n", outfile); + goto fin; + } + if (g > 255.) { + g = 255.; + } else if (g < 0.) { + g = 0.; + } + value = (unsigned char)(g * scale); + res = fwrite(&value, 1, 1, fdest); + + if (res < 1) { + fprintf(stderr, "failed to write 1 byte for %s\n", outfile); + goto fin; + } + if (r > 255.) { + r = 255.; + } else if (r < 0.) { + r = 0.; + } + value = (unsigned char)(r * scale); + res = fwrite(&value, 1, 1, fdest); + + if (res < 1) { + fprintf(stderr, "failed to write 1 byte for %s\n", outfile); + goto fin; + } + + if (write_alpha) { + a = (float)(image->comps[alpha_channel].data[index]); + if (a > 255.) { + a = 255.; + } else if (a < 0.) { + a = 0.; + } + value = (unsigned char)(a * scale); + res = fwrite(&value, 1, 1, fdest); + + if (res < 1) { + fprintf(stderr, "failed to write 1 byte for %s\n", outfile); + goto fin; + } + } + } + } + fails = 0; fin: - fclose(fdest); + fclose(fdest); - return fails; + return fails; } /* -->> -->> -->> -->> @@ -617,9 +1094,9 @@ PGX IMAGE FORMAT static unsigned char readuchar(FILE * f) { unsigned char c1; - if ( !fread(&c1, 1, 1, f) ) - { - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + if (!fread(&c1, 1, 1, f)) { + fprintf(stderr, + "\nError: fread return a number of element different from the expected.\n"); return 0; } return c1; @@ -628,61 +1105,67 @@ static unsigned char readuchar(FILE * f) static unsigned short readushort(FILE * f, int bigendian) { unsigned char c1, c2; - if ( !fread(&c1, 1, 1, f) ) - { - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + if (!fread(&c1, 1, 1, f)) { + fprintf(stderr, + "\nError: fread return a number of element different from the expected.\n"); return 0; } - if ( !fread(&c2, 1, 1, f) ) - { - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + if (!fread(&c2, 1, 1, f)) { + fprintf(stderr, + "\nError: fread return a number of element different from the expected.\n"); return 0; } - if (bigendian) + if (bigendian) { return (unsigned short)((c1 << 8) + c2); - else + } else { return (unsigned short)((c2 << 8) + c1); + } } static unsigned int readuint(FILE * f, int bigendian) { unsigned char c1, c2, c3, c4; - if ( !fread(&c1, 1, 1, f) ) - { - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + if (!fread(&c1, 1, 1, f)) { + fprintf(stderr, + "\nError: fread return a number of element different from the expected.\n"); return 0; } - if ( !fread(&c2, 1, 1, f) ) - { - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + if (!fread(&c2, 1, 1, f)) { + fprintf(stderr, + "\nError: fread return a number of element different from the expected.\n"); return 0; } - if ( !fread(&c3, 1, 1, f) ) - { - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + if (!fread(&c3, 1, 1, f)) { + fprintf(stderr, + "\nError: fread return a number of element different from the expected.\n"); return 0; } - if ( !fread(&c4, 1, 1, f) ) - { - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + if (!fread(&c4, 1, 1, f)) { + fprintf(stderr, + "\nError: fread return a number of element different from the expected.\n"); return 0; } - if (bigendian) - return (unsigned int)(c1 << 24) + (unsigned int)(c2 << 16) + (unsigned int)(c3 << 8) + c4; - else - return (unsigned int)(c4 << 24) + (unsigned int)(c3 << 16) + (unsigned int)(c2 << 8) + c1; + if (bigendian) { + return (unsigned int)(c1 << 24) + (unsigned int)(c2 << 16) + (unsigned int)( + c3 << 8) + c4; + } else { + return (unsigned int)(c4 << 24) + (unsigned int)(c3 << 16) + (unsigned int)( + c2 << 8) + c1; + } } -opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) { +opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) +{ FILE *f = NULL; int w, h, prec; int i, numcomps, max; OPJ_COLOR_SPACE color_space; - opj_image_cmptparm_t cmptparm; /* maximum of 1 component */ + opj_image_cmptparm_t cmptparm; /* maximum of 1 component */ opj_image_t * image = NULL; int adjustS, ushift, dshift, force8; + OPJ_UINT64 expected_file_size; - char endian1,endian2,sign; + char endian1, endian2, sign; char signtmp[32]; char temp[32]; @@ -703,49 +1186,87 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) { } fseek(f, 0, SEEK_SET); - if( fscanf(f, "PG%[ \t]%c%c%[ \t+-]%d%[ \t]%d%[ \t]%d",temp,&endian1,&endian2,signtmp,&prec,temp,&w,temp,&h) != 9){ - fprintf(stderr, "ERROR: Failed to read the right number of element from the fscanf() function!\n"); + if (fscanf(f, "PG%31[ \t]%c%c%31[ \t+-]%d%31[ \t]%d%31[ \t]%d", temp, &endian1, + &endian2, signtmp, &prec, temp, &w, temp, &h) != 9) { + fclose(f); + fprintf(stderr, + "ERROR: Failed to read the right number of element from the fscanf() function!\n"); return NULL; } - i=0; - sign='+'; - while (signtmp[i]!='\0') { - if (signtmp[i]=='-') sign='-'; + i = 0; + sign = '+'; + while (signtmp[i] != '\0') { + if (signtmp[i] == '-') { + sign = '-'; + } i++; } fgetc(f); - if (endian1=='M' && endian2=='L') { + if (endian1 == 'M' && endian2 == 'L') { bigendian = 1; - } else if (endian2=='M' && endian1=='L') { + } else if (endian2 == 'M' && endian1 == 'L') { bigendian = 0; } else { + fclose(f); + fprintf(stderr, "Bad pgx header, please check input file\n"); + return NULL; + } + + if (w < 1 || h < 1 || prec < 1 || prec > 31) { + fclose(f); fprintf(stderr, "Bad pgx header, please check input file\n"); return NULL; } + expected_file_size = + (OPJ_UINT64)w * (OPJ_UINT64)h * (prec > 16 ? 4 : prec > 8 ? 2 : 1); + if (expected_file_size > 10000000U) { + char ch; + long curpos = ftell(f); + if (expected_file_size > (OPJ_UINT64)INT_MAX) { + expected_file_size = (OPJ_UINT64)INT_MAX; + } + fseek(f, (long)expected_file_size - 1, SEEK_SET); + if (fread(&ch, 1, 1, f) != 1) { + fprintf(stderr, "File too short\n"); + fclose(f); + return NULL; + } + fseek(f, curpos, SEEK_SET); + } + /* initialize image component */ cmptparm.x0 = (OPJ_UINT32)parameters->image_offset_x0; cmptparm.y0 = (OPJ_UINT32)parameters->image_offset_y0; - cmptparm.w = !cmptparm.x0 ? (OPJ_UINT32)((w - 1) * parameters->subsampling_dx + 1) : cmptparm.x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)parameters->subsampling_dx + 1; - cmptparm.h = !cmptparm.y0 ? (OPJ_UINT32)((h - 1) * parameters->subsampling_dy + 1) : cmptparm.y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)parameters->subsampling_dy + 1; + cmptparm.w = !cmptparm.x0 ? (OPJ_UINT32)((w - 1) * parameters->subsampling_dx + + 1) : cmptparm.x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)parameters->subsampling_dx + + 1; + cmptparm.h = !cmptparm.y0 ? (OPJ_UINT32)((h - 1) * parameters->subsampling_dy + + 1) : cmptparm.y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)parameters->subsampling_dy + + 1; if (sign == '-') { cmptparm.sgnd = 1; } else { cmptparm.sgnd = 0; } - if(prec < 8) - { + if (prec < 8) { force8 = 1; - ushift = 8 - prec; dshift = prec - ushift; - if(cmptparm.sgnd) adjustS = (1<<(prec - 1)); else adjustS = 0; + ushift = 8 - prec; + dshift = prec - ushift; + if (cmptparm.sgnd) { + adjustS = (1 << (prec - 1)); + } else { + adjustS = 0; + } cmptparm.sgnd = 0; prec = 8; + } else { + ushift = dshift = force8 = adjustS = 0; } - else ushift = dshift = force8 = adjustS = 0; cmptparm.prec = (OPJ_UINT32)prec; cmptparm.bpp = (OPJ_UINT32)prec; @@ -754,7 +1275,7 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) { /* create the image */ image = opj_image_create((OPJ_UINT32)numcomps, &cmptparm, color_space); - if(!image) { + if (!image) { fclose(f); return NULL; } @@ -770,13 +1291,14 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) { for (i = 0; i < w * h; i++) { int v; - if(force8) - { + if (force8) { v = readuchar(f) + adjustS; - v = (v<>dshift); + v = (v << ushift) + (v >> dshift); comp->data[i] = (unsigned char)v; - if(v > max) max = v; + if (v > max) { + max = v; + } continue; } @@ -799,8 +1321,9 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) { v = (int) readuint(f, bigendian); } } - if (v > max) + if (v > max) { max = v; + } comp->data[i] = v; } fclose(f); @@ -809,145 +1332,209 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) { return image; } -#define CLAMP(x,a,b) x < a ? a : (x > b ? b : x) +#define CLAMP(x,a,b) ((x) < (a) ? (a) : ((x) > (b) ? (b) : (x))) -static INLINE int clamp( const int value, const int prec, const int sgnd ) +static INLINE int clamp(const int value, const int prec, const int sgnd) { - if( sgnd ) - { - if (prec <= 8) return CLAMP(value,-128,127); - else if (prec <= 16) return CLAMP(value,-32768,32767); - else return CLAMP(value,-2147483647-1,2147483647); - } - else - { - if (prec <= 8) return CLAMP(value,0,255); - else if (prec <= 16) return CLAMP(value,0,65535); - else return value; /*CLAMP(value,0,4294967295);*/ + if (sgnd) { + if (prec <= 8) { + return CLAMP(value, -128, 127); + } else if (prec <= 16) { + return CLAMP(value, -32768, 32767); + } else { + return CLAMP(value, -2147483647 - 1, 2147483647); + } + } else { + if (prec <= 8) { + return CLAMP(value, 0, 255); + } else if (prec <= 16) { + return CLAMP(value, 0, 65535); + } else { + return value; /*CLAMP(value,0,4294967295);*/ + } } } -int imagetopgx(opj_image_t * image, const char *outfile) +int imagetopgx(opj_image_t * image, const char *outfile) { - int w, h; - int i, j, fails = 1; - unsigned int compno; - FILE *fdest = NULL; - - for (compno = 0; compno < image->numcomps; compno++) - { - opj_image_comp_t *comp = &image->comps[compno]; - char bname[256]; /* buffer for name */ - char *name = bname; /* pointer */ - int nbytes = 0; - size_t res; - const size_t olen = strlen(outfile); - const size_t dotpos = olen - 4; - const size_t total = dotpos + 1 + 1 + 4; /* '-' + '[1-3]' + '.pgx' */ - - if( outfile[dotpos] != '.' ) - { - /* `pgx` was recognized but there is no dot at expected position */ - fprintf(stderr, "ERROR -> Impossible happen." ); - goto fin; - } - if( total > 256 ) - { - name = (char*)malloc(total+1); - } - strncpy(name, outfile, dotpos); - sprintf(name+dotpos, "_%d.pgx", compno); - fdest = fopen(name, "wb"); - /* dont need name anymore */ - if( total > 256 ) free(name); - if (!fdest) - { - fprintf(stderr, "ERROR -> failed to open %s for writing\n", name); - goto fin; - } - - w = (int)image->comps[compno].w; - h = (int)image->comps[compno].h; - - fprintf(fdest, "PG ML %c %d %d %d\n", comp->sgnd ? '-' : '+', comp->prec, - w, h); - - if (comp->prec <= 8) - nbytes = 1; - else if (comp->prec <= 16) - nbytes = 2; - else - nbytes = 4; - - for (i = 0; i < w * h; i++) - { - /* FIXME: clamp func is being called within a loop */ - const int val = clamp(image->comps[compno].data[i], - (int)comp->prec, (int)comp->sgnd); - - for (j = nbytes - 1; j >= 0; j--) - { - int v = (int)(val >> (j * 8)); - unsigned char byte = (unsigned char)v; - res = fwrite(&byte, 1, 1, fdest); - - if( res < 1 ) - { - fprintf(stderr, "failed to write 1 byte for %s\n", name); - goto fin; - } - } - } - fclose(fdest); fdest = NULL; - } - fails = 0; -fin: - if(fdest) fclose(fdest); + int w, h; + int i, j, fails = 1; + unsigned int compno; + FILE *fdest = NULL; - return fails; -} + for (compno = 0; compno < image->numcomps; compno++) { + opj_image_comp_t *comp = &image->comps[compno]; + char bname[256]; /* buffer for name */ + char *name = bname; /* pointer */ + int nbytes = 0; + size_t res; + const size_t olen = strlen(outfile); + const size_t dotpos = olen - 4; + const size_t total = dotpos + 1 + 1 + 4; /* '-' + '[1-3]' + '.pgx' */ + + if (outfile[dotpos] != '.') { + /* `pgx` was recognized but there is no dot at expected position */ + fprintf(stderr, "ERROR -> Impossible happen."); + goto fin; + } + if (total > 256) { + name = (char*)malloc(total + 1); + if (name == NULL) { + fprintf(stderr, "imagetopgx: memory out\n"); + goto fin; + } + } + strncpy(name, outfile, dotpos); + sprintf(name + dotpos, "_%u.pgx", compno); + fdest = fopen(name, "wb"); + /* don't need name anymore */ -/* -->> -->> -->> -->> + if (!fdest) { -PNM IMAGE FORMAT + fprintf(stderr, "ERROR -> failed to open %s for writing\n", name); + if (total > 256) { + free(name); + } + goto fin; + } -<<-- <<-- <<-- <<-- */ + w = (int)image->comps[compno].w; + h = (int)image->comps[compno].h; -struct pnm_header -{ - int width, height, maxval, depth, format; - char rgb, rgba, gray, graya, bw; - char ok; -}; + fprintf(fdest, "PG ML %c %d %d %d\n", comp->sgnd ? '-' : '+', comp->prec, + w, h); -static char *skip_white(char *s) -{ - while(*s) - { - if(*s == '\n' || *s == '\r') return NULL; - if(isspace(*s)) { ++s; continue; } - return s; - } - return NULL; -} + if (comp->prec <= 8) { + nbytes = 1; + } else if (comp->prec <= 16) { + nbytes = 2; + } else { + nbytes = 4; + } + + if (nbytes == 1) { + unsigned char* line_buffer = malloc((size_t)w); + if (line_buffer == NULL) { + fprintf(stderr, "Out of memory"); + if (total > 256) { + free(name); + } + goto fin; + } + for (j = 0; j < h; j++) { + if (comp->prec == 8 && comp->sgnd == 0) { + for (i = 0; i < w; i++) { + line_buffer[i] = (unsigned char)CLAMP(image->comps[compno].data[j * w + i], 0, + 255); + } + } else { + for (i = 0; i < w; i++) { + line_buffer[i] = (unsigned char) + clamp(image->comps[compno].data[j * w + i], + (int)comp->prec, (int)comp->sgnd); + } + } + res = fwrite(line_buffer, 1, (size_t)w, fdest); + if (res != (size_t)w) { + fprintf(stderr, "failed to write %d bytes for %s\n", w, name); + if (total > 256) { + free(name); + } + free(line_buffer); + goto fin; + } + } + free(line_buffer); + } else { + + for (i = 0; i < w * h; i++) { + /* FIXME: clamp func is being called within a loop */ + const int val = clamp(image->comps[compno].data[i], + (int)comp->prec, (int)comp->sgnd); + + for (j = nbytes - 1; j >= 0; j--) { + int v = (int)(val >> (j * 8)); + unsigned char byte = (unsigned char)v; + res = fwrite(&byte, 1, 1, fdest); + + if (res < 1) { + fprintf(stderr, "failed to write 1 byte for %s\n", name); + if (total > 256) { + free(name); + } + goto fin; + } + } + } + } + + if (total > 256) { + free(name); + } + fclose(fdest); + fdest = NULL; + } + fails = 0; +fin: + if (fdest) { + fclose(fdest); + } + + return fails; +} + +/* -->> -->> -->> -->> + +PNM IMAGE FORMAT + +<<-- <<-- <<-- <<-- */ + +struct pnm_header { + int width, height, maxval, depth, format; + char rgb, rgba, gray, graya, bw; + char ok; +}; + +static char *skip_white(char *s) +{ + if (s != NULL) { + while (*s) { + if (*s == '\n' || *s == '\r') { + return NULL; + } + if (isspace(*s)) { + ++s; + continue; + } + return s; + } + } + return NULL; +} static char *skip_int(char *start, int *out_n) { char *s; char c; - *out_n = 0; s = start; + *out_n = 0; s = skip_white(start); - if(s == NULL) return NULL; + if (s == NULL) { + return NULL; + } start = s; - while(*s) - { - if( !isdigit(*s)) break; + while (*s) { + if (!isdigit(*s)) { + break; + } ++s; } - c = *s; *s = 0; *out_n = atoi(start); *s = c; + c = *s; + *s = 0; + *out_n = atoi(start); + *s = c; return s; } @@ -957,179 +1544,194 @@ static char *skip_idf(char *start, char out_idf[256]) char c; s = skip_white(start); - if(s == NULL) return NULL; + if (s == NULL) { + return NULL; + } start = s; - while(*s) - { - if(isalpha(*s) || *s == '_') { ++s; continue; } + while (*s) { + if (isalpha(*s) || *s == '_') { + ++s; + continue; + } break; } - c = *s; *s = 0; strncpy(out_idf, start, 255); *s = c; + c = *s; + *s = 0; + strncpy(out_idf, start, 255); + *s = c; return s; } static void read_pnm_header(FILE *reader, struct pnm_header *ph) { - int format, have_wh, end, ttype; + int format, end, ttype; char idf[256], type[256]; char line[256]; - if (fgets(line, 250, reader) == NULL) - { - fprintf(stderr,"\nWARNING: fgets return a NULL value"); + if (fgets(line, 250, reader) == NULL) { + fprintf(stderr, "\nWARNING: fgets return a NULL value"); return; } - if(line[0] != 'P') - { - fprintf(stderr,"read_pnm_header:PNM:magic P missing\n"); return; + if (line[0] != 'P') { + fprintf(stderr, "read_pnm_header:PNM:magic P missing\n"); + return; } format = atoi(line + 1); - if(format < 1 || format > 7) - { - fprintf(stderr,"read_pnm_header:magic format %d invalid\n", format); + if (format < 1 || format > 7) { + fprintf(stderr, "read_pnm_header:magic format %d invalid\n", format); return; } ph->format = format; - ttype = end = have_wh = 0; + ttype = end = 0; - while(fgets(line, 250, reader)) - { + while (fgets(line, 250, reader)) { char *s; + int allow_null = 0; - if(*line == '#') continue; + if (*line == '#') { + continue; + } s = line; - if(format == 7) - { + if (format == 7) { s = skip_idf(s, idf); - if(s == NULL || *s == 0) return; + if (s == NULL || *s == 0) { + return; + } - if(strcmp(idf, "ENDHDR") == 0) - { - end = 1; break; + if (strcmp(idf, "ENDHDR") == 0) { + end = 1; + break; } - if(strcmp(idf, "WIDTH") == 0) - { + if (strcmp(idf, "WIDTH") == 0) { s = skip_int(s, &ph->width); - if(s == NULL || *s == 0) return; + if (s == NULL || *s == 0) { + return; + } continue; } - if(strcmp(idf, "HEIGHT") == 0) - { + if (strcmp(idf, "HEIGHT") == 0) { s = skip_int(s, &ph->height); - if(s == NULL || *s == 0) return; + if (s == NULL || *s == 0) { + return; + } continue; } - if(strcmp(idf, "DEPTH") == 0) - { + if (strcmp(idf, "DEPTH") == 0) { s = skip_int(s, &ph->depth); - if(s == NULL || *s == 0) return; + if (s == NULL || *s == 0) { + return; + } continue; } - if(strcmp(idf, "MAXVAL") == 0) - { + if (strcmp(idf, "MAXVAL") == 0) { s = skip_int(s, &ph->maxval); - if(s == NULL || *s == 0) return; + if (s == NULL || *s == 0) { + return; + } continue; } - if(strcmp(idf, "TUPLTYPE") == 0) - { + if (strcmp(idf, "TUPLTYPE") == 0) { s = skip_idf(s, type); - if(s == NULL || *s == 0) return; + if (s == NULL || *s == 0) { + return; + } - if(strcmp(type, "BLACKANDWHITE") == 0) - { - ph->bw = 1; ttype = 1; continue; + if (strcmp(type, "BLACKANDWHITE") == 0) { + ph->bw = 1; + ttype = 1; + continue; } - if(strcmp(type, "GRAYSCALE") == 0) - { - ph->gray = 1; ttype = 1; continue; + if (strcmp(type, "GRAYSCALE") == 0) { + ph->gray = 1; + ttype = 1; + continue; } - if(strcmp(type, "GRAYSCALE_ALPHA") == 0) - { - ph->graya = 1; ttype = 1; continue; + if (strcmp(type, "GRAYSCALE_ALPHA") == 0) { + ph->graya = 1; + ttype = 1; + continue; } - if(strcmp(type, "RGB") == 0) - { - ph->rgb = 1; ttype = 1; continue; + if (strcmp(type, "RGB") == 0) { + ph->rgb = 1; + ttype = 1; + continue; } - if(strcmp(type, "RGB_ALPHA") == 0) - { - ph->rgba = 1; ttype = 1; continue; + if (strcmp(type, "RGB_ALPHA") == 0) { + ph->rgba = 1; + ttype = 1; + continue; } - fprintf(stderr,"read_pnm_header:unknown P7 TUPLTYPE %s\n",type); + fprintf(stderr, "read_pnm_header:unknown P7 TUPLTYPE %s\n", type); return; } - fprintf(stderr,"read_pnm_header:unknown P7 idf %s\n",idf); + fprintf(stderr, "read_pnm_header:unknown P7 idf %s\n", idf); return; } /* if(format == 7) */ - if( !have_wh) - { + /* Here format is in range [1,6] */ + if (ph->width == 0) { s = skip_int(s, &ph->width); - + if ((s == NULL) || (*s == 0) || (ph->width < 1)) { + return; + } + allow_null = 1; + } + if (ph->height == 0) { s = skip_int(s, &ph->height); - - have_wh = 1; - - if(format == 1 || format == 4) break; - - if(format == 2 || format == 3 || format == 5 || format == 6) - { - if (skip_int(s, &ph->maxval) != NULL) { - if(ph->maxval > 65535) { - return; - } - else { - break; - } - } + if ((s == NULL) && allow_null) { + continue; } + if ((s == NULL) || (*s == 0) || (ph->height < 1)) { + return; + } + if (format == 1 || format == 4) { + break; + } + allow_null = 1; + } + /* here, format is in P2, P3, P5, P6 */ + s = skip_int(s, &ph->maxval); + if ((s == NULL) && allow_null) { continue; } - if(format == 2 || format == 3 || format == 5 || format == 6) - { - /* P2, P3, P5, P6: */ - s = skip_int(s, &ph->maxval); - - if(ph->maxval > 65535) return; + if ((s == NULL) || (*s == 0)) { + return; } break; }/* while(fgets( ) */ - if(format == 2 || format == 3 || format > 4) - { - if(ph->maxval < 1 || ph->maxval > 65535) return; + if (format == 2 || format == 3 || format > 4) { + if (ph->maxval < 1 || ph->maxval > 65535) { + return; + } + } + if (ph->width < 1 || ph->height < 1) { + return; } - if(ph->width < 1 || ph->height < 1) return; - if(format == 7) - { - if(!end) - { - fprintf(stderr,"read_pnm_header:P7 without ENDHDR\n"); return; + if (format == 7) { + if (!end) { + fprintf(stderr, "read_pnm_header:P7 without ENDHDR\n"); + return; + } + if (ph->depth < 1 || ph->depth > 4) { + return; } - if(ph->depth < 1 || ph->depth > 4) return; - if(ph->width && ph->height && ph->depth && ph->maxval && ttype) + if (ttype) { ph->ok = 1; - } - else - { - if(format != 1 && format != 4) - { - if(ph->width && ph->height && ph->maxval) ph->ok = 1; } - else - { - if(ph->width && ph->height) ph->ok = 1; + } else { + ph->ok = 1; + if (format == 1 || format == 4) { ph->maxval = 255; } } @@ -1137,25 +1739,56 @@ static void read_pnm_header(FILE *reader, struct pnm_header *ph) static int has_prec(int val) { - if(val < 2) return 1; - if(val < 4) return 2; - if(val < 8) return 3; - if(val < 16) return 4; - if(val < 32) return 5; - if(val < 64) return 6; - if(val < 128) return 7; - if(val < 256) return 8; - if(val < 512) return 9; - if(val < 1024) return 10; - if(val < 2048) return 11; - if(val < 4096) return 12; - if(val < 8192) return 13; - if(val < 16384) return 14; - if(val < 32768) return 15; + if (val < 2) { + return 1; + } + if (val < 4) { + return 2; + } + if (val < 8) { + return 3; + } + if (val < 16) { + return 4; + } + if (val < 32) { + return 5; + } + if (val < 64) { + return 6; + } + if (val < 128) { + return 7; + } + if (val < 256) { + return 8; + } + if (val < 512) { + return 9; + } + if (val < 1024) { + return 10; + } + if (val < 2048) { + return 11; + } + if (val < 4096) { + return 12; + } + if (val < 8192) { + return 13; + } + if (val < 16384) { + return 14; + } + if (val < 32768) { + return 15; + } return 16; } -opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { +opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) +{ int subsampling_dx = parameters->subsampling_dx; int subsampling_dy = parameters->subsampling_dy; @@ -1166,21 +1799,38 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { opj_image_t * image = NULL; struct pnm_header header_info; - if((fp = fopen(filename, "rb")) == NULL) - { - fprintf(stderr, "pnmtoimage:Failed to open %s for reading!\n",filename); + if ((fp = fopen(filename, "rb")) == NULL) { + fprintf(stderr, "pnmtoimage:Failed to open %s for reading!\n", filename); return NULL; } memset(&header_info, 0, sizeof(struct pnm_header)); read_pnm_header(fp, &header_info); - if(!header_info.ok) { fclose(fp); return NULL; } + if (!header_info.ok) { + fclose(fp); + return NULL; + } + + if (header_info.width == 0 + || header_info.height == 0 + || (header_info.format == 7 && header_info.depth == 0)) { + fclose(fp); + return NULL; + } + + /* This limitation could be removed by making sure to use size_t below */ + if (header_info.height != 0 && + header_info.width > INT_MAX / header_info.height) { + fprintf(stderr, "pnmtoimage:Image %dx%d too big!\n", + header_info.width, header_info.height); + fclose(fp); + return NULL; + } format = header_info.format; - switch(format) - { + switch (format) { case 1: /* ascii bitmap */ case 4: /* raw bitmap */ numcomps = 1; @@ -1200,16 +1850,21 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { numcomps = header_info.depth; break; - default: fclose(fp); return NULL; + default: + fclose(fp); + return NULL; + } + if (numcomps < 3) { + color_space = OPJ_CLRSPC_GRAY; /* GRAY, GRAYA */ + } else { + color_space = OPJ_CLRSPC_SRGB; /* RGB, RGBA */ } - if(numcomps < 3) - color_space = OPJ_CLRSPC_GRAY;/* GRAY, GRAYA */ - else - color_space = OPJ_CLRSPC_SRGB;/* RGB, RGBA */ prec = has_prec(header_info.maxval); - if(prec < 8) prec = 8; + if (prec < 8) { + prec = 8; + } w = header_info.width; h = header_info.height; @@ -1218,8 +1873,7 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { memset(&cmptparm[0], 0, (size_t)numcomps * sizeof(opj_image_cmptparm_t)); - for(i = 0; i < numcomps; i++) - { + for (i = 0; i < numcomps; i++) { cmptparm[i].prec = (OPJ_UINT32)prec; cmptparm[i].bpp = (OPJ_UINT32)prec; cmptparm[i].sgnd = 0; @@ -1230,119 +1884,139 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { } image = opj_image_create((OPJ_UINT32)numcomps, &cmptparm[0], color_space); - if(!image) { fclose(fp); return NULL; } + if (!image) { + fclose(fp); + return NULL; + } /* set image offset and reference grid */ image->x0 = (OPJ_UINT32)parameters->image_offset_x0; image->y0 = (OPJ_UINT32)parameters->image_offset_y0; - image->x1 = (OPJ_UINT32)(parameters->image_offset_x0 + (w - 1) * subsampling_dx + 1); - image->y1 = (OPJ_UINT32)(parameters->image_offset_y0 + (h - 1) * subsampling_dy + 1); + image->x1 = (OPJ_UINT32)(parameters->image_offset_x0 + (w - 1) * subsampling_dx + + 1); + image->y1 = (OPJ_UINT32)(parameters->image_offset_y0 + (h - 1) * subsampling_dy + + 1); - if((format == 2) || (format == 3)) /* ascii pixmap */ - { + if ((format == 2) || (format == 3)) { /* ascii pixmap */ unsigned int index; - for (i = 0; i < w * h; i++) - { - for(compno = 0; compno < numcomps; compno++) - { + for (i = 0; i < w * h; i++) { + for (compno = 0; compno < numcomps; compno++) { index = 0; - if (fscanf(fp, "%u", &index) != 1) - fprintf(stderr, "\nWARNING: fscanf return a number of element different from the expected.\n"); + if (fscanf(fp, "%u", &index) != 1) { + fprintf(stderr, "Missing data. Quitting.\n"); + opj_image_destroy(image); + fclose(fp); + return NULL; + } - image->comps[compno].data[i] = (OPJ_INT32)(index * 255)/header_info.maxval; + image->comps[compno].data[i] = (OPJ_INT32)(index * 255) / header_info.maxval; } } - } - else - if((format == 5) - || (format == 6) - ||((format == 7) - && ( header_info.gray || header_info.graya - || header_info.rgb || header_info.rgba)))/* binary pixmap */ - { - unsigned char c0, c1, one; - - one = (prec < 9); - - for (i = 0; i < w * h; i++) - { - for(compno = 0; compno < numcomps; compno++) - { - if ( !fread(&c0, 1, 1, fp) ) - { - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); - opj_image_destroy(image); - return NULL; - } - if(one) - { - image->comps[compno].data[i] = c0; - } - else - { - if ( !fread(&c1, 1, 1, fp) ) - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); - /* netpbm: */ - image->comps[compno].data[i] = ((c0<<8) | c1); + } else if ((format == 5) + || (format == 6) + || ((format == 7) + && (header_info.gray || header_info.graya + || header_info.rgb || header_info.rgba))) { /* binary pixmap */ + unsigned char c0, c1, one; + + one = (prec < 9); + + for (i = 0; i < w * h; i++) { + for (compno = 0; compno < numcomps; compno++) { + if (!fread(&c0, 1, 1, fp)) { + fprintf(stderr, "Missing data. Quitting.\n"); + opj_image_destroy(image); + fclose(fp); + return NULL; + } + if (one) { + image->comps[compno].data[i] = c0; + } else { + if (!fread(&c1, 1, 1, fp)) { + fprintf(stderr, "Missing data. Quitting.\n"); + opj_image_destroy(image); + fclose(fp); + return NULL; } + /* netpbm: */ + image->comps[compno].data[i] = ((c0 << 8) | c1); } } } - else - if(format == 1) /* ascii bitmap */ - { - for (i = 0; i < w * h; i++) - { - unsigned int index; - - if ( fscanf(fp, "%u", &index) != 1) - fprintf(stderr, "\nWARNING: fscanf return a number of element different from the expected.\n"); - - image->comps[0].data[i] = (index?0:255); - } + } else if (format == 1) { /* ascii bitmap */ + for (i = 0; i < w * h; i++) { + unsigned int index; + + if (fscanf(fp, "%u", &index) != 1) { + fprintf(stderr, "Missing data. Quitting.\n"); + opj_image_destroy(image); + fclose(fp); + return NULL; } - else - if(format == 4) - { - int x, y, bit; - unsigned char uc; - - i = 0; - for(y = 0; y < h; ++y) - { - bit = -1; uc = 0; - - for(x = 0; x < w; ++x) - { - if(bit == -1) - { - bit = 7; - uc = (unsigned char)getc(fp); - } - image->comps[0].data[i] = (((uc>>bit) & 1)?0:255); - --bit; ++i; - } + + image->comps[0].data[i] = (index ? 0 : 255); + } + } else if (format == 4) { + int x, y, bit; + int uc; + + i = 0; + for (y = 0; y < h; ++y) { + bit = -1; + uc = 0; + + for (x = 0; x < w; ++x) { + if (bit == -1) { + bit = 7; + uc = getc(fp); + if (uc == EOF) { + fprintf(stderr, "Missing data. Quitting.\n"); + opj_image_destroy(image); + fclose(fp); + return NULL; } } - else - if((format == 7 && header_info.bw)) /*MONO*/ - { - unsigned char uc; - - for(i = 0; i < w * h; ++i) - { - if ( !fread(&uc, 1, 1, fp) ) - fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); - image->comps[0].data[i] = (uc & 1)?0:255; - } - } + image->comps[0].data[i] = ((((unsigned char)uc >> bit) & 1) ? 0 : 255); + --bit; + ++i; + } + } + } else if ((format == 7 && header_info.bw)) { /*MONO*/ + unsigned char uc; + + for (i = 0; i < w * h; ++i) { + if (!fread(&uc, 1, 1, fp)) { + fprintf(stderr, "Missing data. Quitting.\n"); + opj_image_destroy(image); + fclose(fp); + return NULL; + } + image->comps[0].data[i] = (uc & 1) ? 0 : 255; + } + } fclose(fp); return image; }/* pnmtoimage() */ -int imagetopnm(opj_image_t * image, const char *outfile) +static int are_comps_similar(opj_image_t * image) +{ + unsigned int i; + for (i = 1; i < image->numcomps; i++) { + if (image->comps[0].dx != image->comps[i].dx || + image->comps[0].dy != image->comps[i].dy || + (i <= 2 && + (image->comps[0].prec != image->comps[i].prec || + image->comps[0].sgnd != image->comps[i].sgnd))) { + return OPJ_FALSE; + } + } + return OPJ_TRUE; +} + + +int imagetopnm(opj_image_t * image, const char *outfile, int force_split) { int *red, *green, *blue, *alpha; int wr, hr, max; @@ -1355,215 +2029,249 @@ int imagetopnm(opj_image_t * image, const char *outfile) const char *tmp = outfile; char *destname; - alpha = NULL; + alpha = NULL; - if((prec = (int)image->comps[0].prec) > 16) - { - fprintf(stderr,"%s:%d:imagetopnm\n\tprecision %d is larger than 16" - "\n\t: refused.\n",__FILE__,__LINE__,prec); + if ((prec = (int)image->comps[0].prec) > 16) { + fprintf(stderr, "%s:%d:imagetopnm\n\tprecision %d is larger than 16" + "\n\t: refused.\n", __FILE__, __LINE__, prec); return 1; } - two = has_alpha = 0; fails = 1; + two = has_alpha = 0; + fails = 1; ncomp = image->numcomps; - while (*tmp) ++tmp; tmp -= 2; + while (*tmp) { + ++tmp; + } + tmp -= 2; want_gray = (*tmp == 'g' || *tmp == 'G'); ncomp = image->numcomps; - if(want_gray) ncomp = 1; - - if (ncomp == 2 /* GRAYA */ - || (ncomp > 2 /* RGB, RGBA */ - && image->comps[0].dx == image->comps[1].dx - && image->comps[1].dx == image->comps[2].dx - && image->comps[0].dy == image->comps[1].dy - && image->comps[1].dy == image->comps[2].dy - && image->comps[0].prec == image->comps[1].prec - && image->comps[1].prec == image->comps[2].prec - )) - { + if (want_gray) { + ncomp = 1; + } + + if ((force_split == 0) && ncomp >= 2 && + are_comps_similar(image)) { fdest = fopen(outfile, "wb"); - if (!fdest) - { + if (!fdest) { fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile); return fails; } two = (prec > 8); triple = (ncomp > 2); - wr = (int)image->comps[0].w; hr = (int)image->comps[0].h; - max = (1<comps[0].w; + hr = (int)image->comps[0].h; + max = (1 << prec) - 1; + has_alpha = (ncomp == 4 || ncomp == 2); red = image->comps[0].data; - if(triple) - { + if (triple) { green = image->comps[1].data; blue = image->comps[2].data; + } else { + green = blue = NULL; } - else green = blue = NULL; - if(has_alpha) - { - const char *tt = (triple?"RGB_ALPHA":"GRAYSCALE_ALPHA"); + if (has_alpha) { + const char *tt = (triple ? "RGB_ALPHA" : "GRAYSCALE_ALPHA"); - fprintf(fdest, "P7\n# OpenJPEG-%s\nWIDTH %d\nHEIGHT %d\nDEPTH %d\n" + fprintf(fdest, "P7\n# OpenJPEG-%s\nWIDTH %d\nHEIGHT %d\nDEPTH %u\n" "MAXVAL %d\nTUPLTYPE %s\nENDHDR\n", opj_version(), wr, hr, ncomp, max, tt); alpha = image->comps[ncomp - 1].data; adjustA = (image->comps[ncomp - 1].sgnd ? - 1 << (image->comps[ncomp - 1].prec - 1) : 0); - } - else - { + 1 << (image->comps[ncomp - 1].prec - 1) : 0); + } else { fprintf(fdest, "P6\n# OpenJPEG-%s\n%d %d\n%d\n", opj_version(), wr, hr, max); adjustA = 0; } adjustR = (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0); - if(triple) - { + if (triple) { adjustG = (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0); adjustB = (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0); + } else { + adjustG = adjustB = 0; } - else adjustG = adjustB = 0; - for(i = 0; i < wr * hr; ++i) - { - if(two) - { - v = *red + adjustR; ++red; -if(v > 65535) v = 65535; else if(v < 0) v = 0; + for (i = 0; i < wr * hr; ++i) { + if (two) { + v = *red + adjustR; + ++red; + if (v > 65535) { + v = 65535; + } else if (v < 0) { + v = 0; + } /* netpbm: */ - fprintf(fdest, "%c%c",(unsigned char)(v>>8), (unsigned char)v); - - if(triple) - { - v = *green + adjustG; ++green; -if(v > 65535) v = 65535; else if(v < 0) v = 0; + fprintf(fdest, "%c%c", (unsigned char)(v >> 8), (unsigned char)v); + + if (triple) { + v = *green + adjustG; + ++green; + if (v > 65535) { + v = 65535; + } else if (v < 0) { + v = 0; + } /* netpbm: */ - fprintf(fdest, "%c%c",(unsigned char)(v>>8), (unsigned char)v); - - v = *blue + adjustB; ++blue; -if(v > 65535) v = 65535; else if(v < 0) v = 0; + fprintf(fdest, "%c%c", (unsigned char)(v >> 8), (unsigned char)v); + + v = *blue + adjustB; + ++blue; + if (v > 65535) { + v = 65535; + } else if (v < 0) { + v = 0; + } /* netpbm: */ - fprintf(fdest, "%c%c",(unsigned char)(v>>8), (unsigned char)v); + fprintf(fdest, "%c%c", (unsigned char)(v >> 8), (unsigned char)v); }/* if(triple) */ - if(has_alpha) - { - v = *alpha + adjustA; ++alpha; - if(v > 65535) v = 65535; else if(v < 0) v = 0; + if (has_alpha) { + v = *alpha + adjustA; + ++alpha; + if (v > 65535) { + v = 65535; + } else if (v < 0) { + v = 0; + } /* netpbm: */ - fprintf(fdest, "%c%c",(unsigned char)(v>>8), (unsigned char)v); + fprintf(fdest, "%c%c", (unsigned char)(v >> 8), (unsigned char)v); } continue; - } /* if(two) */ + } /* if(two) */ /* prec <= 8: */ - v = *red++; - if(v > 255) v = 255; else if(v < 0) v = 0; + v = *red++; + if (v > 255) { + v = 255; + } else if (v < 0) { + v = 0; + } - fprintf(fdest, "%c", (unsigned char)v); - if(triple) - { - v = *green++; - if(v > 255) v = 255; else if(v < 0) v = 0; + fprintf(fdest, "%c", (unsigned char)v); + if (triple) { + v = *green++; + if (v > 255) { + v = 255; + } else if (v < 0) { + v = 0; + } - fprintf(fdest, "%c", (unsigned char)v); - v = *blue++; - if(v > 255) v = 255; else if(v < 0) v = 0; + fprintf(fdest, "%c", (unsigned char)v); + v = *blue++; + if (v > 255) { + v = 255; + } else if (v < 0) { + v = 0; + } - fprintf(fdest, "%c", (unsigned char)v); - } - if(has_alpha) - { - v = *alpha++; - if(v > 255) v = 255; else if(v < 0) v = 0; + fprintf(fdest, "%c", (unsigned char)v); + } + if (has_alpha) { + v = *alpha++; + if (v > 255) { + v = 255; + } else if (v < 0) { + v = 0; + } - fprintf(fdest, "%c", (unsigned char)v); - } - } /* for(i */ + fprintf(fdest, "%c", (unsigned char)v); + } + } /* for(i */ - fclose(fdest); return 0; + fclose(fdest); + return 0; } /* YUV or MONO: */ - if (image->numcomps > ncomp) - { - fprintf(stderr,"WARNING -> [PGM file] Only the first component\n"); - fprintf(stderr," is written to the file\n"); + if (image->numcomps > ncomp) { + fprintf(stderr, "WARNING -> [PGM file] Only the first component\n"); + fprintf(stderr, " is written to the file\n"); } destname = (char*)malloc(strlen(outfile) + 8); + if (destname == NULL) { + fprintf(stderr, "imagetopnm: memory out\n"); + return 1; + } + for (compno = 0; compno < ncomp; compno++) { + if (ncomp > 1) { + /*sprintf(destname, "%d.%s", compno, outfile);*/ + const size_t olen = strlen(outfile); + const size_t dotpos = olen - 4; - for (compno = 0; compno < ncomp; compno++) - { - if (ncomp > 1) - { - /*sprintf(destname, "%d.%s", compno, outfile);*/ - const size_t olen = strlen(outfile); - const size_t dotpos = olen - 4; - - strncpy(destname, outfile, dotpos); - sprintf(destname+dotpos, "_%d.pgm", compno); - } - else + strncpy(destname, outfile, dotpos); + sprintf(destname + dotpos, "_%u.pgm", compno); + } else { sprintf(destname, "%s", outfile); + } fdest = fopen(destname, "wb"); - if (!fdest) - { + if (!fdest) { fprintf(stderr, "ERROR -> failed to open %s for writing\n", destname); free(destname); return 1; } - wr = (int)image->comps[compno].w; hr = (int)image->comps[compno].h; + wr = (int)image->comps[compno].w; + hr = (int)image->comps[compno].h; prec = (int)image->comps[compno].prec; - max = (1<comps[compno].data; adjustR = - (image->comps[compno].sgnd ? 1 << (image->comps[compno].prec - 1) : 0); - - if(prec > 8) - { - for (i = 0; i < wr * hr; i++) - { - v = *red + adjustR; ++red; -if(v > 65535) v = 65535; else if(v < 0) v = 0; + (image->comps[compno].sgnd ? 1 << (image->comps[compno].prec - 1) : 0); + + if (prec > 8) { + for (i = 0; i < wr * hr; i++) { + v = *red + adjustR; + ++red; + if (v > 65535) { + v = 65535; + } else if (v < 0) { + v = 0; + } /* netpbm: */ - fprintf(fdest, "%c%c",(unsigned char)(v>>8), (unsigned char)v); + fprintf(fdest, "%c%c", (unsigned char)(v >> 8), (unsigned char)v); - if(has_alpha) - { + if (has_alpha) { v = *alpha++; -if(v > 65535) v = 65535; else if(v < 0) v = 0; + if (v > 65535) { + v = 65535; + } else if (v < 0) { + v = 0; + } /* netpbm: */ - fprintf(fdest, "%c%c",(unsigned char)(v>>8), (unsigned char)v); + fprintf(fdest, "%c%c", (unsigned char)(v >> 8), (unsigned char)v); } }/* for(i */ - } - else /* prec <= 8 */ - { - for(i = 0; i < wr * hr; ++i) - { - v = *red + adjustR; ++red; - if(v > 255) v = 255; else if(v < 0) v = 0; + } else { /* prec <= 8 */ + for (i = 0; i < wr * hr; ++i) { + v = *red + adjustR; + ++red; + if (v > 255) { + v = 255; + } else if (v < 0) { + v = 0; + } - fprintf(fdest, "%c", (unsigned char)v); + fprintf(fdest, "%c", (unsigned char)v); } } fclose(fdest); @@ -1573,775 +2281,14 @@ if(v > 65535) v = 65535; else if(v < 0) v = 0; return 0; }/* imagetopnm() */ -#ifdef OPJ_HAVE_LIBTIFF -/* -->> -->> -->> -->> - - TIFF IMAGE FORMAT - - <<-- <<-- <<-- <<-- */ - -int imagetotif(opj_image_t * image, const char *outfile) -{ - int width, height, imgsize; - int bps,index,adjust, sgnd; - int ushift, dshift, has_alpha, force16; - TIFF *tif; - tdata_t buf; - tstrip_t strip; - tsize_t strip_size; - - ushift = dshift = force16 = has_alpha = 0; - bps = (int)image->comps[0].prec; - - if(bps > 8 && bps < 16) - { - ushift = 16 - bps; dshift = bps - ushift; - bps = 16; force16 = 1; - } - - if(bps != 8 && bps != 16) - { - fprintf(stderr,"imagetotif: Bits=%d, Only 8 and 16 bits implemented\n", - bps); - fprintf(stderr,"\tAborting\n"); - return 1; - } - tif = TIFFOpen(outfile, "wb"); - - if (!tif) - { - fprintf(stderr, "imagetotif:failed to open %s for writing\n", outfile); - return 1; - } - sgnd = (int)image->comps[0].sgnd; - adjust = sgnd ? 1 << (image->comps[0].prec - 1) : 0; - - if(image->numcomps >= 3 - && image->comps[0].dx == image->comps[1].dx - && image->comps[1].dx == image->comps[2].dx - && image->comps[0].dy == image->comps[1].dy - && image->comps[1].dy == image->comps[2].dy - && image->comps[0].prec == image->comps[1].prec - && image->comps[1].prec == image->comps[2].prec) - { - has_alpha = (image->numcomps == 4); - - width = (int)image->comps[0].w; - height = (int)image->comps[0].h; - imgsize = width * height ; - - TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width); - TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height); - TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 3 + has_alpha); - TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps); - TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); - TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB); - TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1); - strip_size = TIFFStripSize(tif); - buf = _TIFFmalloc(strip_size); - index=0; - - for(strip = 0; strip < TIFFNumberOfStrips(tif); strip++) - { - unsigned char *dat8; - tsize_t i, ssize, last_i = 0; - int step, restx; - ssize = TIFFStripSize(tif); - dat8 = (unsigned char*)buf; - - if(bps == 8) - { - step = 3 + has_alpha; - restx = step - 1; - - for(i=0; i < ssize - restx; i += step) - { - int r, g, b, a = 0; - - if(index < imgsize) - { - r = image->comps[0].data[index]; - g = image->comps[1].data[index]; - b = image->comps[2].data[index]; - if(has_alpha) a = image->comps[3].data[index]; - - if(sgnd) - { - r += adjust; - g += adjust; - b += adjust; - if(has_alpha) a += adjust; - } - if(r > 255) r = 255; else if(r < 0) r = 0; - dat8[i+0] = (unsigned char)r ; - if(g > 255) g = 255; else if(g < 0) g = 0; - dat8[i+1] = (unsigned char)g ; - if(b > 255) b = 255; else if(b < 0) b = 0; - dat8[i+2] = (unsigned char)b ; - if(has_alpha) - { - if(a > 255) a = 255; else if(a < 0) a = 0; - dat8[i+3] = (unsigned char)a; - } - - index++; - last_i = i + step; - } - else - break; - }/*for(i = 0;)*/ - - if(last_i < ssize) - { - for(i = last_i; i < ssize; i += step) - { - int r, g, b, a = 0; - - if(index < imgsize) - { - r = image->comps[0].data[index]; - g = image->comps[1].data[index]; - b = image->comps[2].data[index]; - if(has_alpha) a = image->comps[3].data[index]; - - if(sgnd) - { - r += adjust; - g += adjust; - b += adjust; - if(has_alpha) a += adjust; - } - if(r > 255) r = 255; else if(r < 0) r = 0; - if(g > 255) g = 255; else if(g < 0) g = 0; - if(b > 255) b = 255; else if(b < 0) b = 0; - - dat8[i+0] = (unsigned char)r ; - if(i+1 < ssize) dat8[i+1] = (unsigned char)g ; else break; - if(i+2 < ssize) dat8[i+2] = (unsigned char)b ; else break; - if(has_alpha) - { - if(a > 255) a = 255; else if(a < 0) a = 0; - - if(i+3 < ssize) dat8[i+3] = (unsigned char)a ; else break; - } - index++; - } - else - break; - }/*for(i)*/ - }/*if(last_i < ssize)*/ - - } /*if(bps == 8)*/ - else - if(bps == 16) - { - step = 6 + has_alpha + has_alpha; - restx = step - 1; - - for(i = 0; i < ssize - restx ; i += step) - { - int r, g, b, a = 0; - - if(index < imgsize) - { - r = image->comps[0].data[index]; - g = image->comps[1].data[index]; - b = image->comps[2].data[index]; - if(has_alpha) a = image->comps[3].data[index]; - - if(sgnd) - { - r += adjust; - g += adjust; - b += adjust; - if(has_alpha) a += adjust; - } - if(force16) - { - r = (r<>dshift); - g = (g<>dshift); - b = (b<>dshift); - if(has_alpha) a = (a<>dshift); - } - if(r > 65535) r = 65535; else if(r < 0) r = 0; - if(g > 65535) g = 65535; else if(g < 0) g = 0; - if(b > 65535) b = 65535; else if(b < 0) b = 0; - - dat8[i+0] = (unsigned char)r;/*LSB*/ - dat8[i+1] = (unsigned char)(r >> 8);/*MSB*/ - dat8[i+2] = (unsigned char)g; - dat8[i+3] = (unsigned char)(g >> 8); - dat8[i+4] = (unsigned char)b; - dat8[i+5] = (unsigned char)(b >> 8); - if(has_alpha) - { - if(a > 65535) a = 65535; else if(a < 0) a = 0; - dat8[i+6] = (unsigned char)a; - dat8[i+7] = (unsigned char)(a >> 8); - } - index++; - last_i = i + step; - } - else - break; - }/*for(i = 0;)*/ - - if(last_i < ssize) - { - for(i = last_i ; i < ssize ; i += step) - { - int r, g, b, a = 0; - - if(index < imgsize) - { - r = image->comps[0].data[index]; - g = image->comps[1].data[index]; - b = image->comps[2].data[index]; - if(has_alpha) a = image->comps[3].data[index]; - - if(sgnd) - { - r += adjust; - g += adjust; - b += adjust; - if(has_alpha) a += adjust; - } - if(force16) - { - r = (r<>dshift); - g = (g<>dshift); - b = (b<>dshift); - if(has_alpha) a = (a<>dshift); - } - if(r > 65535) r = 65535; else if(r < 0) r = 0; - if(g > 65535) g = 65535; else if(g < 0) g = 0; - if(b > 65535) b = 65535; else if(b < 0) b = 0; - - dat8[i+0] = (unsigned char) r;/*LSB*/ - if(i+1 < ssize) dat8[i+1] = (unsigned char)(r >> 8);else break;/*MSB*/ - if(i+2 < ssize) dat8[i+2] = (unsigned char) g; else break; - if(i+3 < ssize) dat8[i+3] = (unsigned char)(g >> 8);else break; - if(i+4 < ssize) dat8[i+4] = (unsigned char) b; else break; - if(i+5 < ssize) dat8[i+5] = (unsigned char)(b >> 8);else break; - - if(has_alpha) - { - if(a > 65535) a = 65535; else if(a < 0) a = 0; - if(i+6 < ssize) dat8[i+6] = (unsigned char)a; else break; - if(i+7 < ssize) dat8[i+7] = (unsigned char)(a >> 8); else break; - } - index++; - } - else - break; - }/*for(i)*/ - }/*if(last_i < ssize)*/ - - }/*if(bps == 16)*/ - (void)TIFFWriteEncodedStrip(tif, strip, (void*)buf, strip_size); - }/*for(strip = 0; )*/ - - _TIFFfree((void*)buf); - TIFFClose(tif); - - return 0; - }/*RGB(A)*/ - - if(image->numcomps == 1 /* GRAY */ - || ( image->numcomps == 2 /* GRAY_ALPHA */ - && image->comps[0].dx == image->comps[1].dx - && image->comps[0].dy == image->comps[1].dy - && image->comps[0].prec == image->comps[1].prec)) - { - int step; - - has_alpha = (image->numcomps == 2); - - width = (int)image->comps[0].w; - height = (int)image->comps[0].h; - imgsize = width * height; - - /* Set tags */ - TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width); - TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height); - TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1 + has_alpha); - TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps); - TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); - TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); - TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1); - - /* Get a buffer for the data */ - strip_size = TIFFStripSize(tif); - buf = _TIFFmalloc(strip_size); - index = 0; - - for(strip = 0; strip < TIFFNumberOfStrips(tif); strip++) - { - unsigned char *dat8; - tsize_t i, ssize = TIFFStripSize(tif); - dat8 = (unsigned char*)buf; - - if(bps == 8) - { - step = 1 + has_alpha; - - for(i=0; i < ssize; i += step) - { - if(index < imgsize) - { - int r, a = 0; - - r = image->comps[0].data[index]; - if(has_alpha) a = image->comps[1].data[index]; - - if(sgnd) - { - r += adjust; - if(has_alpha) a += adjust; - } - if(r > 255) r = 255; else if(r < 0) r = 0; - dat8[i+0] = (unsigned char)r; - - if(has_alpha) - { - if(a > 255) a = 255; else if(a < 0) a = 0; - dat8[i+1] = (unsigned char)a; - } - index++; - } - else - break; - }/*for(i )*/ - }/*if(bps == 8*/ - else - if(bps == 16) - { - step = 2 + has_alpha + has_alpha; - - for(i=0; i < ssize; i += step) - { - if(index < imgsize) - { - int r, a = 0; - - r = image->comps[0].data[index]; - if(has_alpha) a = image->comps[1].data[index]; - - if(sgnd) - { - r += adjust; - if(has_alpha) a += adjust; - } - if(force16) - { - r = (r<>dshift); - if(has_alpha) a = (a<>dshift); - } - if(r > 65535) r = 65535; else if(r < 0) r = 0; - dat8[i+0] = (unsigned char)r;/*LSB*/ - dat8[i+1] = (unsigned char)(r >> 8);/*MSB*/ - if(has_alpha) - { - if(a > 65535) a = 65535; else if(a < 0) a = 0; - dat8[i+2] = (unsigned char)a; - dat8[i+3] = (unsigned char)(a >> 8); - } - index++; - }/*if(index < imgsize)*/ - else - break; - }/*for(i )*/ - } - (void)TIFFWriteEncodedStrip(tif, strip, (void*)buf, strip_size); - }/*for(strip*/ - - _TIFFfree(buf); - TIFFClose(tif); - - return 0; - } - - TIFFClose(tif); - - fprintf(stderr,"imagetotif: Bad color format.\n" - "\tOnly RGB(A) and GRAY(A) has been implemented\n"); - fprintf(stderr,"\tFOUND: numcomps(%d)\n\tAborting\n", - image->numcomps); - - return 1; -}/* imagetotif() */ - -/* - * libtiff/tif_getimage.c : 1,2,4,8,16 bitspersample accepted - * CINEMA : 12 bit precision -*/ -opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters) -{ - int subsampling_dx = parameters->subsampling_dx; - int subsampling_dy = parameters->subsampling_dy; - TIFF *tif; - tdata_t buf; - tstrip_t strip; - tsize_t strip_size; - int j, numcomps, w, h,index; - OPJ_COLOR_SPACE color_space; - opj_image_cmptparm_t cmptparm[4]; /* RGBA */ - opj_image_t *image = NULL; - int imgsize = 0; - int has_alpha = 0; - unsigned short tiBps, tiPhoto, tiSf, tiSpp, tiPC; - unsigned int tiWidth, tiHeight; - OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz); - - tif = TIFFOpen(filename, "r"); - - if(!tif) - { - fprintf(stderr, "tiftoimage:Failed to open %s for reading\n", filename); - return 0; - } - tiBps = tiPhoto = tiSf = tiSpp = tiPC = 0; - tiWidth = tiHeight = 0; - - TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &tiWidth); - TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &tiHeight); - TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &tiBps); - TIFFGetField(tif, TIFFTAG_SAMPLEFORMAT, &tiSf); - TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &tiSpp); - TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &tiPhoto); - TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &tiPC); - w= (int)tiWidth; - h= (int)tiHeight; - - if(tiBps != 8 && tiBps != 16 && tiBps != 12) tiBps = 0; - if(tiPhoto != 1 && tiPhoto != 2) tiPhoto = 0; - - if( !tiBps || !tiPhoto) - { - if( !tiBps) - fprintf(stderr,"tiftoimage: Bits=%d, Only 8 and 16 bits" - " implemented\n",tiBps); - else - if( !tiPhoto) - fprintf(stderr,"tiftoimage: Bad color format %d.\n\tOnly RGB(A)" - " and GRAY(A) has been implemented\n",(int) tiPhoto); - - fprintf(stderr,"\tAborting\n"); - TIFFClose(tif); - - return NULL; - } - - {/* From: tiff-4.0.x/libtiff/tif_getimage.c : */ - uint16* sampleinfo; - uint16 extrasamples; - - TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES, - &extrasamples, &sampleinfo); - - if(extrasamples >= 1) - { - switch(sampleinfo[0]) - { - case EXTRASAMPLE_UNSPECIFIED: - /* Workaround for some images without correct info about alpha channel -*/ - if(tiSpp > 3) - has_alpha = 1; - break; - - case EXTRASAMPLE_ASSOCALPHA: /* data pre-multiplied */ - case EXTRASAMPLE_UNASSALPHA: /* data not pre-multiplied */ - has_alpha = 1; - break; - } - } - else /* extrasamples == 0 */ - if(tiSpp == 4 || tiSpp == 2) has_alpha = 1; - } - - /* initialize image components -*/ - memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t)); - - if ((tiPhoto == PHOTOMETRIC_RGB) && (is_cinema)) { - fprintf(stdout,"WARNING:\n" - "Input image bitdepth is %d bits\n" - "TIF conversion has automatically rescaled to 12-bits\n" - "to comply with cinema profiles.\n", - tiBps); - } - - if(tiPhoto == PHOTOMETRIC_RGB) /* RGB(A) */ - { - numcomps = 3 + has_alpha; - color_space = OPJ_CLRSPC_SRGB; - - /*#define USETILEMODE*/ - for(j = 0; j < numcomps; j++) - { - if(is_cinema) - { - cmptparm[j].prec = 12; - cmptparm[j].bpp = 12; - } - else - { - cmptparm[j].prec = tiBps; - cmptparm[j].bpp = tiBps; - } - cmptparm[j].dx = (OPJ_UINT32)subsampling_dx; - cmptparm[j].dy = (OPJ_UINT32)subsampling_dy; - cmptparm[j].w = (OPJ_UINT32)w; - cmptparm[j].h = (OPJ_UINT32)h; -#ifdef USETILEMODE - cmptparm[j].x0 = 0; - cmptparm[j].y0 = 0; -#endif - } - -#ifdef USETILEMODE - image = opj_image_tile_create(numcomps,&cmptparm[0],color_space); -#else - image = opj_image_create((OPJ_UINT32)numcomps, &cmptparm[0], color_space); -#endif - - if(!image) - { - TIFFClose(tif); - return NULL; - } - /* set image offset and reference grid -*/ - image->x0 = (OPJ_UINT32)parameters->image_offset_x0; - image->y0 = (OPJ_UINT32)parameters->image_offset_y0; - image->x1 = !image->x0 ? (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1 : - image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1; - image->y1 = !image->y0 ? (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1 : - image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1; - - buf = _TIFFmalloc(TIFFStripSize(tif)); - - strip_size=TIFFStripSize(tif); - index = 0; - imgsize = (int)(image->comps[0].w * image->comps[0].h); - /* Read the Image components -*/ - for(strip = 0; strip < TIFFNumberOfStrips(tif); strip++) - { - unsigned char *dat8; - int step; - tsize_t i, ssize; - ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size); - dat8 = (unsigned char*)buf; - - if(tiBps == 16) - { - step = 6 + has_alpha + has_alpha; - - for(i = 0; i < ssize; i += step) - { - if(index < imgsize) - { - image->comps[0].data[index] = ( dat8[i+1] << 8 ) | dat8[i+0]; /* R */ - image->comps[1].data[index] = ( dat8[i+3] << 8 ) | dat8[i+2]; /* G */ - image->comps[2].data[index] = ( dat8[i+5] << 8 ) | dat8[i+4]; /* B */ - if(has_alpha) - image->comps[3].data[index] = ( dat8[i+7] << 8 ) | dat8[i+6]; - - if(is_cinema) - { - /* Rounding 16 to 12 bits -*/ - image->comps[0].data[index] = - (image->comps[0].data[index] + 0x08) >> 4 ; - image->comps[1].data[index] = - (image->comps[1].data[index] + 0x08) >> 4 ; - image->comps[2].data[index] = - (image->comps[2].data[index] + 0x08) >> 4 ; - if(has_alpha) - image->comps[3].data[index] = - (image->comps[3].data[index] + 0x08) >> 4 ; - } - index++; - } - else - break; - }/*for(i = 0)*/ - }/*if(tiBps == 16)*/ - else - if(tiBps == 8) - { - step = 3 + has_alpha; - - for(i = 0; i < ssize; i += step) - { - if(index < imgsize) - { -#ifndef USETILEMODE - image->comps[0].data[index] = dat8[i+0];/* R */ - image->comps[1].data[index] = dat8[i+1];/* G */ - image->comps[2].data[index] = dat8[i+2];/* B */ - if(has_alpha) - image->comps[3].data[index] = dat8[i+3]; -#endif - - if(is_cinema) - { - /* Rounding 8 to 12 bits -*/ -#ifndef USETILEMODE - image->comps[0].data[index] = image->comps[0].data[index] << 4 ; - image->comps[1].data[index] = image->comps[1].data[index] << 4 ; - image->comps[2].data[index] = image->comps[2].data[index] << 4 ; - if(has_alpha) - image->comps[3].data[index] = image->comps[3].data[index] << 4 ; -#endif - } - index++; - }/*if(index*/ - else - break; - }/*for(i )*/ - }/*if( tiBps == 8)*/ - else - if(tiBps == 12)/* CINEMA file */ - { - step = 9; - - for(i = 0; i < ssize; i += step) - { - if((index < imgsize)&&(index+1 < imgsize)) - { - image->comps[0].data[index] = ( dat8[i+0]<<4 ) |(dat8[i+1]>>4); - image->comps[1].data[index] = ((dat8[i+1]& 0x0f)<< 8) | dat8[i+2]; - - image->comps[2].data[index] = ( dat8[i+3]<<4) |(dat8[i+4]>>4); - image->comps[0].data[index+1] = ((dat8[i+4]& 0x0f)<< 8) | dat8[i+5]; - - image->comps[1].data[index+1] = ( dat8[i+6] <<4) |(dat8[i+7]>>4); - image->comps[2].data[index+1] = ((dat8[i+7]& 0x0f)<< 8) | dat8[i+8]; - - index += 2; - } - else - break; - }/*for(i )*/ - } - }/*for(strip = 0; )*/ - - _TIFFfree(buf); - TIFFClose(tif); - - return image; - }/*RGB(A)*/ - - if(tiPhoto == PHOTOMETRIC_MINISBLACK) /* GRAY(A) */ - { - numcomps = 1 + has_alpha; - color_space = OPJ_CLRSPC_GRAY; - - for(j = 0; j < numcomps; ++j) - { - cmptparm[j].prec = tiBps; - cmptparm[j].bpp = tiBps; - cmptparm[j].dx = (OPJ_UINT32)subsampling_dx; - cmptparm[j].dy = (OPJ_UINT32)subsampling_dy; - cmptparm[j].w = (OPJ_UINT32)w; - cmptparm[j].h = (OPJ_UINT32)h; - } -#ifdef USETILEMODE - image = opj_image_tile_create(numcomps,&cmptparm[0],color_space); -#else - image = opj_image_create((OPJ_UINT32)numcomps, &cmptparm[0], color_space); -#endif - - if(!image) - { - TIFFClose(tif); - return NULL; - } - /* set image offset and reference grid -*/ - image->x0 = (OPJ_UINT32)parameters->image_offset_x0; - image->y0 = (OPJ_UINT32)parameters->image_offset_y0; - image->x1 = !image->x0 ? (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1 : - image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1; - image->y1 = !image->y0 ? (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1 : - image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1; - - buf = _TIFFmalloc(TIFFStripSize(tif)); - - strip_size = TIFFStripSize(tif); - index = 0; - imgsize = (int)(image->comps[0].w * image->comps[0].h); - /* Read the Image components -*/ - for(strip = 0; strip < TIFFNumberOfStrips(tif); strip++) - { - unsigned char *dat8; - tsize_t i, ssize; - int step; - - ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size); - dat8 = (unsigned char*)buf; - - if(tiBps == 16) - { - step = 2 + has_alpha + has_alpha; - - for(i = 0; i < ssize; i += step) - { - if(index < imgsize) - { - image->comps[0].data[index] = ( dat8[i+1] << 8 ) | dat8[i+0]; - if(has_alpha) - image->comps[1].data[index] = ( dat8[i+3] << 8 ) | dat8[i+2]; - index++; - } - else - break; - }/*for(i )*/ - } - else - if(tiBps == 8) - { - step = 1 + has_alpha; - - for(i = 0; i < ssize; i += step) - { - if(index < imgsize) - { - image->comps[0].data[index] = dat8[i+0]; - if(has_alpha) - image->comps[1].data[index] = dat8[i+1]; - index++; - } - else - break; - }/*for(i )*/ - } - }/*for(strip = 0;*/ - - _TIFFfree(buf); - TIFFClose(tif); - - }/*GRAY(A)*/ - - return image; - -}/* tiftoimage() */ - -#endif /* OPJ_HAVE_LIBTIFF */ - /* -->> -->> -->> -->> RAW IMAGE FORMAT <<-- <<-- <<-- <<-- */ -static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp, OPJ_BOOL big_endian) { +static opj_image_t* rawtoimage_common(const char *filename, + opj_cparameters_t *parameters, raw_cparameters_t *raw_cp, OPJ_BOOL big_endian) +{ int subsampling_dx = parameters->subsampling_dx; int subsampling_dy = parameters->subsampling_dy; @@ -2352,28 +2299,31 @@ static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *p opj_image_t * image = NULL; unsigned short ch; - if((! (raw_cp->rawWidth & raw_cp->rawHeight & raw_cp->rawComp & raw_cp->rawBitDepth)) == 0) - { - fprintf(stderr,"\nError: invalid raw image parameters\n"); - fprintf(stderr,"Please use the Format option -F:\n"); - fprintf(stderr,"-F ,,,,{s,u}@x:...:x\n"); - fprintf(stderr,"If subsampling is omitted, 1x1 is assumed for all components\n"); - fprintf(stderr,"Example: -i image.raw -o image.j2k -F 512,512,3,8,u@1x1:2x2:2x2\n"); - fprintf(stderr," for raw 512x512 image with 4:2:0 subsampling\n"); - fprintf(stderr,"Aborting.\n"); + if ((!(raw_cp->rawWidth & raw_cp->rawHeight & raw_cp->rawComp & + raw_cp->rawBitDepth)) == 0) { + fprintf(stderr, "\nError: invalid raw image parameters\n"); + fprintf(stderr, "Please use the Format option -F:\n"); + fprintf(stderr, + "-F ,,,,{s,u}@x:...:x\n"); + fprintf(stderr, + "If subsampling is omitted, 1x1 is assumed for all components\n"); + fprintf(stderr, + "Example: -i image.raw -o image.j2k -F 512,512,3,8,u@1x1:2x2:2x2\n"); + fprintf(stderr, " for raw 512x512 image with 4:2:0 subsampling\n"); + fprintf(stderr, "Aborting.\n"); return NULL; } f = fopen(filename, "rb"); if (!f) { fprintf(stderr, "Failed to open %s for reading !!\n", filename); - fprintf(stderr,"Aborting\n"); + fprintf(stderr, "Aborting\n"); return NULL; } numcomps = raw_cp->rawComp; /* FIXME ADE at this point, tcp_mct has not been properly set in calling function */ - if (numcomps == 0) { + if (numcomps == 1) { color_space = OPJ_CLRSPC_GRAY; } else if ((numcomps >= 3) && (parameters->tcp_mct == 0)) { color_space = OPJ_CLRSPC_SYCC; @@ -2384,14 +2334,16 @@ static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *p } w = raw_cp->rawWidth; h = raw_cp->rawHeight; - cmptparm = (opj_image_cmptparm_t*) calloc((OPJ_UINT32)numcomps,sizeof(opj_image_cmptparm_t)); + cmptparm = (opj_image_cmptparm_t*) calloc((OPJ_UINT32)numcomps, + sizeof(opj_image_cmptparm_t)); if (!cmptparm) { fprintf(stderr, "Failed to allocate image components parameters !!\n"); - fprintf(stderr,"Aborting\n"); + fprintf(stderr, "Aborting\n"); + fclose(f); return NULL; } /* initialize image components */ - for(i = 0; i < numcomps; i++) { + for (i = 0; i < numcomps; i++) { cmptparm[i].prec = (OPJ_UINT32)raw_cp->rawBitDepth; cmptparm[i].bpp = (OPJ_UINT32)raw_cp->rawBitDepth; cmptparm[i].sgnd = (OPJ_UINT32)raw_cp->rawSigned; @@ -2403,93 +2355,130 @@ static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *p /* create the image */ image = opj_image_create((OPJ_UINT32)numcomps, &cmptparm[0], color_space); free(cmptparm); - if(!image) { + if (!image) { fclose(f); return NULL; } /* set image offset and reference grid */ image->x0 = (OPJ_UINT32)parameters->image_offset_x0; image->y0 = (OPJ_UINT32)parameters->image_offset_y0; - image->x1 = (OPJ_UINT32)parameters->image_offset_x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1; - image->y1 = (OPJ_UINT32)parameters->image_offset_y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1; + image->x1 = (OPJ_UINT32)parameters->image_offset_x0 + (OPJ_UINT32)(w - 1) * + (OPJ_UINT32)subsampling_dx + 1; + image->y1 = (OPJ_UINT32)parameters->image_offset_y0 + (OPJ_UINT32)(h - 1) * + (OPJ_UINT32)subsampling_dy + 1; - if(raw_cp->rawBitDepth <= 8) - { + if (raw_cp->rawBitDepth <= 8) { unsigned char value = 0; - for(compno = 0; compno < numcomps; compno++) { - int nloop = (w*h)/(raw_cp->rawComps[compno].dx*raw_cp->rawComps[compno].dy); + for (compno = 0; compno < numcomps; compno++) { + int nloop = (w * h) / (raw_cp->rawComps[compno].dx * + raw_cp->rawComps[compno].dy); for (i = 0; i < nloop; i++) { if (!fread(&value, 1, 1, f)) { - fprintf(stderr,"Error reading raw file. End of file probably reached.\n"); + fprintf(stderr, "Error reading raw file. End of file probably reached.\n"); + opj_image_destroy(image); + fclose(f); return NULL; } - image->comps[compno].data[i] = raw_cp->rawSigned?(char)value:value; + image->comps[compno].data[i] = raw_cp->rawSigned ? (char)value : value; } } - } - else if(raw_cp->rawBitDepth <= 16) - { + } else if (raw_cp->rawBitDepth <= 16) { unsigned short value; - for(compno = 0; compno < numcomps; compno++) { - int nloop = (w*h)/(raw_cp->rawComps[compno].dx*raw_cp->rawComps[compno].dx); + for (compno = 0; compno < numcomps; compno++) { + int nloop = (w * h) / (raw_cp->rawComps[compno].dx * + raw_cp->rawComps[compno].dy); for (i = 0; i < nloop; i++) { unsigned char temp1; unsigned char temp2; if (!fread(&temp1, 1, 1, f)) { - fprintf(stderr,"Error reading raw file. End of file probably reached.\n"); + fprintf(stderr, "Error reading raw file. End of file probably reached.\n"); + opj_image_destroy(image); + fclose(f); return NULL; } if (!fread(&temp2, 1, 1, f)) { - fprintf(stderr,"Error reading raw file. End of file probably reached.\n"); + fprintf(stderr, "Error reading raw file. End of file probably reached.\n"); + opj_image_destroy(image); + fclose(f); return NULL; } - if( big_endian ) - { + if (big_endian) { value = (unsigned short)((temp1 << 8) + temp2); - } - else - { + } else { value = (unsigned short)((temp2 << 8) + temp1); } - image->comps[compno].data[i] = raw_cp->rawSigned?(short)value:value; + image->comps[compno].data[i] = raw_cp->rawSigned ? (short)value : value; } } - } - else { - fprintf(stderr,"OpenJPEG cannot encode raw components with bit depth higher than 16 bits.\n"); + } else { + fprintf(stderr, + "OpenJPEG cannot encode raw components with bit depth higher than 16 bits.\n"); + opj_image_destroy(image); + fclose(f); return NULL; } if (fread(&ch, 1, 1, f)) { - fprintf(stderr,"Warning. End of raw file not reached... processing anyway\n"); + fprintf(stderr, "Warning. End of raw file not reached... processing anyway\n"); } fclose(f); return image; } -opj_image_t* rawltoimage(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp) { +opj_image_t* rawltoimage(const char *filename, opj_cparameters_t *parameters, + raw_cparameters_t *raw_cp) +{ return rawtoimage_common(filename, parameters, raw_cp, OPJ_FALSE); } -opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp) { +opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, + raw_cparameters_t *raw_cp) +{ return rawtoimage_common(filename, parameters, raw_cp, OPJ_TRUE); } -static int imagetoraw_common(opj_image_t * image, const char *outfile, OPJ_BOOL big_endian) +static int imagetoraw_common(opj_image_t * image, const char *outfile, + OPJ_BOOL big_endian) { FILE *rawFile = NULL; size_t res; - unsigned int compno; + unsigned int compno, numcomps; int w, h, fails; int line, row, curr, mask; int *ptr; unsigned char uc; (void)big_endian; - if((image->numcomps * image->x1 * image->y1) == 0) - { - fprintf(stderr,"\nError: invalid raw image parameters\n"); + if ((image->numcomps * image->x1 * image->y1) == 0) { + fprintf(stderr, "\nError: invalid raw image parameters\n"); + return 1; + } + + numcomps = image->numcomps; + + if (numcomps > 4) { + numcomps = 4; + } + + for (compno = 1; compno < numcomps; ++compno) { + if (image->comps[0].dx != image->comps[compno].dx) { + break; + } + if (image->comps[0].dy != image->comps[compno].dy) { + break; + } + if (image->comps[0].prec != image->comps[compno].prec) { + break; + } + if (image->comps[0].sgnd != image->comps[compno].sgnd) { + break; + } + } + if (compno != numcomps) { + fprintf(stderr, + "imagetoraw_common: All components shall have the same subsampling, same bit depth, same sign.\n"); + fprintf(stderr, "\tAborting\n"); return 1; } @@ -2500,47 +2489,52 @@ static int imagetoraw_common(opj_image_t * image, const char *outfile, OPJ_BOOL } fails = 1; - fprintf(stdout,"Raw image characteristics: %d components\n", image->numcomps); + fprintf(stdout, "Raw image characteristics: %d components\n", image->numcomps); - for(compno = 0; compno < image->numcomps; compno++) - { - fprintf(stdout,"Component %d characteristics: %dx%dx%d %s\n", compno, image->comps[compno].w, - image->comps[compno].h, image->comps[compno].prec, image->comps[compno].sgnd==1 ? "signed": "unsigned"); + for (compno = 0; compno < image->numcomps; compno++) { + fprintf(stdout, "Component %u characteristics: %dx%dx%d %s\n", compno, + image->comps[compno].w, + image->comps[compno].h, image->comps[compno].prec, + image->comps[compno].sgnd == 1 ? "signed" : "unsigned"); w = (int)image->comps[compno].w; h = (int)image->comps[compno].h; - if(image->comps[compno].prec <= 8) - { - if(image->comps[compno].sgnd == 1) - { + if (image->comps[compno].prec <= 8) { + if (image->comps[compno].sgnd == 1) { mask = (1 << image->comps[compno].prec) - 1; ptr = image->comps[compno].data; for (line = 0; line < h; line++) { - for(row = 0; row < w; row++) { + for (row = 0; row < w; row++) { curr = *ptr; - if(curr > 127) curr = 127; else if(curr < -128) curr = -128; - uc = (unsigned char) (curr & mask); + if (curr > 127) { + curr = 127; + } else if (curr < -128) { + curr = -128; + } + uc = (unsigned char)(curr & mask); res = fwrite(&uc, 1, 1, rawFile); - if( res < 1 ) { + if (res < 1) { fprintf(stderr, "failed to write 1 byte for %s\n", outfile); goto fin; } ptr++; } } - } - else if(image->comps[compno].sgnd == 0) - { + } else if (image->comps[compno].sgnd == 0) { mask = (1 << image->comps[compno].prec) - 1; ptr = image->comps[compno].data; for (line = 0; line < h; line++) { - for(row = 0; row < w; row++) { + for (row = 0; row < w; row++) { curr = *ptr; - if(curr > 255) curr = 255; else if(curr < 0) curr = 0; - uc = (unsigned char) (curr & mask); + if (curr > 255) { + curr = 255; + } else if (curr < 0) { + curr = 0; + } + uc = (unsigned char)(curr & mask); res = fwrite(&uc, 1, 1, rawFile); - if( res < 1 ) { + if (res < 1) { fprintf(stderr, "failed to write 1 byte for %s\n", outfile); goto fin; } @@ -2548,40 +2542,49 @@ static int imagetoraw_common(opj_image_t * image, const char *outfile, OPJ_BOOL } } } - } - else if(image->comps[compno].prec <= 16) - { - if(image->comps[compno].sgnd == 1) - { - union { signed short val; signed char vals[2]; } uc16; + } else if (image->comps[compno].prec <= 16) { + if (image->comps[compno].sgnd == 1) { + union { + signed short val; + signed char vals[2]; + } uc16; mask = (1 << image->comps[compno].prec) - 1; ptr = image->comps[compno].data; for (line = 0; line < h; line++) { - for(row = 0; row < w; row++) { + for (row = 0; row < w; row++) { curr = *ptr; - if(curr > 32767 ) curr = 32767; else if( curr < -32768) curr = -32768; + if (curr > 32767) { + curr = 32767; + } else if (curr < -32768) { + curr = -32768; + } uc16.val = (signed short)(curr & mask); res = fwrite(uc16.vals, 1, 2, rawFile); - if( res < 2 ) { + if (res < 2) { fprintf(stderr, "failed to write 2 byte for %s\n", outfile); goto fin; } ptr++; } } - } - else if(image->comps[compno].sgnd == 0) - { - union { unsigned short val; unsigned char vals[2]; } uc16; + } else if (image->comps[compno].sgnd == 0) { + union { + unsigned short val; + unsigned char vals[2]; + } uc16; mask = (1 << image->comps[compno].prec) - 1; ptr = image->comps[compno].data; for (line = 0; line < h; line++) { - for(row = 0; row < w; row++) { + for (row = 0; row < w; row++) { curr = *ptr; - if(curr > 65536 ) curr = 65536; else if( curr < 0) curr = 0; + if (curr > 65535) { + curr = 65535; + } else if (curr < 0) { + curr = 0; + } uc16.val = (unsigned short)(curr & mask); res = fwrite(uc16.vals, 1, 2, rawFile); - if( res < 2 ) { + if (res < 2) { fprintf(stderr, "failed to write 2 byte for %s\n", outfile); goto fin; } @@ -2589,19 +2592,15 @@ static int imagetoraw_common(opj_image_t * image, const char *outfile, OPJ_BOOL } } } - } - else if (image->comps[compno].prec <= 32) - { - fprintf(stderr,"More than 16 bits per component no handled yet\n"); + } else if (image->comps[compno].prec <= 32) { + fprintf(stderr, "More than 16 bits per component not handled yet\n"); goto fin; - } - else - { - fprintf(stderr,"Error: invalid precision: %d\n", image->comps[compno].prec); + } else { + fprintf(stderr, "Error: invalid precision: %d\n", image->comps[compno].prec); goto fin; } } - fails = 0; + fails = 0; fin: fclose(rawFile); return fails; @@ -2617,562 +2616,3 @@ int imagetorawl(opj_image_t * image, const char *outfile) return imagetoraw_common(image, outfile, OPJ_FALSE); } -#ifdef OPJ_HAVE_LIBPNG - -#define PNG_MAGIC "\x89PNG\x0d\x0a\x1a\x0a" -#define MAGIC_SIZE 8 -/* PNG allows bits per sample: 1, 2, 4, 8, 16 */ - -opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params) -{ - png_structp png; - png_infop info; - double gamma, display_exponent; - int bit_depth, interlace_type,compression_type, filter_type; - int unit; - png_uint_32 resx, resy; - unsigned int i, j; - png_uint_32 width, height; - int color_type, has_alpha, is16; - unsigned char *s; - FILE *reader; - unsigned char **rows; - /* j2k: */ - opj_image_t *image; - opj_image_cmptparm_t cmptparm[4]; - int sub_dx, sub_dy; - unsigned int nr_comp; - int *r, *g, *b, *a = NULL; - unsigned char sigbuf[8]; - - if((reader = fopen(read_idf, "rb")) == NULL) - { - fprintf(stderr,"pngtoimage: can not open %s\n",read_idf); - return NULL; - } - image = NULL; png = NULL; rows = NULL; - - if(fread(sigbuf, 1, MAGIC_SIZE, reader) != MAGIC_SIZE - || memcmp(sigbuf, PNG_MAGIC, MAGIC_SIZE) != 0) - { - fprintf(stderr,"pngtoimage: %s is no valid PNG file\n",read_idf); - goto fin; - } - /* libpng-VERSION/example.c: - * PC : screen_gamma = 2.2; - * Mac: screen_gamma = 1.7 or 1.0; -*/ - display_exponent = 2.2; - - if((png = png_create_read_struct(PNG_LIBPNG_VER_STRING, - NULL, NULL, NULL)) == NULL) - goto fin; - if((info = png_create_info_struct(png)) == NULL) - goto fin; - - if(setjmp(png_jmpbuf(png))) - goto fin; - - png_init_io(png, reader); - png_set_sig_bytes(png, MAGIC_SIZE); - - png_read_info(png, info); - - if(png_get_IHDR(png, info, &width, &height, - &bit_depth, &color_type, &interlace_type, - &compression_type, &filter_type) == 0) - goto fin; - - /* png_set_expand(): - * expand paletted images to RGB, expand grayscale images of - * less than 8-bit depth to 8-bit depth, and expand tRNS chunks - * to alpha channels. -*/ - if(color_type == PNG_COLOR_TYPE_PALETTE) - png_set_expand(png); - else - if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_expand(png); - - if(png_get_valid(png, info, PNG_INFO_tRNS)) - png_set_expand(png); - - is16 = (bit_depth == 16); - - /* GRAY => RGB; GRAY_ALPHA => RGBA -*/ - if(color_type == PNG_COLOR_TYPE_GRAY - || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - { - png_set_gray_to_rgb(png); - color_type = - (color_type == PNG_COLOR_TYPE_GRAY? PNG_COLOR_TYPE_RGB: - PNG_COLOR_TYPE_RGB_ALPHA); - } - if( !png_get_gAMA(png, info, &gamma)) - gamma = 0.45455; - - png_set_gamma(png, display_exponent, gamma); - - png_read_update_info(png, info); - - png_get_pHYs(png, info, &resx, &resy, &unit); - - color_type = png_get_color_type(png, info); - - has_alpha = (color_type == PNG_COLOR_TYPE_RGB_ALPHA); - - nr_comp = 3 + (unsigned int)has_alpha; - - bit_depth = png_get_bit_depth(png, info); - - rows = (unsigned char**)calloc(height+1, sizeof(unsigned char*)); - for(i = 0; i < height; ++i) - rows[i] = (unsigned char*)malloc(png_get_rowbytes(png,info)); - - png_read_image(png, rows); - - memset(cmptparm, 0, sizeof(cmptparm)); - - sub_dx = params->subsampling_dx; sub_dy = params->subsampling_dy; - - for(i = 0; i < nr_comp; ++i) - { - cmptparm[i].prec = (OPJ_UINT32)bit_depth; - /* bits_per_pixel: 8 or 16 */ - cmptparm[i].bpp = (OPJ_UINT32)bit_depth; - cmptparm[i].sgnd = 0; - cmptparm[i].dx = (OPJ_UINT32)sub_dx; - cmptparm[i].dy = (OPJ_UINT32)sub_dy; - cmptparm[i].w = (OPJ_UINT32)width; - cmptparm[i].h = (OPJ_UINT32)height; - } - - image = opj_image_create(nr_comp, &cmptparm[0], OPJ_CLRSPC_SRGB); - - if(image == NULL) goto fin; - - image->x0 = (OPJ_UINT32)params->image_offset_x0; - image->y0 = (OPJ_UINT32)params->image_offset_y0; - image->x1 = (OPJ_UINT32)(image->x0 + (width - 1) * (OPJ_UINT32)sub_dx + 1 + image->x0); - image->y1 = (OPJ_UINT32)(image->y0 + (height - 1) * (OPJ_UINT32)sub_dy + 1 + image->y0); - - r = image->comps[0].data; - g = image->comps[1].data; - b = image->comps[2].data; - if(has_alpha) { - a = image->comps[3].data; - image->comps[3].alpha = 1; - } - - for(i = 0; i < height; ++i) - { - s = rows[i]; - - for(j = 0; j < width; ++j) - { - if(is16) - { - *r++ = s[0]<<8|s[1]; s += 2; - - *g++ = s[0]<<8|s[1]; s += 2; - - *b++ = s[0]<<8|s[1]; s += 2; - - if(has_alpha) { *a++ = s[0]<<8|s[1]; s += 2; } - - continue; - } - *r++ = *s++; *g++ = *s++; *b++ = *s++; - - if(has_alpha) *a++ = *s++; - } - } -fin: - if(rows) - { - for(i = 0; i < height; ++i) - free(rows[i]); - free(rows); - } - if(png) - png_destroy_read_struct(&png, &info, NULL); - - fclose(reader); - - return image; - -}/* pngtoimage() */ - -int imagetopng(opj_image_t * image, const char *write_idf) -{ - FILE *writer; - png_structp png; - png_infop info; - int *red, *green, *blue, *alpha; - unsigned char *row_buf, *d; - int has_alpha, width, height, nr_comp, color_type; - int adjustR, adjustG, adjustB, adjustA, x, y, fails; - int prec, ushift, dshift, is16, force16, force8; - unsigned short mask = 0xffff; - png_color_8 sig_bit; - - is16 = force16 = force8 = ushift = dshift = 0; fails = 1; - prec = (int)image->comps[0].prec; - nr_comp = (int)image->numcomps; - - if(prec > 8 && prec < 16) - { - ushift = 16 - prec; dshift = prec - ushift; - prec = 16; force16 = 1; - } - else - if(prec < 8 && nr_comp > 1)/* GRAY_ALPHA, RGB, RGB_ALPHA */ - { - ushift = 8 - prec; dshift = 8 - ushift; - prec = 8; force8 = 1; - } - - if(prec != 1 && prec != 2 && prec != 4 && prec != 8 && prec != 16) - { - fprintf(stderr,"imagetopng: can not create %s" - "\n\twrong bit_depth %d\n", write_idf, prec); - return fails; - } - writer = fopen(write_idf, "wb"); - - if(writer == NULL) return fails; - - info = NULL; has_alpha = 0; - - /* Create and initialize the png_struct with the desired error handler - * functions. If you want to use the default stderr and longjump method, - * you can supply NULL for the last three parameters. We also check that - * the library version is compatible with the one used at compile time, - * in case we are using dynamically linked libraries. REQUIRED. -*/ - png = png_create_write_struct(PNG_LIBPNG_VER_STRING, - NULL, NULL, NULL); - /*png_voidp user_error_ptr, user_error_fn, user_warning_fn); */ - - if(png == NULL) goto fin; - - /* Allocate/initialize the image information data. REQUIRED -*/ - info = png_create_info_struct(png); - - if(info == NULL) goto fin; - - /* Set error handling. REQUIRED if you are not supplying your own - * error handling functions in the png_create_write_struct() call. -*/ - if(setjmp(png_jmpbuf(png))) goto fin; - - /* I/O initialization functions is REQUIRED -*/ - png_init_io(png, writer); - - /* Set the image information here. Width and height are up to 2^31, - * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on - * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY, - * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB, - * or PNG_COLOR_TYPE_RGB_ALPHA. interlace is either PNG_INTERLACE_NONE or - * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST - * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. - * REQUIRED - * - * ERRORS: - * - * color_type == PNG_COLOR_TYPE_PALETTE && bit_depth > 8 - * color_type == PNG_COLOR_TYPE_RGB && bit_depth < 8 - * color_type == PNG_COLOR_TYPE_GRAY_ALPHA && bit_depth < 8 - * color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8 - * -*/ - png_set_compression_level(png, Z_BEST_COMPRESSION); - - if(prec == 16) mask = 0xffff; - else - if(prec == 8) mask = 0x00ff; - else - if(prec == 4) mask = 0x000f; - else - if(prec == 2) mask = 0x0003; - else - if(prec == 1) mask = 0x0001; - - if(nr_comp >= 3 - && image->comps[0].dx == image->comps[1].dx - && image->comps[1].dx == image->comps[2].dx - && image->comps[0].dy == image->comps[1].dy - && image->comps[1].dy == image->comps[2].dy - && image->comps[0].prec == image->comps[1].prec - && image->comps[1].prec == image->comps[2].prec) - { - int v; - - has_alpha = (nr_comp > 3); - - is16 = (prec == 16); - - width = (int)image->comps[0].w; - height = (int)image->comps[0].h; - - red = image->comps[0].data; - green = image->comps[1].data; - blue = image->comps[2].data; - - sig_bit.red = sig_bit.green = sig_bit.blue = (png_byte)prec; - - if(has_alpha) - { - sig_bit.alpha = (png_byte)prec; - alpha = image->comps[3].data; - color_type = PNG_COLOR_TYPE_RGB_ALPHA; - adjustA = (image->comps[3].sgnd ? 1 << (image->comps[3].prec - 1) : 0); - } - else - { - sig_bit.alpha = 0; alpha = NULL; - color_type = PNG_COLOR_TYPE_RGB; - adjustA = 0; - } - png_set_sBIT(png, info, &sig_bit); - - png_set_IHDR(png, info, (png_uint_32)width, (png_uint_32)height, prec, - color_type, - PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - png_set_gamma(png, 2.2, 1./2.2); - png_set_sRGB(png, info, PNG_sRGB_INTENT_PERCEPTUAL); - /*=============================*/ - png_write_info(png, info); - /*=============================*/ - if(prec < 8) - { - png_set_packing(png); - } -printf("%s:%d:sgnd(%d,%d,%d) w(%d) h(%d) alpha(%d)\n",__FILE__,__LINE__, -image->comps[0].sgnd, -image->comps[1].sgnd,image->comps[2].sgnd,width,height,has_alpha); - - adjustR = (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0); - adjustG = (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0); - adjustB = (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0); - - row_buf = (unsigned char*)malloc((size_t)width * (size_t)nr_comp * 2); - - for(y = 0; y < height; ++y) - { - d = row_buf; - - for(x = 0; x < width; ++x) - { - if(is16) - { - v = *red + adjustR; ++red; - if(v > 65535) v = 65535; else if(v < 0) v = 0; - - if(force16) { v = (v<>dshift); } - - *d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v; - - v = *green + adjustG; ++green; - if(v > 65535) v = 65535; else if(v < 0) v = 0; - - if(force16) { v = (v<>dshift); } - - *d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v; - - v = *blue + adjustB; ++blue; - if(v > 65535) v = 65535; else if(v < 0) v = 0; - - if(force16) { v = (v<>dshift); } - - *d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v; - - if(has_alpha) - { - v = *alpha + adjustA; ++alpha; - if(v > 65535) v = 65535; else if(v < 0) v = 0; - - if(force16) { v = (v<>dshift); } - - *d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v; - } - continue; - }/* if(is16) */ - - v = *red + adjustR; ++red; - if(v > 255) v = 255; else if(v < 0) v = 0; - - if(force8) { v = (v<>dshift); } - - *d++ = (unsigned char)(v & mask); - - v = *green + adjustG; ++green; - if(v > 255) v = 255; else if(v < 0) v = 0; - - if(force8) { v = (v<>dshift); } - - *d++ = (unsigned char)(v & mask); - - v = *blue + adjustB; ++blue; - if(v > 255) v = 255; else if(v < 0) v = 0; - - if(force8) { v = (v<>dshift); } - - *d++ = (unsigned char)(v & mask); - - if(has_alpha) - { - v = *alpha + adjustA; ++alpha; - if(v > 255) v = 255; else if(v < 0) v = 0; - - if(force8) { v = (v<>dshift); } - - *d++ = (unsigned char)(v & mask); - } - } /* for(x) */ - - png_write_row(png, row_buf); - - } /* for(y) */ - free(row_buf); - - }/* nr_comp >= 3 */ - else - if(nr_comp == 1 /* GRAY */ - || ( nr_comp == 2 /* GRAY_ALPHA */ - && image->comps[0].dx == image->comps[1].dx - && image->comps[0].dy == image->comps[1].dy - && image->comps[0].prec == image->comps[1].prec)) - { - int v; - - red = image->comps[0].data; - - sig_bit.gray = (png_byte)prec; - sig_bit.red = sig_bit.green = sig_bit.blue = sig_bit.alpha = 0; - alpha = NULL; adjustA = 0; - color_type = PNG_COLOR_TYPE_GRAY; - - if(nr_comp == 2) - { - has_alpha = 1; sig_bit.alpha = (png_byte)prec; - alpha = image->comps[1].data; - color_type = PNG_COLOR_TYPE_GRAY_ALPHA; - adjustA = (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0); - } - width = (int)image->comps[0].w; - height = (int)image->comps[0].h; - - png_set_IHDR(png, info, (png_uint_32)width, (png_uint_32)height, sig_bit.gray, - color_type, - PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - png_set_sBIT(png, info, &sig_bit); - - png_set_gamma(png, 2.2, 1./2.2); - png_set_sRGB(png, info, PNG_sRGB_INTENT_PERCEPTUAL); - /*=============================*/ - png_write_info(png, info); - /*=============================*/ - adjustR = (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0); - - if(prec < 8) - { - png_set_packing(png); - } - - if(prec > 8) - { - row_buf = (unsigned char*) - malloc((size_t)width * (size_t)nr_comp * sizeof(unsigned short)); - - for(y = 0; y < height; ++y) - { - d = row_buf; - - for(x = 0; x < width; ++x) - { - v = *red + adjustR; ++red; - if(v > 65535) v = 65535; else if(v < 0) v = 0; - - if(force16) { v = (v<>dshift); } - - *d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v; - - if(has_alpha) - { - v = *alpha++; - if(v > 65535) v = 65535; else if(v < 0) v = 0; - - if(force16) { v = (v<>dshift); } - - *d++ = (unsigned char)(v>>8); *d++ = (unsigned char)v; - } - }/* for(x) */ - png_write_row(png, row_buf); - - } /* for(y) */ - free(row_buf); - } - else /* prec <= 8 */ - { - row_buf = (unsigned char*)calloc((size_t)width, (size_t)nr_comp * 2); - - for(y = 0; y < height; ++y) - { - d = row_buf; - - for(x = 0; x < width; ++x) - { - v = *red + adjustR; ++red; - if(v > 255) v = 255; else if(v < 0) v = 0; - - if(force8) { v = (v<>dshift); } - - *d++ = (unsigned char)(v & mask); - - if(has_alpha) - { - v = *alpha + adjustA; ++alpha; - if(v > 255) v = 255; else if(v < 0) v = 0; - - if(force8) { v = (v<>dshift); } - - *d++ = (unsigned char)(v & mask); - } - }/* for(x) */ - - png_write_row(png, row_buf); - - } /* for(y) */ - free(row_buf); - } - } - else - { - fprintf(stderr,"imagetopng: can not create %s\n",write_idf); - goto fin; - } - png_write_end(png, info); - - fails = 0; - -fin: - - if(png) - { - png_destroy_write_struct(&png, &info); - } - fclose(writer); - - if(fails) remove(write_idf); - - return fails; -}/* imagetopng() */ -#endif /* OPJ_HAVE_LIBPNG */