Commit 6479ce22 authored by Albert Astals Cid's avatar Albert Astals Cid

fix merging problems

parent e2ac4ada
......@@ -2139,6 +2139,7 @@ SplashError Splash::drawImage(SplashImageSource src, void *srcData,
case splashModeMono8:
ok = srcMode == splashModeMono8;
nComps = 1;
break;
case splashModeRGB8:
ok = srcMode == splashModeRGB8;
nComps = 3;
......
......@@ -172,7 +172,6 @@ void SplashBitmap::getPixel(int x, int y, SplashColorPtr pixel) {
switch (mode) {
case splashModeMono1:
p = &data[y * rowSize + (x >> 3)];
pixel[0] = (p[0] >> (7 - (x & 7))) & 1;
pixel[0] = (p[0] & (0x80 >> (x & 7))) ? 0xff : 0x00;
break;
case splashModeMono8:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment