summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManfred Tremmel <manfredtremmel@users.sourceforge.net>2004-02-22 18:31:48 +0000
committerManfred Tremmel <manfredtremmel@users.sourceforge.net>2004-02-22 18:31:48 +0000
commitcdfb57c2912a6b837ec3dacd6c0f8fedcea8a981 (patch)
treeaa99035ec8381d6f175d1d69066155dea3e7cd7c
parentb4939fe7b38818fc90ee16f72e5f67606b3e7e0a (diff)
downloadxine-lib-cdfb57c2912a6b837ec3dacd6c0f8fedcea8a981.tar.gz
xine-lib-cdfb57c2912a6b837ec3dacd6c0f8fedcea8a981.tar.bz2
HAM decoding bug fixed
CVS patchset: 6184 CVS date: 2004/02/22 18:31:48
-rw-r--r--src/libxinevdec/bitplane.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c
index 05a4bea71..68dcc61e2 100644
--- a/src/libxinevdec/bitplane.c
+++ b/src/libxinevdec/bitplane.c
@@ -22,7 +22,7 @@
* suitable for display under xine. It's based on the rgb-decoder
* and the development documentation from the Amiga Developer CD
*
- * $Id: bitplane.c,v 1.4 2004/02/22 16:47:30 manfredtremmel Exp $
+ * $Id: bitplane.c,v 1.5 2004/02/22 18:31:48 manfredtremmel Exp $
*/
#include <stdio.h>
@@ -693,7 +693,7 @@ static void bitplane_decode_data (video_decoder_t *this_gen,
this->width_decode, /* width */
this->height, /* hight */
this->num_bitplanes, /* number bitplanes */
- this->bytes_per_pixel, /* used Bytes per pixel */
+ this->full_bytes_per_pixel, /* used Bytes per pixel */
this->rgb_palette); /* Palette (RGB) */
}
@@ -712,8 +712,8 @@ static void bitplane_decode_data (video_decoder_t *this_gen,
case 3:
for (row_ptr = 0; row_ptr < this->height; row_ptr++) {
for (pixel_ptr = 0; pixel_ptr < this->width; pixel_ptr++) {
- i = (row_ptr * this->width_decode * this->bytes_per_pixel) +
- (pixel_ptr * this->bytes_per_pixel);
+ i = (row_ptr * this->width_decode * this->full_bytes_per_pixel) +
+ (pixel_ptr * this->full_bytes_per_pixel);
j = (row_ptr * this->width) + pixel_ptr;
r = this->rgb_buf[i++];
g = this->rgb_buf[i++];