author | llornkcor <llornkcor> | 2003-03-02 19:31:31 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-03-02 19:31:31 (UTC) |
commit | ab5f21907fb482d35f8aebe4505e954d3c22f3c7 (patch) (side-by-side diff) | |
tree | c85adac27fa84a25ef49bdb23bf050c43979617d | |
parent | 6657040ae54afb2f2378f4db7bfc9e616e6d7b83 (diff) | |
download | opie-ab5f21907fb482d35f8aebe4505e954d3c22f3c7.zip opie-ab5f21907fb482d35f8aebe4505e954d3c22f3c7.tar.gz opie-ab5f21907fb482d35f8aebe4505e954d3c22f3c7.tar.bz2 |
patch sneaked by me
-rw-r--r-- | noncore/apps/opie-reader/Palm2QImage.cpp | 68 |
1 files changed, 43 insertions, 25 deletions
diff --git a/noncore/apps/opie-reader/Palm2QImage.cpp b/noncore/apps/opie-reader/Palm2QImage.cpp index ef88cc5..9603877 100644 --- a/noncore/apps/opie-reader/Palm2QImage.cpp +++ b/noncore/apps/opie-reader/Palm2QImage.cpp @@ -3,5 +3,7 @@ #include <stdlib.h> #include <string.h> +#ifndef WINDOWS
#include <unistd.h> /* for link */ +#endif #include <sys/types.h> #include <sys/stat.h> @@ -140,15 +142,14 @@ QImage* Palm2QImage #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); +// qDebug ("Palm image is %dx%d, %d bpp, version %d, flags 0x%x, compression %d", width, height, bits_per_pixel, version, flags, compression_type); #endif if (compression_type == PALM_COMPRESSION_PACKBITS) { - qDebug ("Image uses packbits compression; not yet supported"); +// qDebug ("Image uses packbits compression; not yet supported"); 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); +// qDebug ("Image uses unknown compression, code 0x%x", compression_type); return NULL; } @@ -168,5 +169,5 @@ QImage* Palm2QImage if (flags & PALM_HAS_COLORMAP_FLAG) { - qDebug("Palm images with custom colormaps are not currently supported.\n"); +// qDebug("Palm images with custom colormaps are not currently supported.\n"); return NULL; } else if (bits_per_pixel == 1) { @@ -187,21 +188,24 @@ QImage* Palm2QImage palm_green_bits = palmimage[17]; palm_blue_bits = palmimage[18]; +// qDebug("Bits:%d, %d, %d", palm_red_bits, palm_green_bits, palm_blue_bits); 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); +// 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); 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); +// qDebug ("Can't handle this format DirectColor image -- too many bits per pixel (%d)\n", bits_per_pixel); return NULL; } imagedatastart = palmimage + 24; } else { - qDebug("Unknown bits-per-pixel of %d encountered.\n", bits_per_pixel); +// qDebug("Unknown bits-per-pixel of %d encountered.\n", bits_per_pixel); return NULL; } +#ifdef WINDOWS
+ QImage* qimage = new QImage(width, height, 32);
+#else
QImage* qimage = new QImage(width, height, 16); +#endif
/* row by row, uncompress the Palm image and copy it to the JPEG buffer */ @@ -210,4 +214,5 @@ QImage* Palm2QImage 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); /* first, uncompress the Palm image */ @@ -233,9 +238,19 @@ QImage* Palm2QImage } else if (((flags & PALM_IS_COMPRESSED_FLAG) && (compression_type == PALM_COMPRESSION_NONE)) || - (flags && PALM_IS_COMPRESSED_FLAG) == 0) { + ((flags & PALM_IS_COMPRESSED_FLAG) == 0)) + { + 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"); memcpy (rowbuf, palm_ptr, bytes_per_row); palm_ptr += bytes_per_row; } - /* next, write it to the GDK bitmap */ if (colormap) { @@ -258,16 +273,17 @@ QImage* Palm2QImage bits_per_pixel == 16) { for (inbyte = rowbuf, j = 0; j < width; ++j) { - inval = (inbyte[0] << 8) | inbyte[1]; -#if 0 - qDebug ("pixel is %d,%d (%02x:%02x:%02x)", + 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), - (inval >> palm_blue_bits) & ((1 << palm_green_bits) - 1), - (inval >> 0) & ((1 << palm_blue_bits) - 1)); -#endif + ((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)); +*/ QRgb colour = qRgb( - (inval >> (bits_per_pixel - palm_red_bits)) & ((1 << palm_red_bits) - 1), - (inval >> palm_blue_bits) & ((1 << palm_green_bits) - 1), - (inval >> 0) & ((1 << palm_blue_bits) - 1)); + ((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)); qimage->setPixel(j, i, colour); inbyte += 2; @@ -282,9 +298,11 @@ QImage* Palm2QImage } -QPixmap* hRule(int w, int h, unsigned char r, unsigned char g, unsigned char b) +QImage* hRule(int w, int h, unsigned char r, unsigned char g, unsigned char b) { -// qDebug("hrule [%d, %d]", w, h); +//// qDebug("hrule [%d, %d]", w, h); QPixmap* qimage = new QPixmap(w, h); qimage->fill(QColor(r,g,b)); - return qimage; + QImage* ret = new QImage(qimage->convertToImage()); + delete qimage; + return ret; } |