Changeset 255Tweet

Timestamp:

Dec 17, 2003, 12:25:54 AM (19 years ago)

Author:

Sam Hocevar

Message:

• examples/view.c: + Fixed a bug in the loading of 1bpp BMPs. + Commented stuff.

File:

• libcaca/trunk/examples/view.c (modified) (2 diffs)

libcaca/trunk/examples/view.c

@@ -524 +524 @@
                         bits = freadint(fp);
                     pixels[w * i * depth + j] =
-                        (bits >> ((k & ~0xf) + 0xf - (k & 0xf))) & 0xf;
+                        (bits >> ((k & ~0xf) + 0xf - (k & 0xf))) & 0x1;
                 }
                 break;
@@ -538 +538 @@
                 break;
             default:
+                /* Works for 8bpp, but also for 16, 24 etc. */
                 fread(pixels + w * i * depth, w * depth, 1, fp);
                 /* Pad reads to 4 bytes */
-                tmp = (4 - (w * depth) % 4) % 4;
+                tmp = (w * depth) % 4;
+                tmp = (4 - tmp) % 4;
                 while(tmp--)
                     freadchar(fp);