X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fbin%2Fjp2%2Fconverttif.c;h=895b482f0a501122ac06967456e35651dadecbfc;hb=9f750884f91a4f1b9ca3e6a401057c21a7e2bd99;hp=85fc2b977323ba3c69598c482267547116a958e8;hpb=ac9fb5a302c3f53d7bbce8e62c142ce275f8027d;p=openjpeg.git diff --git a/src/bin/jp2/converttif.c b/src/bin/jp2/converttif.c index 85fc2b97..895b482f 100644 --- a/src/bin/jp2/converttif.c +++ b/src/bin/jp2/converttif.c @@ -12,6 +12,7 @@ * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan + * Copyright (c) 2015, Matthieu Darbois * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,6 +42,7 @@ #include #include #include +#include #ifndef OPJ_HAVE_LIBTIFF # error OPJ_HAVE_LIBTIFF_NOT_DEFINED @@ -49,674 +51,1192 @@ #include #include "openjpeg.h" #include "convert.h" +#include "opj_inttypes.h" /* -->> -->> -->> -->> - + TIFF IMAGE FORMAT - + <<-- <<-- <<-- <<-- */ +#define PUTBITS2(s, nb) \ + trailing <<= remaining; \ + trailing |= (unsigned int)((s) >> (nb - remaining)); \ + *pDst++ = (OPJ_BYTE)trailing; \ + trailing = (unsigned int)((s) & ((1U << (nb - remaining)) - 1U)); \ + if (nb >= (remaining + 8)) { \ + *pDst++ = (OPJ_BYTE)(trailing >> (nb - (remaining + 8))); \ + trailing &= (unsigned int)((1U << (nb - (remaining + 8))) - 1U); \ + remaining += 16 - nb; \ + } else { \ + remaining += 8 - nb; \ + } -int imagetotif(opj_image_t * image, const char *outfile) +#define PUTBITS(s, nb) \ + if (nb >= remaining) { \ + PUTBITS2(s, nb) \ + } else { \ + trailing <<= nb; \ + trailing |= (unsigned int)(s); \ + remaining -= nb; \ + } +#define FLUSHBITS() \ + if (remaining != 8) { \ + trailing <<= remaining; \ + *pDst++ = (OPJ_BYTE)trailing; \ + } + +static void tif_32sto3u(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) { - 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() */ + 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 << 5) | (src1 << 2) | (src2 >> 1)); + *pDst++ = (OPJ_BYTE)((src2 << 7) | (src3 << 4) | (src4 << 1) | (src5 >> 2)); + *pDst++ = (OPJ_BYTE)((src5 << 6) | (src6 << 3) | (src7)); + } + + if (length & 7U) { + unsigned int trailing = 0U; + int remaining = 8U; + length &= 7U; + PUTBITS((OPJ_UINT32)pSrc[i + 0], 3) + if (length > 1U) { + PUTBITS((OPJ_UINT32)pSrc[i + 1], 3) + if (length > 2U) { + PUTBITS((OPJ_UINT32)pSrc[i + 2], 3) + if (length > 3U) { + PUTBITS((OPJ_UINT32)pSrc[i + 3], 3) + if (length > 4U) { + PUTBITS((OPJ_UINT32)pSrc[i + 4], 3) + if (length > 5U) { + PUTBITS((OPJ_UINT32)pSrc[i + 5], 3) + if (length > 6U) { + PUTBITS((OPJ_UINT32)pSrc[i + 6], 3) + } + } + } + } + } + } + FLUSHBITS() + } +} + +static void tif_32sto5u(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 << 3) | (src1 >> 2)); + *pDst++ = (OPJ_BYTE)((src1 << 6) | (src2 << 1) | (src3 >> 4)); + *pDst++ = (OPJ_BYTE)((src3 << 4) | (src4 >> 1)); + *pDst++ = (OPJ_BYTE)((src4 << 7) | (src5 << 2) | (src6 >> 3)); + *pDst++ = (OPJ_BYTE)((src6 << 5) | (src7)); + + } + + if (length & 7U) { + unsigned int trailing = 0U; + int remaining = 8U; + length &= 7U; + PUTBITS((OPJ_UINT32)pSrc[i + 0], 5) + if (length > 1U) { + PUTBITS((OPJ_UINT32)pSrc[i + 1], 5) + if (length > 2U) { + PUTBITS((OPJ_UINT32)pSrc[i + 2], 5) + if (length > 3U) { + PUTBITS((OPJ_UINT32)pSrc[i + 3], 5) + if (length > 4U) { + PUTBITS((OPJ_UINT32)pSrc[i + 4], 5) + if (length > 5U) { + PUTBITS((OPJ_UINT32)pSrc[i + 5], 5) + if (length > 6U) { + PUTBITS((OPJ_UINT32)pSrc[i + 6], 5) + } + } + } + } + } + } + FLUSHBITS() + } +} + +static void tif_32sto7u(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]; -typedef void (* tif_Xto32s)(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length); + *pDst++ = (OPJ_BYTE)((src0 << 1) | (src1 >> 6)); + *pDst++ = (OPJ_BYTE)((src1 << 2) | (src2 >> 5)); + *pDst++ = (OPJ_BYTE)((src2 << 3) | (src3 >> 4)); + *pDst++ = (OPJ_BYTE)((src3 << 4) | (src4 >> 3)); + *pDst++ = (OPJ_BYTE)((src4 << 5) | (src5 >> 2)); + *pDst++ = (OPJ_BYTE)((src5 << 6) | (src6 >> 1)); + *pDst++ = (OPJ_BYTE)((src6 << 7) | (src7)); + } -static void tif_1uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length) + if (length & 7U) { + unsigned int trailing = 0U; + int remaining = 8U; + length &= 7U; + PUTBITS((OPJ_UINT32)pSrc[i + 0], 7) + if (length > 1U) { + PUTBITS((OPJ_UINT32)pSrc[i + 1], 7) + if (length > 2U) { + PUTBITS((OPJ_UINT32)pSrc[i + 2], 7) + if (length > 3U) { + PUTBITS((OPJ_UINT32)pSrc[i + 3], 7) + if (length > 4U) { + PUTBITS((OPJ_UINT32)pSrc[i + 4], 7) + if (length > 5U) { + PUTBITS((OPJ_UINT32)pSrc[i + 5], 7) + if (length > 6U) { + PUTBITS((OPJ_UINT32)pSrc[i + 6], 7) + } + } + } + } + } + } + FLUSHBITS() + } +} + +static void tif_32sto9u(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) { - OPJ_SIZE_T i; - for (i = 0; i < (length & -(OPJ_SIZE_T)8U); i+=8U) { - OPJ_UINT8 val = *pSrc++; - pDst[i+0] = val >> 7; - pDst[i+1] = (val >> 6) & 0x1U; - pDst[i+2] = (val >> 5) & 0x1U; - pDst[i+3] = (val >> 4) & 0x1U; - pDst[i+4] = (val >> 3) & 0x1U; - pDst[i+5] = (val >> 2) & 0x1U; - pDst[i+6] = (val >> 1) & 0x1U; - pDst[i+7] = val & 0x1U; - } - if (length & 7U) { - OPJ_UINT8 val = *pSrc++; - length = length & 7U; - pDst[i+0] = val >> 7; - - if (length > 1U) { - pDst[i+1] = (val >> 6) & 0x1U; - if (length > 2U) { - pDst[i+2] = (val >> 5) & 0x1U; - if (length > 3U) { - pDst[i+3] = (val >> 4) & 0x1U; - if (length > 4U) { - pDst[i+4] = (val >> 3) & 0x1U; - if (length > 5U) { - pDst[i+5] = (val >> 2) & 0x1U; - if (length > 6U) { - pDst[i+6] = (val >> 1) & 0x1U; - } - } - } - } - } - } - } + 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 >> 1)); + *pDst++ = (OPJ_BYTE)((src0 << 7) | (src1 >> 2)); + *pDst++ = (OPJ_BYTE)((src1 << 6) | (src2 >> 3)); + *pDst++ = (OPJ_BYTE)((src2 << 5) | (src3 >> 4)); + *pDst++ = (OPJ_BYTE)((src3 << 4) | (src4 >> 5)); + *pDst++ = (OPJ_BYTE)((src4 << 3) | (src5 >> 6)); + *pDst++ = (OPJ_BYTE)((src5 << 2) | (src6 >> 7)); + *pDst++ = (OPJ_BYTE)((src6 << 1) | (src7 >> 8)); + *pDst++ = (OPJ_BYTE)(src7); + } + + if (length & 7U) { + unsigned int trailing = 0U; + int remaining = 8U; + length &= 7U; + PUTBITS2((OPJ_UINT32)pSrc[i + 0], 9) + if (length > 1U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 1], 9) + if (length > 2U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 2], 9) + if (length > 3U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 3], 9) + if (length > 4U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 4], 9) + if (length > 5U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 5], 9) + if (length > 6U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 6], 9) + } + } + } + } + } + } + FLUSHBITS() + } } -static void tif_2uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length) + +static void tif_32sto10u(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) { - OPJ_SIZE_T i; - for (i = 0; i < (length & -(OPJ_SIZE_T)4U); i+=4U) { - OPJ_UINT8 val = *pSrc++; - pDst[i+0] = val >> 6; - pDst[i+1] = (val >> 4) & 0x3U; - pDst[i+2] = (val >> 2) & 0x3U; - pDst[i+3] = val & 0x3U; - } - if (length & 3U) { - OPJ_UINT8 val = *pSrc++; - length = length & 3U; - pDst[i+0] = val >> 6; - - if (length > 1U) { - pDst[i+1] = (val >> 4) & 0x3U; - if (length > 2U) { - pDst[i+2] = (val >> 2) & 0x3U; - - } - } - } + 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); + *pDst++ = (OPJ_BYTE)(((src0 & 0x3U) << 6) | (src1 >> 4)); + *pDst++ = (OPJ_BYTE)(((src1 & 0xFU) << 4) | (src2 >> 6)); + *pDst++ = (OPJ_BYTE)(((src2 & 0x3FU) << 2) | (src3 >> 8)); + *pDst++ = (OPJ_BYTE)(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); + *pDst++ = (OPJ_BYTE)(((src0 & 0x3U) << 6) | (src1 >> 4)); + if (length > 1U) { + *pDst++ = (OPJ_BYTE)(((src1 & 0xFU) << 4) | (src2 >> 6)); + if (length > 2U) { + *pDst++ = (OPJ_BYTE)(((src2 & 0x3FU) << 2)); + } + } + } +} +static void tif_32sto11u(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 >> 3)); + *pDst++ = (OPJ_BYTE)((src0 << 5) | (src1 >> 6)); + *pDst++ = (OPJ_BYTE)((src1 << 2) | (src2 >> 9)); + *pDst++ = (OPJ_BYTE)((src2 >> 1)); + *pDst++ = (OPJ_BYTE)((src2 << 7) | (src3 >> 4)); + *pDst++ = (OPJ_BYTE)((src3 << 4) | (src4 >> 7)); + *pDst++ = (OPJ_BYTE)((src4 << 1) | (src5 >> 10)); + *pDst++ = (OPJ_BYTE)((src5 >> 2)); + *pDst++ = (OPJ_BYTE)((src5 << 6) | (src6 >> 5)); + *pDst++ = (OPJ_BYTE)((src6 << 3) | (src7 >> 8)); + *pDst++ = (OPJ_BYTE)(src7); + } + + if (length & 7U) { + unsigned int trailing = 0U; + int remaining = 8U; + length &= 7U; + PUTBITS2((OPJ_UINT32)pSrc[i + 0], 11) + if (length > 1U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 1], 11) + if (length > 2U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 2], 11) + if (length > 3U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 3], 11) + if (length > 4U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 4], 11) + if (length > 5U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 5], 11) + if (length > 6U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 6], 11) + } + } + } + } + } + } + FLUSHBITS() + } } -static void tif_4uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length) +static void tif_32sto12u(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) { - OPJ_SIZE_T i; - for (i = 0; i < (length & -(OPJ_SIZE_T)2U); i+=2U) { - OPJ_UINT8 val = *pSrc++; - pDst[i+0] = val >> 4; - pDst[i+1] = val & 0xFU; - } - if (length & 1U) { - OPJ_UINT8 val = *pSrc++; - pDst[i+0] = val >> 4; - } + 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); + *pDst++ = (OPJ_BYTE)(((src0 & 0xFU) << 4) | (src1 >> 8)); + *pDst++ = (OPJ_BYTE)(src1); + } + + if (length & 1U) { + OPJ_UINT32 src0 = (OPJ_UINT32)pSrc[i + 0]; + *pDst++ = (OPJ_BYTE)(src0 >> 4); + *pDst++ = (OPJ_BYTE)(((src0 & 0xFU) << 4)); + } } -static void tif_6uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length) +static void tif_32sto13u(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) { - OPJ_SIZE_T i; - for (i = 0; i < (length & -(OPJ_SIZE_T)4U); i+=4U) { - OPJ_UINT8 val0 = *pSrc++; - OPJ_UINT8 val1 = *pSrc++; - OPJ_UINT8 val2 = *pSrc++; - pDst[i+0] = val0 >> 2; - pDst[i+1] = ((val0 & 0x3U) << 4) | (val1 >> 4); - pDst[i+2] = ((val1 & 0xFU) << 2) | (val2 >> 6); - pDst[i+3] = val2 & 0x3FU; - - } - if (length & 3U) { - OPJ_UINT8 val0 = *pSrc++; - length = length & 3U; - pDst[i+0] = val0 >> 2; - - if (length > 1U) { - OPJ_UINT8 val1 = *pSrc++; - pDst[i+1] = ((val0 & 0x3U) << 4) | (val1 >> 4); - if (length > 2U) { - OPJ_UINT8 val2 = *pSrc++; - pDst[i+2] = ((val1 & 0xFU) << 2) | (val2 >> 6); - } - } - } + 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 >> 5)); + *pDst++ = (OPJ_BYTE)((src0 << 3) | (src1 >> 10)); + *pDst++ = (OPJ_BYTE)((src1 >> 2)); + *pDst++ = (OPJ_BYTE)((src1 << 6) | (src2 >> 7)); + *pDst++ = (OPJ_BYTE)((src2 << 1) | (src3 >> 12)); + *pDst++ = (OPJ_BYTE)((src3 >> 4)); + *pDst++ = (OPJ_BYTE)((src3 << 4) | (src4 >> 9)); + *pDst++ = (OPJ_BYTE)((src4 >> 1)); + *pDst++ = (OPJ_BYTE)((src4 << 7) | (src5 >> 6)); + *pDst++ = (OPJ_BYTE)((src5 << 2) | (src6 >> 11)); + *pDst++ = (OPJ_BYTE)((src6 >> 3)); + *pDst++ = (OPJ_BYTE)((src6 << 5) | (src7 >> 8)); + *pDst++ = (OPJ_BYTE)(src7); + } + + if (length & 7U) { + unsigned int trailing = 0U; + int remaining = 8U; + length &= 7U; + PUTBITS2((OPJ_UINT32)pSrc[i + 0], 13) + if (length > 1U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 1], 13) + if (length > 2U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 2], 13) + if (length > 3U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 3], 13) + if (length > 4U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 4], 13) + if (length > 5U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 5], 13) + if (length > 6U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 6], 13) + } + } + } + } + } + } + FLUSHBITS() + } } -static void tif_8uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length) +static void tif_32sto14u(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) { - OPJ_SIZE_T i; - for (i = 0; i < length; ++i) { - pDst[i] = pSrc[i]; - } + 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); + *pDst++ = (OPJ_BYTE)(((src0 & 0x3FU) << 2) | (src1 >> 12)); + *pDst++ = (OPJ_BYTE)(src1 >> 4); + *pDst++ = (OPJ_BYTE)(((src1 & 0xFU) << 4) | (src2 >> 10)); + *pDst++ = (OPJ_BYTE)(src2 >> 2); + *pDst++ = (OPJ_BYTE)(((src2 & 0x3U) << 6) | (src3 >> 8)); + *pDst++ = (OPJ_BYTE)(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); + *pDst++ = (OPJ_BYTE)(((src0 & 0x3FU) << 2) | (src1 >> 12)); + if (length > 1U) { + *pDst++ = (OPJ_BYTE)(src1 >> 4); + *pDst++ = (OPJ_BYTE)(((src1 & 0xFU) << 4) | (src2 >> 10)); + if (length > 2U) { + *pDst++ = (OPJ_BYTE)(src2 >> 2); + *pDst++ = (OPJ_BYTE)(((src2 & 0x3U) << 6)); + } + } + } } -static void tif_10uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length) +static void tif_32sto15u(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, + OPJ_SIZE_T length) { - OPJ_SIZE_T i; - for (i = 0; i < (length & -(OPJ_SIZE_T)4U); i+=4U) { - OPJ_INT32 val0 = *pSrc++; - OPJ_INT32 val1 = *pSrc++; - OPJ_INT32 val2 = *pSrc++; - OPJ_INT32 val3 = *pSrc++; - OPJ_INT32 val4 = *pSrc++; - - pDst[i+0] = (val0 << 2) | (val1 >> 6); - pDst[i+1] = ((val1 & 0x3FU) << 4) | (val2 >> 4); - pDst[i+2] = ((val2 & 0xFU) << 6) | (val3 >> 2); - pDst[i+3] = ((val3 & 0x3U) << 8) | val4; - - } - if (length & 3U) { - OPJ_INT32 val0 = *pSrc++; - OPJ_INT32 val1 = *pSrc++; - length = length & 3U; - pDst[i+0] = (val0 << 2) | (val1 >> 6); - - if (length > 1U) { - OPJ_INT32 val2 = *pSrc++; - pDst[i+1] = ((val1 & 0x3FU) << 4) | (val2 >> 4); - if (length > 2U) { - OPJ_INT32 val3 = *pSrc++; - pDst[i+2] = ((val2 & 0xFU) << 6) | (val3 >> 2); - } - } - } + 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)); + *pDst++ = (OPJ_BYTE)((src0 << 1) | (src1 >> 14)); + *pDst++ = (OPJ_BYTE)((src1 >> 6)); + *pDst++ = (OPJ_BYTE)((src1 << 2) | (src2 >> 13)); + *pDst++ = (OPJ_BYTE)((src2 >> 5)); + *pDst++ = (OPJ_BYTE)((src2 << 3) | (src3 >> 12)); + *pDst++ = (OPJ_BYTE)((src3 >> 4)); + *pDst++ = (OPJ_BYTE)((src3 << 4) | (src4 >> 11)); + *pDst++ = (OPJ_BYTE)((src4 >> 3)); + *pDst++ = (OPJ_BYTE)((src4 << 5) | (src5 >> 10)); + *pDst++ = (OPJ_BYTE)((src5 >> 2)); + *pDst++ = (OPJ_BYTE)((src5 << 6) | (src6 >> 9)); + *pDst++ = (OPJ_BYTE)((src6 >> 1)); + *pDst++ = (OPJ_BYTE)((src6 << 7) | (src7 >> 8)); + *pDst++ = (OPJ_BYTE)(src7); + } + + if (length & 7U) { + unsigned int trailing = 0U; + int remaining = 8U; + length &= 7U; + PUTBITS2((OPJ_UINT32)pSrc[i + 0], 15) + if (length > 1U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 1], 15) + if (length > 2U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 2], 15) + if (length > 3U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 3], 15) + if (length > 4U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 4], 15) + if (length > 5U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 5], 15) + if (length > 6U) { + PUTBITS2((OPJ_UINT32)pSrc[i + 6], 15) + } + } + } + } + } + } + FLUSHBITS() + } } -static void tif_12uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length) +static void tif_32sto16u(const OPJ_INT32* pSrc, OPJ_UINT16* pDst, + OPJ_SIZE_T length) { - OPJ_SIZE_T i; - for (i = 0; i < (length & -(OPJ_SIZE_T)2U); i+=2U) { - OPJ_INT32 val0 = *pSrc++; - OPJ_INT32 val1 = *pSrc++; - OPJ_INT32 val2 = *pSrc++; - - pDst[i+0] = (val0 << 4) | (val1 >> 4); - pDst[i+1] = ((val1 & 0xFU) << 8) | val2; - } - if (length & 1U) { - OPJ_INT32 val0 = *pSrc++; - OPJ_INT32 val1 = *pSrc++; - pDst[i+0] = (val0 << 4) | (val1 >> 4); - } + OPJ_SIZE_T i; + for (i = 0; i < length; ++i) { + pDst[i] = (OPJ_UINT16)pSrc[i]; + } } -static void tif_14uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length) + +int imagetotif(opj_image_t * image, const char *outfile) { - OPJ_SIZE_T i; - for (i = 0; i < (length & -(OPJ_SIZE_T)4U); i+=4U) { - OPJ_INT32 val0 = *pSrc++; - OPJ_INT32 val1 = *pSrc++; - OPJ_INT32 val2 = *pSrc++; - OPJ_INT32 val3 = *pSrc++; - OPJ_INT32 val4 = *pSrc++; - OPJ_INT32 val5 = *pSrc++; - OPJ_INT32 val6 = *pSrc++; - - pDst[i+0] = (val0 << 6) | (val1 >> 2); - pDst[i+1] = ((val1 & 0x3U) << 12) | (val2 << 4) | (val3 >> 4); - pDst[i+2] = ((val3 & 0xFU) << 10) | (val4 << 2) | (val5 >> 6); - pDst[i+3] = ((val5 & 0x3FU) << 8) | val6; - - } - if (length & 3U) { - OPJ_INT32 val0 = *pSrc++; - OPJ_INT32 val1 = *pSrc++; - length = length & 3U; - pDst[i+0] = (val0 << 6) | (val1 >> 2); - - if (length > 1U) { - OPJ_INT32 val2 = *pSrc++; - OPJ_INT32 val3 = *pSrc++; - pDst[i+1] = ((val1 & 0x3U) << 12) | (val2 << 4) | (val3 >> 4); - if (length > 2U) { - OPJ_INT32 val4 = *pSrc++; - OPJ_INT32 val5 = *pSrc++; - pDst[i+2] = ((val3 & 0xFU) << 10) | (val4 << 2) | (val5 >> 6); - } - } - } + TIFF *tif; + tdata_t buf; + uint32 width, height; + uint16 bps, tiPhoto; + int adjust, sgnd; + int64_t strip_size, rowStride, TIFF_MAX; + OPJ_UINT32 i, numcomps; + OPJ_INT32* buffer32s = NULL; + OPJ_INT32 const* planes[4]; + convert_32s_PXCX cvtPxToCx = NULL; + convert_32sXXx_C1R cvt32sToTif = NULL; + + bps = (uint16)image->comps[0].prec; + planes[0] = image->comps[0].data; + + numcomps = image->numcomps; + + if (image->color_space == OPJ_CLRSPC_CMYK) { + if (numcomps < 4U) { + fprintf(stderr, + "imagetotif: CMYK images shall be composed of at least 4 planes.\n"); + fprintf(stderr, "\tAborting\n"); + return 1; + } + tiPhoto = PHOTOMETRIC_SEPARATED; + if (numcomps > 4U) { + numcomps = 4U; /* Alpha not supported */ + } + } else if (numcomps > 2U) { + tiPhoto = PHOTOMETRIC_RGB; + if (numcomps > 4U) { + numcomps = 4U; + } + } else { + tiPhoto = PHOTOMETRIC_MINISBLACK; + } + for (i = 1U; i < numcomps; ++i) { + if (image->comps[0].dx != image->comps[i].dx) { + break; + } + if (image->comps[0].dy != image->comps[i].dy) { + break; + } + if (image->comps[0].prec != image->comps[i].prec) { + break; + } + if (image->comps[0].sgnd != image->comps[i].sgnd) { + break; + } + planes[i] = image->comps[i].data; + } + if (i != numcomps) { + fprintf(stderr, + "imagetotif: All components shall have the same subsampling, same bit depth.\n"); + fprintf(stderr, "\tAborting\n"); + return 1; + } + + if (bps > 16) { + bps = 0; + } + if (bps == 0) { + fprintf(stderr, "imagetotif: Bits=%d, Only 1 to 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; + } + for (i = 0U; i < numcomps; ++i) { + clip_component(&(image->comps[i]), image->comps[0].prec); + } + cvtPxToCx = convert_32s_PXCX_LUT[numcomps]; + switch (bps) { + case 1: + case 2: + case 4: + case 6: + case 8: + cvt32sToTif = convert_32sXXu_C1R_LUT[bps]; + break; + case 3: + cvt32sToTif = tif_32sto3u; + break; + case 5: + cvt32sToTif = tif_32sto5u; + break; + case 7: + cvt32sToTif = tif_32sto7u; + break; + case 9: + cvt32sToTif = tif_32sto9u; + break; + case 10: + cvt32sToTif = tif_32sto10u; + break; + case 11: + cvt32sToTif = tif_32sto11u; + break; + case 12: + cvt32sToTif = tif_32sto12u; + break; + case 13: + cvt32sToTif = tif_32sto13u; + break; + case 14: + cvt32sToTif = tif_32sto14u; + break; + case 15: + cvt32sToTif = tif_32sto15u; + break; + case 16: + cvt32sToTif = (convert_32sXXx_C1R)tif_32sto16u; + break; + default: + /* never here */ + break; + } + sgnd = (int)image->comps[0].sgnd; + adjust = sgnd ? (int)(1 << (image->comps[0].prec - 1)) : 0; + width = (uint32)image->comps[0].w; + height = (uint32)image->comps[0].h; + + TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width); + TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height); + TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, (uint16)numcomps); + TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps); + TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); + TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); + TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, tiPhoto); + TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1); + if (sizeof(tsize_t) == 4) { + TIFF_MAX = INT_MAX; + } else { + TIFF_MAX = UINT_MAX; + } + strip_size = (int64_t)TIFFStripSize(tif); + + if ((int64_t)width > (int64_t)(TIFF_MAX / numcomps) || + (int64_t)(width * numcomps) > (int64_t)(TIFF_MAX / bps) || + (int64_t)(width * numcomps) > (int64_t)(TIFF_MAX / (int64_t)sizeof( + OPJ_INT32))) { + fprintf(stderr, "Buffer overflow\n"); + TIFFClose(tif); + return 1; + } + rowStride = (int64_t)((width * numcomps * bps + 7U) / 8U); + if (rowStride != strip_size) { + fprintf(stderr, "Invalid TIFF strip size\n"); + TIFFClose(tif); + return 1; + } + buf = malloc((OPJ_SIZE_T)strip_size); + if (buf == NULL) { + TIFFClose(tif); + return 1; + } + buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)(width * numcomps * sizeof( + OPJ_INT32))); + if (buffer32s == NULL) { + _TIFFfree(buf); + TIFFClose(tif); + return 1; + } + + for (i = 0; i < image->comps[0].h; ++i) { + cvtPxToCx(planes, buffer32s, (OPJ_SIZE_T)width, adjust); + cvt32sToTif(buffer32s, (OPJ_BYTE *)buf, (OPJ_SIZE_T)width * numcomps); + (void)TIFFWriteEncodedStrip(tif, i, (void*)buf, (tsize_t)strip_size); + planes[0] += width; + planes[1] += width; + planes[2] += width; + planes[3] += width; + } + _TIFFfree((void*)buf); + TIFFClose(tif); + free(buffer32s); + + return 0; +}/* imagetotif() */ + +#define GETBITS(dest, nb) { \ + int needed = (nb); \ + unsigned int dst = 0U; \ + if (available == 0) { \ + val = *pSrc++; \ + available = 8; \ + } \ + while (needed > available) { \ + dst |= val & ((1U << available) - 1U); \ + needed -= available; \ + dst <<= needed; \ + val = *pSrc++; \ + available = 8; \ + } \ + dst |= (val >> (available - needed)) & ((1U << needed) - 1U); \ + available -= needed; \ + dest = (OPJ_INT32)dst; \ } -#if 0 -static void tif_16uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length) + +static void tif_3uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length) { - OPJ_SIZE_T i; - for (i = 0; i < length; i++) { - OPJ_INT32 val0 = *pSrc++; - OPJ_INT32 val1 = *pSrc++; -#ifdef OPJ_BIG_ENDIAN - pDst[i] = (val0 << 8) | val1; -#else - pDst[i] = (val1 << 8) | val0; -#endif - } + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)7U); i += 8U) { + OPJ_UINT32 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + OPJ_UINT32 val2 = *pSrc++; + + pDst[i + 0] = (OPJ_INT32)((val0 >> 5)); + pDst[i + 1] = (OPJ_INT32)(((val0 & 0x1FU) >> 2)); + pDst[i + 2] = (OPJ_INT32)(((val0 & 0x3U) << 1) | (val1 >> 7)); + pDst[i + 3] = (OPJ_INT32)(((val1 & 0x7FU) >> 4)); + pDst[i + 4] = (OPJ_INT32)(((val1 & 0xFU) >> 1)); + pDst[i + 5] = (OPJ_INT32)(((val1 & 0x1U) << 2) | (val2 >> 6)); + pDst[i + 6] = (OPJ_INT32)(((val2 & 0x3FU) >> 3)); + pDst[i + 7] = (OPJ_INT32)(((val2 & 0x7U))); + + } + if (length & 7U) { + unsigned int val; + int available = 0; + + length = length & 7U; + + GETBITS(pDst[i + 0], 3) + + if (length > 1U) { + GETBITS(pDst[i + 1], 3) + if (length > 2U) { + GETBITS(pDst[i + 2], 3) + if (length > 3U) { + GETBITS(pDst[i + 3], 3) + if (length > 4U) { + GETBITS(pDst[i + 4], 3) + if (length > 5U) { + GETBITS(pDst[i + 5], 3) + if (length > 6U) { + GETBITS(pDst[i + 6], 3) + } + } + } + } + } + } + } } -#else -/* seems that libtiff decodes this to machine endianness */ -static void tif_16uto32s(const OPJ_UINT16* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length) +static void tif_5uto32s(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 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + OPJ_UINT32 val2 = *pSrc++; + OPJ_UINT32 val3 = *pSrc++; + OPJ_UINT32 val4 = *pSrc++; + + pDst[i + 0] = (OPJ_INT32)((val0 >> 3)); + pDst[i + 1] = (OPJ_INT32)(((val0 & 0x7U) << 2) | (val1 >> 6)); + pDst[i + 2] = (OPJ_INT32)(((val1 & 0x3FU) >> 1)); + pDst[i + 3] = (OPJ_INT32)(((val1 & 0x1U) << 4) | (val2 >> 4)); + pDst[i + 4] = (OPJ_INT32)(((val2 & 0xFU) << 1) | (val3 >> 7)); + pDst[i + 5] = (OPJ_INT32)(((val3 & 0x7FU) >> 2)); + pDst[i + 6] = (OPJ_INT32)(((val3 & 0x3U) << 3) | (val4 >> 5)); + pDst[i + 7] = (OPJ_INT32)(((val4 & 0x1FU))); + + } + if (length & 7U) { + unsigned int val; + int available = 0; + + length = length & 7U; + + GETBITS(pDst[i + 0], 5) + + if (length > 1U) { + GETBITS(pDst[i + 1], 5) + if (length > 2U) { + GETBITS(pDst[i + 2], 5) + if (length > 3U) { + GETBITS(pDst[i + 3], 5) + if (length > 4U) { + GETBITS(pDst[i + 4], 5) + if (length > 5U) { + GETBITS(pDst[i + 5], 5) + if (length > 6U) { + GETBITS(pDst[i + 6], 5) + } + } + } + } + } + } + } +} +static void tif_7uto32s(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 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + OPJ_UINT32 val2 = *pSrc++; + OPJ_UINT32 val3 = *pSrc++; + OPJ_UINT32 val4 = *pSrc++; + OPJ_UINT32 val5 = *pSrc++; + OPJ_UINT32 val6 = *pSrc++; + + pDst[i + 0] = (OPJ_INT32)((val0 >> 1)); + pDst[i + 1] = (OPJ_INT32)(((val0 & 0x1U) << 6) | (val1 >> 2)); + pDst[i + 2] = (OPJ_INT32)(((val1 & 0x3U) << 5) | (val2 >> 3)); + pDst[i + 3] = (OPJ_INT32)(((val2 & 0x7U) << 4) | (val3 >> 4)); + pDst[i + 4] = (OPJ_INT32)(((val3 & 0xFU) << 3) | (val4 >> 5)); + pDst[i + 5] = (OPJ_INT32)(((val4 & 0x1FU) << 2) | (val5 >> 6)); + pDst[i + 6] = (OPJ_INT32)(((val5 & 0x3FU) << 1) | (val6 >> 7)); + pDst[i + 7] = (OPJ_INT32)(((val6 & 0x7FU))); + + } + if (length & 7U) { + unsigned int val; + int available = 0; + + length = length & 7U; + + GETBITS(pDst[i + 0], 7) + + if (length > 1U) { + GETBITS(pDst[i + 1], 7) + if (length > 2U) { + GETBITS(pDst[i + 2], 7) + if (length > 3U) { + GETBITS(pDst[i + 3], 7) + if (length > 4U) { + GETBITS(pDst[i + 4], 7) + if (length > 5U) { + GETBITS(pDst[i + 5], 7) + if (length > 6U) { + GETBITS(pDst[i + 6], 7) + } + } + } + } + } + } + } +} +static void tif_9uto32s(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]; - } + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)7U); i += 8U) { + OPJ_UINT32 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + OPJ_UINT32 val2 = *pSrc++; + OPJ_UINT32 val3 = *pSrc++; + OPJ_UINT32 val4 = *pSrc++; + OPJ_UINT32 val5 = *pSrc++; + OPJ_UINT32 val6 = *pSrc++; + OPJ_UINT32 val7 = *pSrc++; + OPJ_UINT32 val8 = *pSrc++; + + pDst[i + 0] = (OPJ_INT32)((val0 << 1) | (val1 >> 7)); + pDst[i + 1] = (OPJ_INT32)(((val1 & 0x7FU) << 2) | (val2 >> 6)); + pDst[i + 2] = (OPJ_INT32)(((val2 & 0x3FU) << 3) | (val3 >> 5)); + pDst[i + 3] = (OPJ_INT32)(((val3 & 0x1FU) << 4) | (val4 >> 4)); + pDst[i + 4] = (OPJ_INT32)(((val4 & 0xFU) << 5) | (val5 >> 3)); + pDst[i + 5] = (OPJ_INT32)(((val5 & 0x7U) << 6) | (val6 >> 2)); + pDst[i + 6] = (OPJ_INT32)(((val6 & 0x3U) << 7) | (val7 >> 1)); + pDst[i + 7] = (OPJ_INT32)(((val7 & 0x1U) << 8) | (val8)); + + } + if (length & 7U) { + unsigned int val; + int available = 0; + + length = length & 7U; + + GETBITS(pDst[i + 0], 9) + + if (length > 1U) { + GETBITS(pDst[i + 1], 9) + if (length > 2U) { + GETBITS(pDst[i + 2], 9) + if (length > 3U) { + GETBITS(pDst[i + 3], 9) + if (length > 4U) { + GETBITS(pDst[i + 4], 9) + if (length > 5U) { + GETBITS(pDst[i + 5], 9) + if (length > 6U) { + GETBITS(pDst[i + 6], 9) + } + } + } + } + } + } + } +} +static void tif_10uto32s(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++; + OPJ_UINT32 val3 = *pSrc++; + OPJ_UINT32 val4 = *pSrc++; + + pDst[i + 0] = (OPJ_INT32)((val0 << 2) | (val1 >> 6)); + pDst[i + 1] = (OPJ_INT32)(((val1 & 0x3FU) << 4) | (val2 >> 4)); + pDst[i + 2] = (OPJ_INT32)(((val2 & 0xFU) << 6) | (val3 >> 2)); + pDst[i + 3] = (OPJ_INT32)(((val3 & 0x3U) << 8) | val4); + + } + if (length & 3U) { + OPJ_UINT32 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + length = length & 3U; + pDst[i + 0] = (OPJ_INT32)((val0 << 2) | (val1 >> 6)); + + if (length > 1U) { + OPJ_UINT32 val2 = *pSrc++; + pDst[i + 1] = (OPJ_INT32)(((val1 & 0x3FU) << 4) | (val2 >> 4)); + if (length > 2U) { + OPJ_UINT32 val3 = *pSrc++; + pDst[i + 2] = (OPJ_INT32)(((val2 & 0xFU) << 6) | (val3 >> 2)); + } + } + } } -#endif +static void tif_11uto32s(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 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + OPJ_UINT32 val2 = *pSrc++; + OPJ_UINT32 val3 = *pSrc++; + OPJ_UINT32 val4 = *pSrc++; + OPJ_UINT32 val5 = *pSrc++; + OPJ_UINT32 val6 = *pSrc++; + OPJ_UINT32 val7 = *pSrc++; + OPJ_UINT32 val8 = *pSrc++; + OPJ_UINT32 val9 = *pSrc++; + OPJ_UINT32 val10 = *pSrc++; + + pDst[i + 0] = (OPJ_INT32)((val0 << 3) | (val1 >> 5)); + pDst[i + 1] = (OPJ_INT32)(((val1 & 0x1FU) << 6) | (val2 >> 2)); + pDst[i + 2] = (OPJ_INT32)(((val2 & 0x3U) << 9) | (val3 << 1) | (val4 >> 7)); + pDst[i + 3] = (OPJ_INT32)(((val4 & 0x7FU) << 4) | (val5 >> 4)); + pDst[i + 4] = (OPJ_INT32)(((val5 & 0xFU) << 7) | (val6 >> 1)); + pDst[i + 5] = (OPJ_INT32)(((val6 & 0x1U) << 10) | (val7 << 2) | (val8 >> 6)); + pDst[i + 6] = (OPJ_INT32)(((val8 & 0x3FU) << 5) | (val9 >> 3)); + pDst[i + 7] = (OPJ_INT32)(((val9 & 0x7U) << 8) | (val10)); + + } + if (length & 7U) { + unsigned int val; + int available = 0; -typedef void (* convert_32s_CXPX)(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst, OPJ_SIZE_T length); -static void convert_32s_C1P1(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst, OPJ_SIZE_T length) + length = length & 7U; + + GETBITS(pDst[i + 0], 11) + + if (length > 1U) { + GETBITS(pDst[i + 1], 11) + if (length > 2U) { + GETBITS(pDst[i + 2], 11) + if (length > 3U) { + GETBITS(pDst[i + 3], 11) + if (length > 4U) { + GETBITS(pDst[i + 4], 11) + if (length > 5U) { + GETBITS(pDst[i + 5], 11) + if (length > 6U) { + GETBITS(pDst[i + 6], 11) + } + } + } + } + } + } + } +} +static void tif_12uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length) { - memcpy(pDst[0], pSrc, length * sizeof(OPJ_INT32)); + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)1U); i += 2U) { + OPJ_UINT32 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + OPJ_UINT32 val2 = *pSrc++; + + pDst[i + 0] = (OPJ_INT32)((val0 << 4) | (val1 >> 4)); + pDst[i + 1] = (OPJ_INT32)(((val1 & 0xFU) << 8) | val2); + } + if (length & 1U) { + OPJ_UINT32 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + pDst[i + 0] = (OPJ_INT32)((val0 << 4) | (val1 >> 4)); + } } -static void convert_32s_C2P2(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst, OPJ_SIZE_T length) +static void tif_13uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* 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]; - } + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)7U); i += 8U) { + OPJ_UINT32 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + OPJ_UINT32 val2 = *pSrc++; + OPJ_UINT32 val3 = *pSrc++; + OPJ_UINT32 val4 = *pSrc++; + OPJ_UINT32 val5 = *pSrc++; + OPJ_UINT32 val6 = *pSrc++; + OPJ_UINT32 val7 = *pSrc++; + OPJ_UINT32 val8 = *pSrc++; + OPJ_UINT32 val9 = *pSrc++; + OPJ_UINT32 val10 = *pSrc++; + OPJ_UINT32 val11 = *pSrc++; + OPJ_UINT32 val12 = *pSrc++; + + pDst[i + 0] = (OPJ_INT32)((val0 << 5) | (val1 >> 3)); + pDst[i + 1] = (OPJ_INT32)(((val1 & 0x7U) << 10) | (val2 << 2) | (val3 >> 6)); + pDst[i + 2] = (OPJ_INT32)(((val3 & 0x3FU) << 7) | (val4 >> 1)); + pDst[i + 3] = (OPJ_INT32)(((val4 & 0x1U) << 12) | (val5 << 4) | (val6 >> 4)); + pDst[i + 4] = (OPJ_INT32)(((val6 & 0xFU) << 9) | (val7 << 1) | (val8 >> 7)); + pDst[i + 5] = (OPJ_INT32)(((val8 & 0x7FU) << 6) | (val9 >> 2)); + pDst[i + 6] = (OPJ_INT32)(((val9 & 0x3U) << 11) | (val10 << 3) | (val11 >> 5)); + pDst[i + 7] = (OPJ_INT32)(((val11 & 0x1FU) << 8) | (val12)); + + } + if (length & 7U) { + unsigned int val; + int available = 0; + + length = length & 7U; + + GETBITS(pDst[i + 0], 13) + + if (length > 1U) { + GETBITS(pDst[i + 1], 13) + if (length > 2U) { + GETBITS(pDst[i + 2], 13) + if (length > 3U) { + GETBITS(pDst[i + 3], 13) + if (length > 4U) { + GETBITS(pDst[i + 4], 13) + if (length > 5U) { + GETBITS(pDst[i + 5], 13) + if (length > 6U) { + GETBITS(pDst[i + 6], 13) + } + } + } + } + } + } + } } -static void convert_32s_C3P3(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst, OPJ_SIZE_T length) +static void tif_14uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* 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]; - } + 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++; + OPJ_UINT32 val3 = *pSrc++; + OPJ_UINT32 val4 = *pSrc++; + OPJ_UINT32 val5 = *pSrc++; + OPJ_UINT32 val6 = *pSrc++; + + pDst[i + 0] = (OPJ_INT32)((val0 << 6) | (val1 >> 2)); + pDst[i + 1] = (OPJ_INT32)(((val1 & 0x3U) << 12) | (val2 << 4) | (val3 >> 4)); + pDst[i + 2] = (OPJ_INT32)(((val3 & 0xFU) << 10) | (val4 << 2) | (val5 >> 6)); + pDst[i + 3] = (OPJ_INT32)(((val5 & 0x3FU) << 8) | val6); + + } + if (length & 3U) { + OPJ_UINT32 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + length = length & 3U; + pDst[i + 0] = (OPJ_INT32)((val0 << 6) | (val1 >> 2)); + + if (length > 1U) { + OPJ_UINT32 val2 = *pSrc++; + OPJ_UINT32 val3 = *pSrc++; + pDst[i + 1] = (OPJ_INT32)(((val1 & 0x3U) << 12) | (val2 << 4) | (val3 >> 4)); + if (length > 2U) { + OPJ_UINT32 val4 = *pSrc++; + OPJ_UINT32 val5 = *pSrc++; + pDst[i + 2] = (OPJ_INT32)(((val3 & 0xFU) << 10) | (val4 << 2) | (val5 >> 6)); + } + } + } } -static void convert_32s_C4P4(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst, OPJ_SIZE_T length) +static void tif_15uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* 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]; - } + OPJ_SIZE_T i; + for (i = 0; i < (length & ~(OPJ_SIZE_T)7U); i += 8U) { + OPJ_UINT32 val0 = *pSrc++; + OPJ_UINT32 val1 = *pSrc++; + OPJ_UINT32 val2 = *pSrc++; + OPJ_UINT32 val3 = *pSrc++; + OPJ_UINT32 val4 = *pSrc++; + OPJ_UINT32 val5 = *pSrc++; + OPJ_UINT32 val6 = *pSrc++; + OPJ_UINT32 val7 = *pSrc++; + OPJ_UINT32 val8 = *pSrc++; + OPJ_UINT32 val9 = *pSrc++; + OPJ_UINT32 val10 = *pSrc++; + OPJ_UINT32 val11 = *pSrc++; + OPJ_UINT32 val12 = *pSrc++; + OPJ_UINT32 val13 = *pSrc++; + OPJ_UINT32 val14 = *pSrc++; + + pDst[i + 0] = (OPJ_INT32)((val0 << 7) | (val1 >> 1)); + pDst[i + 1] = (OPJ_INT32)(((val1 & 0x1U) << 14) | (val2 << 6) | (val3 >> 2)); + pDst[i + 2] = (OPJ_INT32)(((val3 & 0x3U) << 13) | (val4 << 5) | (val5 >> 3)); + pDst[i + 3] = (OPJ_INT32)(((val5 & 0x7U) << 12) | (val6 << 4) | (val7 >> 4)); + pDst[i + 4] = (OPJ_INT32)(((val7 & 0xFU) << 11) | (val8 << 3) | (val9 >> 5)); + pDst[i + 5] = (OPJ_INT32)(((val9 & 0x1FU) << 10) | (val10 << 2) | (val11 >> 6)); + pDst[i + 6] = (OPJ_INT32)(((val11 & 0x3FU) << 9) | (val12 << 1) | (val13 >> 7)); + pDst[i + 7] = (OPJ_INT32)(((val13 & 0x7FU) << 8) | (val14)); + + } + if (length & 7U) { + unsigned int val; + int available = 0; + + length = length & 7U; + + GETBITS(pDst[i + 0], 15) + + if (length > 1U) { + GETBITS(pDst[i + 1], 15) + if (length > 2U) { + GETBITS(pDst[i + 2], 15) + if (length > 3U) { + GETBITS(pDst[i + 3], 15) + if (length > 4U) { + GETBITS(pDst[i + 4], 15) + if (length > 5U) { + GETBITS(pDst[i + 5], 15) + if (length > 6U) { + GETBITS(pDst[i + 6], 15) + } + } + } + } + } + } + } } +/* seems that libtiff decodes this to machine endianness */ +static void tif_16uto32s(const OPJ_UINT16* pSrc, OPJ_INT32* pDst, + OPJ_SIZE_T length) +{ + OPJ_SIZE_T i; + for (i = 0; i < length; i++) { + pDst[i] = pSrc[i]; + } +} /* * libtiff/tif_getimage.c : 1,2,4,8,16 bitspersample accepted @@ -724,261 +1244,297 @@ static void convert_32s_C4P4(const OPJ_INT32* pSrc, OPJ_INT32* const* pDst, OPJ_ */ 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, currentPlane, numcomps = 0, w, h; - OPJ_COLOR_SPACE color_space; - opj_image_cmptparm_t cmptparm[4]; /* RGBA */ - opj_image_t *image = NULL; - 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_Xto32s cvtTifTo32s = NULL; - convert_32s_CXPX cvtCxToPx = NULL; - OPJ_INT32* buffer32s = NULL; - OPJ_INT32* planes[4]; - OPJ_SIZE_T rowStride; - - 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 > 16U) || ((tiBps != 1U) && (tiBps & 1U))) tiBps = 0U; - if(tiPhoto != PHOTOMETRIC_MINISBLACK && tiPhoto != PHOTOMETRIC_RGB) tiPhoto = 0; - - if( !tiBps || !tiPhoto) - { - if( !tiBps) - fprintf(stderr,"tiftoimage: Bits=%d, Only 1, 2, 4, 6, 8, 10, 12, 14 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; - } - - switch (tiBps) { - case 1: - cvtTifTo32s = tif_1uto32s; - break; - case 2: - cvtTifTo32s = tif_2uto32s; - break; - case 4: - cvtTifTo32s = tif_4uto32s; - break; - case 6: - cvtTifTo32s = tif_6uto32s; - break; - case 8: - cvtTifTo32s = tif_8uto32s; - break; - case 10: - cvtTifTo32s = tif_10uto32s; - break; - case 12: - cvtTifTo32s = tif_12uto32s; - break; - case 14: - cvtTifTo32s = tif_14uto32s; - break; - case 16: - cvtTifTo32s = (tif_Xto32s)tif_16uto32s; - break; - default: - /* never here */ - break; - } - - {/* 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) && (tiBps != 12U)) { - 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); - } else { - is_cinema = 0U; - } - - if(tiPhoto == PHOTOMETRIC_RGB) /* RGB(A) */ - { - numcomps = 3 + has_alpha; - color_space = OPJ_CLRSPC_SRGB; - } - else if (tiPhoto == PHOTOMETRIC_MINISBLACK) /* GRAY(A) */ - { - numcomps = 1 + has_alpha; - color_space = OPJ_CLRSPC_GRAY; - } - - switch (numcomps) { - case 1: - cvtCxToPx = convert_32s_C1P1; - break; - case 2: - cvtCxToPx = convert_32s_C2P2; - break; - case 3: - cvtCxToPx = convert_32s_C3P3; - break; - case 4: - cvtCxToPx = convert_32s_C4P4; - break; - default: - /* never here */ - break; - } - if (tiPC == PLANARCONFIG_SEPARATE) { - cvtCxToPx = convert_32s_C1P1; /* override */ - tiSpp = 1U; /* consider only one sample per plane */ - } - - 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; - } - - image = opj_image_create((OPJ_UINT32)numcomps, &cmptparm[0], color_space); - 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; - - for(j = 0; j < numcomps; j++) - { - planes[j] = image->comps[j].data; - if (has_alpha) { - planes[j] = image->comps[j].data; - } - } - - strip_size = TIFFStripSize(tif); - - buf = _TIFFmalloc(strip_size); - if (buf == NULL) { - TIFFClose(tif); - opj_image_destroy(image); - return NULL; - } - rowStride = ((OPJ_SIZE_T)w * tiSpp * tiBps + 7U) / 8U; - buffer32s = malloc((OPJ_SIZE_T)w * tiSpp * sizeof(OPJ_INT32)); - if (buffer32s == NULL) { - _TIFFfree(buf); - TIFFClose(tif); - opj_image_destroy(image); - return NULL; - } - - strip = 0; - currentPlane = 0; - do - { - planes[0] = image->comps[currentPlane].data; /* to manage planar data */ - h= (int)tiHeight; - /* Read the Image components */ - for(; (h > 0) && (strip < TIFFNumberOfStrips(tif)); strip++) - { - const OPJ_UINT8 *dat8; - tsize_t ssize; - - ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size); - dat8 = (const OPJ_UINT8*)buf; - - while (ssize >= rowStride) { - cvtTifTo32s(dat8, buffer32s, w * tiSpp); - cvtCxToPx(buffer32s, planes, w); - planes[0] += w; - planes[1] += w; - planes[2] += w; - planes[3] += w; - dat8 += rowStride; - ssize -= rowStride; - h--; - } - } - currentPlane++; - } while ((tiPC == PLANARCONFIG_SEPARATE) && (currentPlane < numcomps)); - - free(buffer32s); - _TIFFfree(buf); - TIFFClose(tif); - - if (is_cinema) { - for (j=0; j < numcomps; ++j) { - scale_component(&(image->comps[j]), 12); - } - - } - return image; + int subsampling_dx = parameters->subsampling_dx; + int subsampling_dy = parameters->subsampling_dy; + TIFF *tif; + tdata_t buf; + tstrip_t strip; + int64_t strip_size, rowStride, TIFF_MAX; + int j, currentPlane, numcomps = 0, w, h; + OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_UNKNOWN; + opj_image_cmptparm_t cmptparm[4]; /* RGBA */ + opj_image_t *image = NULL; + int has_alpha = 0; + uint16 tiBps, tiPhoto, tiSf, tiSpp, tiPC; + uint32 tiWidth, tiHeight; + OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz); + convert_XXx32s_C1R cvtTifTo32s = NULL; + convert_32s_CXPX cvtCxToPx = NULL; + OPJ_INT32* buffer32s = NULL; + OPJ_INT32* planes[4]; + + 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 (tiSpp == 0 || tiSpp > 4) { /* should be 1 ... 4 */ + fprintf(stderr, "tiftoimage: Bad value for samples per pixel == %d.\n" + "\tAborting.\n", tiSpp); + TIFFClose(tif); + return NULL; + } + if (tiBps > 16U || tiBps == 0) { + fprintf(stderr, "tiftoimage: Bad values for Bits == %d.\n" + "\tMax. 16 Bits are allowed here.\n\tAborting.\n", tiBps); + TIFFClose(tif); + return NULL; + } + if (tiPhoto != PHOTOMETRIC_MINISBLACK && tiPhoto != PHOTOMETRIC_RGB) { + fprintf(stderr, + "tiftoimage: Bad color format %d.\n\tOnly RGB(A) and GRAY(A) has been implemented\n\tAborting.\n", + (int) tiPhoto); + TIFFClose(tif); + return NULL; + } + if (tiWidth == 0 || tiHeight == 0) { + fprintf(stderr, "tiftoimage: Bad values for width(%u) " + "and/or height(%u)\n\tAborting.\n", tiWidth, tiHeight); + TIFFClose(tif); + return NULL; + } + w = (int)tiWidth; + h = (int)tiHeight; + + switch (tiBps) { + case 1: + case 2: + case 4: + case 6: + case 8: + cvtTifTo32s = convert_XXu32s_C1R_LUT[tiBps]; + break; + /* others are specific to TIFF */ + case 3: + cvtTifTo32s = tif_3uto32s; + break; + case 5: + cvtTifTo32s = tif_5uto32s; + break; + case 7: + cvtTifTo32s = tif_7uto32s; + break; + case 9: + cvtTifTo32s = tif_9uto32s; + break; + case 10: + cvtTifTo32s = tif_10uto32s; + break; + case 11: + cvtTifTo32s = tif_11uto32s; + break; + case 12: + cvtTifTo32s = tif_12uto32s; + break; + case 13: + cvtTifTo32s = tif_13uto32s; + break; + case 14: + cvtTifTo32s = tif_14uto32s; + break; + case 15: + cvtTifTo32s = tif_15uto32s; + break; + case 16: + cvtTifTo32s = (convert_XXx32s_C1R)tif_16uto32s; + break; + default: + /* never here */ + break; + } + + {/* 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) && (tiBps != 12U)) { + 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); + } else { + is_cinema = 0U; + } + + if (tiPhoto == PHOTOMETRIC_RGB) { /* RGB(A) */ + numcomps = 3 + has_alpha; + color_space = OPJ_CLRSPC_SRGB; + } else if (tiPhoto == PHOTOMETRIC_MINISBLACK) { /* GRAY(A) */ + numcomps = 1 + has_alpha; + color_space = OPJ_CLRSPC_GRAY; + } + + cvtCxToPx = convert_32s_CXPX_LUT[numcomps]; + if (tiPC == PLANARCONFIG_SEPARATE) { + cvtCxToPx = convert_32s_CXPX_LUT[1]; /* override */ + tiSpp = 1U; /* consider only one sample per plane */ + } + + 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; + } + + image = opj_image_create((OPJ_UINT32)numcomps, &cmptparm[0], color_space); + 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; + if (image->x1 <= image->x0) { + fprintf(stderr, "tiftoimage: Bad value for image->x1(%d) vs. " + "image->x0(%d)\n\tAborting.\n", image->x1, image->x0); + TIFFClose(tif); + opj_image_destroy(image); + return NULL; + } + image->y1 = !image->y0 ? (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1 : + image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1; + if (image->y1 <= image->y0) { + fprintf(stderr, "tiftoimage: Bad value for image->y1(%d) vs. " + "image->y0(%d)\n\tAborting.\n", image->y1, image->y0); + TIFFClose(tif); + opj_image_destroy(image); + return NULL; + } + + for (j = 0; j < numcomps; j++) { + planes[j] = image->comps[j].data; + } + image->comps[numcomps - 1].alpha = (OPJ_UINT16)(1 - (numcomps & 1)); + + strip_size = (int64_t)TIFFStripSize(tif); + + buf = malloc((OPJ_SIZE_T)strip_size); + if (buf == NULL) { + TIFFClose(tif); + opj_image_destroy(image); + return NULL; + } + if (sizeof(tsize_t) == 4) { + TIFF_MAX = INT_MAX; + } else { + TIFF_MAX = UINT_MAX; + } + if ((int64_t)tiWidth > (int64_t)(TIFF_MAX / tiSpp) || + (int64_t)(tiWidth * tiSpp) > (int64_t)(TIFF_MAX / tiBps) || + (int64_t)(tiWidth * tiSpp) > (int64_t)(TIFF_MAX / (int64_t)sizeof(OPJ_INT32))) { + fprintf(stderr, "Buffer overflow\n"); + _TIFFfree(buf); + TIFFClose(tif); + opj_image_destroy(image); + return NULL; + } + + rowStride = (int64_t)((tiWidth * tiSpp * tiBps + 7U) / 8U); + buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)(tiWidth * tiSpp * sizeof( + OPJ_INT32))); + if (buffer32s == NULL) { + _TIFFfree(buf); + TIFFClose(tif); + opj_image_destroy(image); + return NULL; + } + + strip = 0; + currentPlane = 0; + do { + planes[0] = image->comps[currentPlane].data; /* to manage planar data */ + h = (int)tiHeight; + /* Read the Image components */ + for (; (h > 0) && (strip < TIFFNumberOfStrips(tif)); strip++) { + const OPJ_UINT8 *dat8; + int64_t ssize; + + ssize = (int64_t)TIFFReadEncodedStrip(tif, strip, buf, (tsize_t)strip_size); + + if (ssize < 1 || ssize > strip_size) { + fprintf(stderr, "tiftoimage: Bad value for ssize(%" PRId64 ") " + "vs. strip_size(%" PRId64 ").\n\tAborting.\n", ssize, strip_size); + _TIFFfree(buf); + _TIFFfree(buffer32s); + TIFFClose(tif); + opj_image_destroy(image); + return NULL; + } + dat8 = (const OPJ_UINT8*)buf; + + while (ssize >= rowStride) { + cvtTifTo32s(dat8, buffer32s, (OPJ_SIZE_T)w * tiSpp); + cvtCxToPx(buffer32s, planes, (OPJ_SIZE_T)w); + planes[0] += w; + planes[1] += w; + planes[2] += w; + planes[3] += w; + dat8 += rowStride; + ssize -= rowStride; + h--; + } + } + currentPlane++; + } while ((tiPC == PLANARCONFIG_SEPARATE) && (currentPlane < numcomps)); + + free(buffer32s); + _TIFFfree(buf); + TIFFClose(tif); + + if (is_cinema) { + for (j = 0; j < numcomps; ++j) { + scale_component(&(image->comps[j]), 12); + } + + } + return image; }/* tiftoimage() */