Update of /cvs/poppler/poppler/splash
In directory kemper:/tmp/cvs-serv31479/splash
Modified Files:
Splash.cc SplashBitmap.cc
Log Message:
fix merging problems
Index: Splash.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/Splash.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Splash.cc 25 Apr 2007 19:59:10 -0000 1.11
+++ Splash.cc 28 Apr 2007 22:12:22 -0000 1.12
@@ -2139,6 +2139,7 @@
case splashModeMono8:
ok = srcMode == splashModeMono8;
nComps = 1;
+ break;
case splashModeRGB8:
ok = srcMode == splashModeRGB8;
nComps = 3;
Index: SplashBitmap.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashBitmap.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SplashBitmap.cc 25 Apr 2007 19:59:10 -0000 1.5
+++ SplashBitmap.cc 28 Apr 2007 22:12:22 -0000 1.6
@@ -172,7 +172,6 @@
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:
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
