eliminated the debugging printf statements
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3107 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -29,8 +29,8 @@
|
|||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
#include "TIFFTranslator.h"
|
#include "TIFFTranslator.h"
|
||||||
#include "TIFFView.h"
|
#include "TIFFView.h"
|
||||||
#include "TiffIfd.h"
|
#include "TiffIfd.h"
|
||||||
@@ -531,9 +531,6 @@ check_tiff_fields(TiffIfd &ifd, TiffDetails *pdetails, bool bAllocArrays)
|
|||||||
ifd.GetCount(TAG_STRIP_BYTE_COUNTS) != 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\nbits per pixel: %d\n",
|
|
||||||
width, height, compression, interpretation, bitsPerPixel);
|
|
||||||
|
|
||||||
// return read in details if output pointer is supplied
|
// return read in details if output pointer is supplied
|
||||||
pdetails->width = width;
|
pdetails->width = width;
|
||||||
pdetails->height = height;
|
pdetails->height = height;
|
||||||
@@ -555,9 +552,6 @@ check_tiff_fields(TiffIfd &ifd, TiffDetails *pdetails, bool bAllocArrays)
|
|||||||
}
|
}
|
||||||
|
|
||||||
} catch (TiffIfdException) {
|
} catch (TiffIfdException) {
|
||||||
|
|
||||||
printf("-- Caught TiffIfdException --\n");
|
|
||||||
|
|
||||||
return B_NO_TRANSLATOR;
|
return B_NO_TRANSLATOR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -643,21 +637,18 @@ identify_tiff_header(BPositionIO *inSource, translator_info *outInfo,
|
|||||||
uint32 firstIFDOffset = 0;
|
uint32 firstIFDOffset = 0;
|
||||||
ssize_t nread = inSource->Read(&firstIFDOffset, 4);
|
ssize_t nread = inSource->Read(&firstIFDOffset, 4);
|
||||||
if (nread != 4) {
|
if (nread != 4) {
|
||||||
printf("Unable to read first IFD offset\n");
|
// Unable to read first IFD offset
|
||||||
return B_NO_TRANSLATOR;
|
return B_NO_TRANSLATOR;
|
||||||
}
|
}
|
||||||
if (swap_data(B_UINT32_TYPE, &firstIFDOffset,
|
if (swap_data(B_UINT32_TYPE, &firstIFDOffset,
|
||||||
sizeof(uint32), swp) != B_OK) {
|
sizeof(uint32), swp) != B_OK) {
|
||||||
printf("swap_data() error\n");
|
// swap_data() error
|
||||||
return B_ERROR;
|
return B_ERROR;
|
||||||
}
|
}
|
||||||
printf("First IFD: 0x%.8lx\n", firstIFDOffset);
|
|
||||||
TiffIfd ifd(firstIFDOffset, *inSource, swp);
|
TiffIfd ifd(firstIFDOffset, *inSource, swp);
|
||||||
|
|
||||||
status_t initcheck;
|
status_t initcheck;
|
||||||
initcheck = ifd.InitCheck();
|
initcheck = ifd.InitCheck();
|
||||||
printf("Init Check: %d\n",
|
|
||||||
static_cast<int>(initcheck));
|
|
||||||
|
|
||||||
// Read in some fields in order to determine whether or not
|
// Read in some fields in order to determine whether or not
|
||||||
// this particular TIFF image is supported by this translator
|
// this particular TIFF image is supported by this translator
|
||||||
@@ -789,13 +780,13 @@ TIFFTranslator::Identify(BPositionIO *inSource,
|
|||||||
swap_action swp;
|
swap_action swp;
|
||||||
if (memcmp(ch, kleSig, 4) == 0) {
|
if (memcmp(ch, kleSig, 4) == 0) {
|
||||||
swp = B_SWAP_LENDIAN_TO_HOST;
|
swp = B_SWAP_LENDIAN_TO_HOST;
|
||||||
printf("Byte Order: little endian\n");
|
// Byte Order: little endian
|
||||||
} else if (memcmp(ch, kbeSig, 4) == 0) {
|
} else if (memcmp(ch, kbeSig, 4) == 0) {
|
||||||
swp = B_SWAP_BENDIAN_TO_HOST;
|
swp = B_SWAP_BENDIAN_TO_HOST;
|
||||||
printf("Byte Order: big endian\n");
|
// Byte Order: big endian
|
||||||
} else {
|
} else {
|
||||||
// If not a TIFF or a Be Bitmap image
|
// If not a TIFF or a Be Bitmap image
|
||||||
printf("Invalid byte order value\n");
|
// (invalid byte order value)
|
||||||
return B_NO_TRANSLATOR;
|
return B_NO_TRANSLATOR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1147,11 +1138,6 @@ TIFFTranslator::translate_from_tiff(BPositionIO *inSource, ssize_t amtread,
|
|||||||
}
|
}
|
||||||
// If while loop was broken...
|
// If while loop was broken...
|
||||||
if (read < details.pstripByteCounts[i]) {
|
if (read < details.pstripByteCounts[i]) {
|
||||||
printf("-- WHILE LOOP BROKEN!!\n");
|
|
||||||
printf("i: %d\n", i);
|
|
||||||
printf("ByteCount: %d\n",
|
|
||||||
details.pstripByteCounts[i]);
|
|
||||||
printf("read: %d\n", read);
|
|
||||||
debugger("while loop broken");
|
debugger("while loop broken");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -1262,13 +1248,13 @@ TIFFTranslator::Translate(BPositionIO *inSource,
|
|||||||
swap_action swp;
|
swap_action swp;
|
||||||
if (memcmp(ch, kleSig, 4) == 0) {
|
if (memcmp(ch, kleSig, 4) == 0) {
|
||||||
swp = B_SWAP_LENDIAN_TO_HOST;
|
swp = B_SWAP_LENDIAN_TO_HOST;
|
||||||
printf("Byte Order: little endian\n");
|
// Byte Order: little endian
|
||||||
} else if (memcmp(ch, kbeSig, 4) == 0) {
|
} else if (memcmp(ch, kbeSig, 4) == 0) {
|
||||||
swp = B_SWAP_BENDIAN_TO_HOST;
|
swp = B_SWAP_BENDIAN_TO_HOST;
|
||||||
printf("Byte Order: big endian\n");
|
// Byte Order: big endian
|
||||||
} else {
|
} else {
|
||||||
// If not a TIFF or a Be Bitmap image
|
// If not a TIFF or a Be Bitmap image
|
||||||
printf("Invalid byte order value\n");
|
// (invalid byte order value)
|
||||||
return B_NO_TRANSLATOR;
|
return B_NO_TRANSLATOR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,6 @@
|
|||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#include <Errors.h>
|
#include <Errors.h>
|
||||||
#include <stdio.h>
|
|
||||||
#include "TiffField.h"
|
#include "TiffField.h"
|
||||||
|
|
||||||
TiffField::TiffField(IFDEntry &entry)
|
TiffField::TiffField(IFDEntry &entry)
|
||||||
@@ -40,9 +39,4 @@ TiffField::TiffField(IFDEntry &entry)
|
|||||||
ftag = entry.tag;
|
ftag = entry.tag;
|
||||||
ffieldType = entry.fieldType;
|
ffieldType = entry.fieldType;
|
||||||
fcount = entry.count;
|
fcount = entry.count;
|
||||||
|
|
||||||
printf("TiffField::ftag: %d\n", ftag);
|
|
||||||
printf("TiffField::ffieldType: %d\n", ffieldType);
|
|
||||||
printf("TiffField::fcount: %d\n",
|
|
||||||
static_cast<int>(fcount));
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "TiffIfd.h"
|
#include "TiffIfd.h"
|
||||||
#include "TiffUintField.h"
|
#include "TiffUintField.h"
|
||||||
@@ -45,8 +44,6 @@ TiffIfd::LoadFields(uint32 offset, BPositionIO &io, swap_action swp)
|
|||||||
finitStatus = B_ERROR;
|
finitStatus = B_ERROR;
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
printf("TiffIfd::ffieldCount: %d\n", ffieldCount);
|
|
||||||
|
|
||||||
fpfields = new TiffField *[ffieldCount];
|
fpfields = new TiffField *[ffieldCount];
|
||||||
if (!fpfields) {
|
if (!fpfields) {
|
||||||
finitStatus = B_NO_MEMORY;
|
finitStatus = B_NO_MEMORY;
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "TiffUintField.h"
|
#include "TiffUintField.h"
|
||||||
|
|
||||||
@@ -167,22 +166,6 @@ TiffUintField::TiffUintField(IFDEntry &entry, BPositionIO &io, swap_action swp)
|
|||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
finitStatus = B_BAD_VALUE;
|
finitStatus = B_BAD_VALUE;
|
||||||
|
|
||||||
printf("TiffUintField::finitStatus: %d\n",
|
|
||||||
static_cast<int>(finitStatus));
|
|
||||||
|
|
||||||
// print out numbers stored by this field
|
|
||||||
if (finitStatus == B_OK) {
|
|
||||||
uint32 count = GetCount(), out = 0;
|
|
||||||
printf("TiffUintField::value: ");
|
|
||||||
for (uint32 i = 1; i && i <= count; i++) {
|
|
||||||
GetUint(out, i);
|
|
||||||
if (i > 1)
|
|
||||||
printf(", ");
|
|
||||||
printf("%d", static_cast<unsigned>(out));
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TiffUintField::~TiffUintField()
|
TiffUintField::~TiffUintField()
|
||||||
|
|||||||
@@ -29,16 +29,12 @@
|
|||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include "TiffUnknownField.h"
|
#include "TiffUnknownField.h"
|
||||||
|
|
||||||
TiffUnknownField::TiffUnknownField(IFDEntry &entry)
|
TiffUnknownField::TiffUnknownField(IFDEntry &entry)
|
||||||
: TiffField(entry)
|
: TiffField(entry)
|
||||||
{
|
{
|
||||||
finitStatus = B_OK;
|
finitStatus = B_OK;
|
||||||
|
|
||||||
printf("TiffUnknownField::finitStatus: %d\n",
|
|
||||||
static_cast<int>(finitStatus));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TiffUnknownField::~TiffUnknownField()
|
TiffUnknownField::~TiffUnknownField()
|
||||||
|
|||||||
Reference in New Issue
Block a user