diff --git a/src/modules/Image/encodings/hrz.c b/src/modules/Image/encodings/hrz.c index 0f165ba31f75ddc85c91e4132f22662c778b6953..d2a6b8b193f938daea67c9dbc8f2e77b23a0c532 100644 --- a/src/modules/Image/encodings/hrz.c +++ b/src/modules/Image/encodings/hrz.c @@ -4,7 +4,7 @@ #include <ctype.h> #include "stralloc.h" -RCSID("$Id: hrz.c,v 1.2 1999/05/23 17:46:53 mirar Exp $"); +RCSID("$Id: hrz.c,v 1.3 1999/05/24 12:53:57 mirar Exp $"); #include "pike_macros.h" #include "object.h" #include "constants.h" @@ -58,8 +58,8 @@ void image_hrz_f_decode(INT32 args) { rgb_group pix; pix.r = s->str[c*3]<<2 | s->str[c*3]>>4; - pix.g = s->str[c*3+1]<<2 | s->str[c*3]>>4; - pix.b = s->str[c*3+2]<<2 | s->str[c*3]>>4; + pix.g = s->str[c*3+1]<<2 | s->str[c*3+1]>>4; + pix.b = s->str[c*3+2]<<2 | s->str[c*3+2]>>4; ((struct image *)io->storage)->img[c] = pix; } pop_n_elems(args); diff --git a/src/modules/Image/encodings/pcx.c b/src/modules/Image/encodings/pcx.c index dbdcb0d5e48dadcde3c14b79e98083e9596557eb..8e6dc2b4aa472363a82a19f9d0707faaba2fb57f 100644 --- a/src/modules/Image/encodings/pcx.c +++ b/src/modules/Image/encodings/pcx.c @@ -1,5 +1,5 @@ #include "global.h" -RCSID("$Id: pcx.c,v 1.6 1999/05/23 17:46:55 mirar Exp $"); +RCSID("$Id: pcx.c,v 1.7 1999/05/24 12:53:58 mirar Exp $"); #include "config.h" @@ -70,7 +70,7 @@ unsigned char *get_chunk( struct buffer *b, unsigned int len ) unsigned char get_char( struct buffer *b ) { - if(b->len > 1) + if(b->len) { b->str++; b->len--; @@ -402,8 +402,11 @@ static void f_rle_encode( INT32 args ) string_builder_putchar( &result, value ); } } -/* fprintf(stderr, "RLE encode source len = %d; dest len = %d\n", */ -/* sp[-1].u.string->len, result.s->len ); */ +#if 0 + fprintf(stderr, "read: %d\n", source-(unsigned char*)data->str); + fprintf(stderr, "RLE encode source len = %d; dest len = %d\n", + sp[-1].u.string->len, result.s->len ); +#endif pop_n_elems( args ); push_string( finish_string_builder( &result )); }