Am 06.02.2012 01:21, schrieb Albert Astals Cid:
El Dilluns, 6 de febrer de 2012, a les 00:36:36, Albert Astals Cid va
escriure:
I've just pushed the last bit of stuff we needed to merge into the
xpdf303merge branch.
Hurrray, big congrats to Thomas, Carlos and me for making it possible.
Now the problem is that we kept developing in master and it does not merge
cleanly :D
Now (or maybe tomorrow european afternoon) i'm going to merge trunk into
xpdf303merge branches so that we have two branches that have the same of our
features but one has the new features and improvements of xpdf303 and the
other not.
I've just finished merging trunk into xpdf303merge.
Please start testing now and report anything you find ASAP. If noone complains
by tuesday 14 I'll copy/merge xpdf303merge into trunk.
There are two small bugs:
1. You can't compile it under windows (syntax error in GlobalParamsWin.cc)
2. You can't compile it with SPLASH_CMYK (the local grayIndexed variable
is removed in SplashOutputDev.cc but not its uses in SPLASH_CMYK).
So here a small patch.
Cheers,
Thomas
Cheers,
Albert
Once that happens, we'll have a "regtesting week" so that everyone runs the
regtest and check if he can see any big obvious regression. If that does not
happen, we'll merge back xpdf303merge into trunk and cross our fingers ;-)
(Joking we've been already doing regtesting and we mostly already know
everything is the same or better)
Cheers,
Albert
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
.
diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
index 5ac1c60..c62e2cd 100644
--- a/poppler/GlobalParamsWin.cc
+++ b/poppler/GlobalParamsWin.cc
@@ -394,7 +394,7 @@ static char *findSubstituteName(const char *origName)
/* Windows implementation of external font matching code */
GooString *GlobalParams::findSystemFontFile(GfxFont *font,
SysFontType *type,
- int *fontNum, , GooString *
/*substituteFontName*/) {
+ int *fontNum, GooString *
/*substituteFontName*/) {
SysFontInfo *fi;
GooString *path = NULL;
GooString *fontName = font->getName();
diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 69e26a0..246a37d 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -3018,25 +3018,15 @@ void SplashOutputDev::drawImage(GfxState *state, Object
*ref, Stream *str,
break;
#if SPLASH_CMYK
case splashModeCMYK8:
- grayIndexed = colorMap->getColorSpace()->getMode() != csDeviceGray;
imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
for (i = 0; i < n; ++i) {
pix = (Guchar)i;
colorMap->getCMYK(&pix, &cmyk);
- if (cmyk.c != 0 || cmyk.m != 0 || cmyk.y != 0) {
- grayIndexed = gFalse;
- }
imgData.lookup[4*i] = colToByte(cmyk.c);
imgData.lookup[4*i+1] = colToByte(cmyk.m);
imgData.lookup[4*i+2] = colToByte(cmyk.y);
imgData.lookup[4*i+3] = colToByte(cmyk.k);
}
-#ifndef USE_CMS
- if (colorMap->getColorSpace()->getMode() == csIndexed) {
- if (((GfxIndexedColorSpace *)
colorMap->getColorSpace())->getBase()->getMode() == csICCBased)
- grayIndexed = gFalse;
- }
-#endif
break;
#endif
}
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
