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; \
+ }
+
+#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)
+{
+ 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];
+
+ *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));
+ }
+
+ 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)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_32sto10u(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, OPJ_SIZE_T length)
{
}
}
}
+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_32sto12u(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, OPJ_SIZE_T length)
{
OPJ_SIZE_T i;
*pDst++ = (OPJ_BYTE)(((src0 & 0xFU) << 4));
}
}
+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)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_32sto14u(const OPJ_INT32* pSrc, OPJ_BYTE* pDst, OPJ_SIZE_T length)
{
OPJ_SIZE_T i;
}
}
}
+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)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_32sto16u(const OPJ_INT32* pSrc, OPJ_UINT16* pDst, OPJ_SIZE_T length)
{
OPJ_SIZE_T i;
return 1;
}
- if((bps > 16) || ((bps != 1) && (bps & 1))) bps = 0;
+ if(bps > 16) bps = 0;
if(bps == 0)
{
- fprintf(stderr,"imagetotif: Bits=%d, Only 1, 2, 4, 6, 8, 10, 12, 14 and 16 bits implemented\n",bps);
+ fprintf(stderr,"imagetotif: Bits=%d, Only 1 to 16 bits implemented\n",bps);
fprintf(stderr,"\tAborting\n");
return 1;
}
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;
TIFFClose(tif);
return 1;
}
- buffer32s = malloc((OPJ_SIZE_T)width * numcomps * sizeof(OPJ_INT32));
+ buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)width * numcomps * sizeof(OPJ_INT32));
if (buffer32s == NULL) {
_TIFFfree(buf);
TIFFClose(tif);
for (i = 0; i < image->comps[0].h; ++i) {
cvtPxToCx(planes, buffer32s, (OPJ_SIZE_T)width, adjust);
- cvt32sToTif(buffer32s, buf, (OPJ_SIZE_T)width * numcomps);
+ cvt32sToTif(buffer32s, (OPJ_BYTE *)buf, (OPJ_SIZE_T)width * numcomps);
(void)TIFFWriteEncodedStrip(tif, i, (void*)buf, strip_size);
planes[0] += width;
planes[1] += width;
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; \
+}
+
+static void tif_3uto32s(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++;
+
+ 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)
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+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 & ~(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;
}
}
}
+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;
+
+ 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)
{
OPJ_SIZE_T i;
pDst[i+0] = (OPJ_INT32)((val0 << 4) | (val1 >> 4));
}
}
+static void tif_13uto32s(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++;
+ 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 tif_14uto32s(const OPJ_BYTE* pSrc, OPJ_INT32* pDst, OPJ_SIZE_T length)
{
OPJ_SIZE_T i;
}
}
}
+static void tif_15uto32s(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++;
+ 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)
w= (int)tiWidth;
h= (int)tiHeight;
- if((tiBps > 16U) || ((tiBps != 1U) && (tiBps & 1U))) {
- fprintf(stderr,"tiftoimage: Bits=%d, Only 1, 2, 4, 6, 8, 10, 12, 14 and 16 bits implemented\n",tiBps);
+ if(tiBps > 16U) {
+ fprintf(stderr,"tiftoimage: Bits=%d, Only 1 to 16 bits implemented\n",tiBps);
fprintf(stderr,"\tAborting\n");
TIFFClose(tif);
return NULL;
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;
return NULL;
}
rowStride = ((OPJ_SIZE_T)w * tiSpp * tiBps + 7U) / 8U;
- buffer32s = malloc((OPJ_SIZE_T)w * tiSpp * sizeof(OPJ_INT32));
+ buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)w * tiSpp * sizeof(OPJ_INT32));
if (buffer32s == NULL) {
_TIFFfree(buf);
TIFFClose(tif);
projects / openjpeg.git / blobdiff