Diffstat (limited to 'noncore/apps/opie-reader/Palm2QImage.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/apps/opie-reader/Palm2QImage.cpp | 55 |
1 files changed, 33 insertions, 22 deletions
diff --git a/noncore/apps/opie-reader/Palm2QImage.cpp b/noncore/apps/opie-reader/Palm2QImage.cpp index 9339595..b0d4e00 100644 --- a/noncore/apps/opie-reader/Palm2QImage.cpp +++ b/noncore/apps/opie-reader/Palm2QImage.cpp @@ -1,5 +1,13 @@ /* -*- mode: c; indent-tabs-mode: nil; -*- */ + +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ +#include <qimage.h> + +/* STD */ #include <stdio.h> #include <stdlib.h> #include <string.h> #ifndef _WINDOWS @@ -8,9 +16,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <stdarg.h> -#include <qimage.h> /***********************************************************************/ /***********************************************************************/ /***** *****/ @@ -140,18 +147,20 @@ QImage* Palm2QImage compression_type = palmimage[13]; /* bytes 14 and 15 are reserved by Palm and always 0 */ #if 0 -// qDebug ("Palm image is %dx%d, %d bpp, version %d, flags 0x%x, compression %d", width, height, bits_per_pixel, version, flags, compression_type); +// odebug << "Palm image is " << width << "x" << height +// << ", " << bits_per_pixel << " bpp, version " << version +// << ", flags 0x" << flags << ", compression " << compression_type << oendl; #endif if (compression_type == PALM_COMPRESSION_PACKBITS) { -// qDebug ("Image uses packbits compression; not yet supported"); +// odebug << "Image uses packbits compression; not yet supported" << oendl; return NULL; } else if ((compression_type != PALM_COMPRESSION_NONE) && (compression_type != PALM_COMPRESSION_RLE) && (compression_type != PALM_COMPRESSION_SCANLINE)) { -// qDebug ("Image uses unknown compression, code 0x%x", compression_type); +// odebug << "Image uses unknown compression, code 0x" << compression_type << oendl; return NULL; } /* as of PalmOS 4.0, there are 6 different kinds of Palm pixmaps: @@ -167,9 +176,9 @@ QImage* Palm2QImage We begin by constructing the colormap. */ if (flags & PALM_HAS_COLORMAP_FLAG) { -// qDebug("Palm images with custom colormaps are not currently supported.\n"); +// odebug << "Palm images with custom colormaps are not currently supported." << oendl; return NULL; } else if (bits_per_pixel == 1) { colormap = Palm1BitColormap; imagedatastart = palmimage + 16; @@ -186,20 +195,22 @@ QImage* Palm2QImage colormap = NULL; palm_red_bits = palmimage[16]; palm_green_bits = palmimage[17]; palm_blue_bits = palmimage[18]; -// qDebug("Bits:%d, %d, %d", palm_red_bits, palm_green_bits, palm_blue_bits); +// odebug << "Bits:" << palm_red_bits << ", " << palm_green_bits << ", " << palm_blue_bits << oendl; if (palm_blue_bits > 8 || palm_green_bits > 8 || palm_red_bits > 8) { -// qDebug("Can't handle this format DirectColor image -- too wide in some color (%d:%d:%d)\n", palm_red_bits, palm_green_bits, palm_blue_bits); +// odebug << "Can't handle this format DirectColor image -- too wide in some color (" +// << palm_red_bits << ":" << palm_green_bits << ":" << palm_blue_bits << oendl; return NULL; } if (bits_per_pixel > (8 * sizeof(unsigned long))) { -// qDebug ("Can't handle this format DirectColor image -- too many bits per pixel (%d)\n", bits_per_pixel); +// odebug << "Can't handle this format DirectColor image -- too many bits per pixel (" +// << bits_per_pixel << ")" << oendl; return NULL; } imagedatastart = palmimage + 24; } else { -// qDebug("Unknown bits-per-pixel of %d encountered.\n", bits_per_pixel); +// odebug << "Unknown bits-per-pixel of " << bits_per_pixel << " encountered" << oendl; return NULL; } #ifndef USEQPE @@ -212,9 +223,10 @@ QImage* Palm2QImage rowbuf = new unsigned char[bytes_per_row * width]; lastrow = new unsigned char[bytes_per_row * width]; for (i=0, palm_ptr = imagedatastart , x_ptr = imagedata; i < height; ++i) { -// qDebug("inval:%x palm_ptr:%x x_ptr:%x bpr:%x", inval, palm_ptr, x_ptr, bytes_per_row); +// odebug << "inval:" << inval << " palm_ptr:" << palm_ptr << " x_ptr:" << x_ptr +// << " bpr:" << bytes_per_row << oendl; /* first, uncompress the Palm image */ if ((flags & PALM_IS_COMPRESSED_FLAG) && (compression_type == PALM_COMPRESSION_RLE)) { for (j = 0; j < bytes_per_row; ) { @@ -242,14 +254,14 @@ QImage* Palm2QImage memcpy (rowbuf, palm_ptr, bytes_per_row); palm_ptr += bytes_per_row; } else { - qDebug("Case 4"); - qDebug("Is compressed:%s", ((flags & PALM_IS_COMPRESSED_FLAG) == 0) ? "false" : "true"); - qDebug("Has colourmap:%s", ((flags & PALM_HAS_COLORMAP_FLAG) == 0) ? "false" : "true"); - qDebug("Has transparency:%s", ((flags & PALM_HAS_TRANSPARENCY_FLAG) == 0) ? "false" : "true"); - qDebug("Direct colour:%s", ((flags & PALM_DIRECT_COLOR_FLAG) == 0) ? "false" : "true"); - qDebug("four byte field:%s", ((flags & PALM_4_BYTE_FIELD_FLAG) == 0) ? "false" : "true"); + odebug << "Case 4" << oendl; + odebug << "Is compressed:" << (((flags & PALM_IS_COMPRESSED_FLAG) == 0) ? "false" : "true") << oendl; + odebug << "Has colourmap:" << (((flags & PALM_HAS_COLORMAP_FLAG) == 0) ? "false" : "true") << oendl; + odebug << "Has transparency:" << (((flags & PALM_HAS_TRANSPARENCY_FLAG) == 0) ? "false" : "true") << oendl; + odebug << "Direct colour:" << (((flags & PALM_DIRECT_COLOR_FLAG) == 0) ? "false" : "true") << oendl; + odebug << "four byte field:" << (((flags & PALM_4_BYTE_FIELD_FLAG) == 0) ? "false" : "true") << oendl; memcpy (rowbuf, palm_ptr, bytes_per_row); palm_ptr += bytes_per_row; } /* next, write it to the GDK bitmap */ @@ -274,13 +286,12 @@ QImage* Palm2QImage for (inbyte = rowbuf, j = 0; j < width; ++j) { inval = ((unsigned short)inbyte[0] << (unsigned short)8) | inbyte[1]; /* - qDebug ("pixel is %d,%d (%d:%d:%d)", - j, i, - ((inval >> (bits_per_pixel - palm_red_bits)) & ((1 << palm_red_bits) - 1)) << (8-palm_red_bits), - ((inval >> palm_blue_bits) & ((1 << palm_green_bits) - 1)) << (8-palm_green_bits), - ((inval >> 0) & ((1 << palm_blue_bits) - 1)) << (8-palm_blue_bits)); + odebug << "pixel is " << j << "," << i << " (" + << (((inval >> (bits_per_pixel - palm_red_bits)) & ((1 << palm_red_bits) - 1)) << (8-palm_red_bits)) << ":" + << (((inval >> palm_blue_bits) & ((1 << palm_green_bits) - 1)) << (8-palm_green_bits)) << ":" + << (((inval >> 0) & ((1 << palm_blue_bits) - 1)) << (8-palm_blue_bits)) << ")" << oendl; */ QRgb colour = qRgb( ((inval >> (bits_per_pixel - palm_red_bits)) & ((1 << palm_red_bits) - 1)) << (8-palm_red_bits), ((inval >> palm_blue_bits) & ((1 << palm_green_bits) - 1)) << (8-palm_green_bits), @@ -298,9 +309,9 @@ QImage* Palm2QImage } QImage* hRule(int w, int h, unsigned char r, unsigned char g, unsigned char b) { -//// qDebug("hrule [%d, %d]", w, h); +// odebug << "hrule [" << w << ", " << h << "]" << oendl; QPixmap* qimage = new QPixmap(w, h); qimage->fill(QColor(r,g,b)); QImage* ret = new QImage(qimage->convertToImage()); delete qimage; |