i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed TiffDetails to a class so that clean up would be easier and added logic to handle palette images (though they will not open yet)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3089 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matthew Wilber
2003-04-21 03:41:33 +00:00
parent 5cd3d8f8e3
commit 91ae8a2423
1 changed files with 72 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/tifftranslator/TIFFTranslator.cpp
+72 -41
View File
@@ -108,6 +108,19 @@ make_nth_translator(int32 n, image_id you, uint32 flags, ...)
return NULL; return NULL;
} }
TiffDetails::TiffDetails()
{
memset(this, 0, sizeof(TiffDetails));
}
TiffDetails::~TiffDetails()
{
delete[] pstripOffsets;
delete[] pstripByteCounts;
memset(this, 0, sizeof(TiffDetails));
}
// --------------------------------------------------------------- // ---------------------------------------------------------------
// Constructor // Constructor
// //
@@ -367,9 +380,6 @@ identify_bits_header(BPositionIO *inSource, translator_info *outInfo,
status_t status_t
check_tiff_fields(TiffIfd &ifd, TiffDetails *pdetails) check_tiff_fields(TiffIfd &ifd, TiffDetails *pdetails)
{ {
TiffDetails dtls;
memset(&dtls, 0, sizeof(TiffDetails));
try { try {
// Extra Samples are not yet supported // Extra Samples are not yet supported
if (ifd.HasField(TAG_EXTRA_SAMPLES)) if (ifd.HasField(TAG_EXTRA_SAMPLES))
@@ -396,22 +406,22 @@ check_tiff_fields(TiffIfd &ifd, TiffDetails *pdetails)
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
// Copy fields useful to TIFFTranslator // Copy fields useful to TIFFTranslator
dtls.width = ifd.GetUint(TAG_IMAGE_WIDTH); uint32 width = ifd.GetUint(TAG_IMAGE_WIDTH);
dtls.height = ifd.GetUint(TAG_IMAGE_HEIGHT); uint32 height = ifd.GetUint(TAG_IMAGE_HEIGHT);
dtls.interpretation = ifd.GetUint(TAG_PHOTO_INTERPRETATION); uint16 interpretation = ifd.GetUint(TAG_PHOTO_INTERPRETATION);
uint32 compression;
if (!ifd.HasField(TAG_COMPRESSION)) if (!ifd.HasField(TAG_COMPRESSION))
dtls.compression = COMPRESSION_NONE; compression = COMPRESSION_NONE;
else else
dtls.compression = ifd.GetUint(TAG_COMPRESSION); compression = ifd.GetUint(TAG_COMPRESSION);
if (dtls.compression != COMPRESSION_NONE && if (compression != COMPRESSION_NONE &&
dtls.compression != COMPRESSION_HUFFMAN && compression != COMPRESSION_HUFFMAN &&
dtls.compression != COMPRESSION_PACKBITS) compression != COMPRESSION_PACKBITS)
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
// Currently, only some uint16 imageType;
// bilevel, RGB or CMYK images are supported switch (interpretation) {
switch (dtls.interpretation) {
// Bilevel images // Bilevel images
case PHOTO_WHITEZERO: case PHOTO_WHITEZERO:
case PHOTO_BLACKZERO: case PHOTO_BLACKZERO:
@@ -424,7 +434,34 @@ check_tiff_fields(TiffIfd &ifd, TiffDetails *pdetails)
ifd.GetUint(TAG_BITS_PER_SAMPLE) != 1) ifd.GetUint(TAG_BITS_PER_SAMPLE) != 1)
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
dtls.imageType = TIFF_BILEVEL; imageType = TIFF_BILEVEL;
break;
// Palette color images
case PHOTO_PALETTE:
// default value for samples per pixel is 1
// if samples per pixel is other than 1,
// it is not valid for this image type
if (ifd.HasField(TAG_SAMPLES_PER_PIXEL) &&
ifd.GetUint(TAG_SAMPLES_PER_PIXEL) != 1)
return B_NO_TRANSLATOR;
// bits per sample must be present and
// can only be 4 or 8
if (ifd.GetUint(TAG_BITS_PER_SAMPLE) != 4 &&
ifd.GetUint(TAG_BITS_PER_SAMPLE) != 8)
return B_NO_TRANSLATOR;
// even though other compression types are
// supported for other TIFF types,
// packbits and uncompressed are the only
// compression types supported for palette
// images
if (compression != COMPRESSION_NONE &&
compression != COMPRESSION_PACKBITS)
return B_NO_TRANSLATOR;
imageType = TIFF_PALETTE;
break; break;
case PHOTO_RGB: case PHOTO_RGB:
@@ -436,7 +473,7 @@ check_tiff_fields(TiffIfd &ifd, TiffDetails *pdetails)
ifd.GetUint(TAG_BITS_PER_SAMPLE, 3) != 8) ifd.GetUint(TAG_BITS_PER_SAMPLE, 3) != 8)
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
dtls.imageType = TIFF_RGB; imageType = TIFF_RGB;
break; break;
case PHOTO_SEPARATED: case PHOTO_SEPARATED:
@@ -455,45 +492,44 @@ check_tiff_fields(TiffIfd &ifd, TiffDetails *pdetails)
ifd.GetUint(TAG_BITS_PER_SAMPLE, 4) != 8) ifd.GetUint(TAG_BITS_PER_SAMPLE, 4) != 8)
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
dtls.imageType = TIFF_CMYK; imageType = TIFF_CMYK;
break; break;
default: default:
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
} }
uint32 rowsPerStrip, stripsPerImage;
if (!ifd.HasField(TAG_ROWS_PER_STRIP)) if (!ifd.HasField(TAG_ROWS_PER_STRIP))
dtls.rowsPerStrip = DEFAULT_ROWS_PER_STRIP; rowsPerStrip = DEFAULT_ROWS_PER_STRIP;
else else
dtls.rowsPerStrip = ifd.GetUint(TAG_ROWS_PER_STRIP); rowsPerStrip = ifd.GetUint(TAG_ROWS_PER_STRIP);
dtls.stripsPerImage = stripsPerImage = (height + rowsPerStrip - 1) / rowsPerStrip;
(dtls.height + dtls.rowsPerStrip - 1) / dtls.rowsPerStrip;
if (ifd.GetCount(TAG_STRIP_OFFSETS) != dtls.stripsPerImage || if (ifd.GetCount(TAG_STRIP_OFFSETS) != stripsPerImage ||
ifd.GetCount(TAG_STRIP_BYTE_COUNTS) != dtls.stripsPerImage) ifd.GetCount(TAG_STRIP_BYTE_COUNTS) != stripsPerImage)
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
printf("width: %d\nheight: %d\ncompression: %d\ninterpretation: %d\n", printf("width: %d\nheight: %d\ncompression: %d\ninterpretation: %d\n",
dtls.width, dtls.height, dtls.compression, width, height, compression, interpretation);
dtls.interpretation);
// return read in details if output // return read in details if output pointer is supplied
// pointer is supplied
if (pdetails) { if (pdetails) {
ifd.GetUintArray(TAG_STRIP_OFFSETS, &dtls.pstripOffsets); pdetails->width = width;
ifd.GetUintArray(TAG_STRIP_BYTE_COUNTS, &dtls.pstripByteCounts); pdetails->height = height;
pdetails->compression = compression;
pdetails->rowsPerStrip = rowsPerStrip;
pdetails->stripsPerImage = stripsPerImage;
pdetails->interpretation = interpretation;
pdetails->imageType = imageType;
memcpy(pdetails, &dtls, sizeof(TiffDetails)); ifd.GetUintArray(TAG_STRIP_OFFSETS, &pdetails->pstripOffsets);
ifd.GetUintArray(TAG_STRIP_BYTE_COUNTS, &pdetails->pstripByteCounts);
} }
} catch (TiffIfdException) { } catch (TiffIfdException) {
printf("-- Caught TiffIfdException --\n"); printf("-- Caught TiffIfdException --\n");
delete[] dtls.pstripOffsets;
dtls.pstripOffsets = NULL;
delete[] dtls.pstripByteCounts;
dtls.pstripByteCounts = NULL;
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
} }
@@ -969,11 +1005,6 @@ TIFFTranslator::translate_from_tiff(BPositionIO *inSource, ssize_t amtread,
delete[] outbuffer; delete[] outbuffer;
outbuffer = NULL; outbuffer = NULL;
delete[] details.pstripOffsets;
details.pstripOffsets = NULL;
delete[] details.pstripByteCounts;
details.pstripByteCounts = NULL;
return B_OK; return B_OK;
} else } else