# HG changeset patch # User reimar # Date 1238510894 0 # Node ID 851ca5db8327ef19d4259a1dbe4d5279a1d08f1e # Parent 7a546836b61ba32ee913465a593c4c003f583770 Avoid the last two uses of bitmasks in interplayvideo diff -r 7a546836b61b -r 851ca5db8327 interplayvideo.c --- a/interplayvideo.c Tue Mar 31 14:44:46 2009 +0000 +++ b/interplayvideo.c Tue Mar 31 14:48:14 2009 +0000 @@ -212,9 +212,9 @@ CHECK_STREAM_PTR(8); for (y = 0; y < 8; y++) { - flags = *s->stream_ptr++; - for (x = 0x01; x <= 0x80; x <<= 1) { - *s->pixel_ptr++ = P[!!(flags & x)]; + flags = *s->stream_ptr++ | 0x100; + for (; flags != 1; flags >>= 1) { + *s->pixel_ptr++ = P[flags & 1]; } s->pixel_ptr += s->line_inc; } @@ -354,17 +354,15 @@ /* horizontal split; top & bottom halves are 2-color encoded */ for (y = 0; y < 8; y++) { - int bitmask; - if (y == 4) { P[0] = *s->stream_ptr++; P[1] = *s->stream_ptr++; } - flags = *s->stream_ptr++; + flags = *s->stream_ptr++ | 0x100; - for (bitmask = 0x01; bitmask <= 0x80; bitmask <<= 1) { + for (; flags != 1; flags >>= 1) { - *s->pixel_ptr++ = P[!!(flags & bitmask)]; + *s->pixel_ptr++ = P[flags & 1]; } s->pixel_ptr += s->line_inc; }