poppler/SplashOutputDev.cc | 24 ++++++++++++------------ poppler/poppler-config.h.cmake | 6 ++++-- poppler/poppler-config.h.in | 6 ++++-- 3 files changed, 20 insertions(+), 16 deletions(-)
New commits: commit 6ad95e7b8b9766aa19f01f06f02eb430e4a4a899 Author: Albert Astals Cid <[email protected]> Date: Mon Jul 11 15:04:49 2011 +0100 Complete the list of preprocessor defines that we never define When using any of the two sanctioned build systems diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake index 066111c..ca4de77 100644 --- a/poppler/poppler-config.h.cmake +++ b/poppler/poppler-config.h.cmake @@ -112,8 +112,10 @@ #cmakedefine USE_CMS 1 #endif -// Also, there's a couple of preprocessor symbols in the header files -// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and +// Also, there are preprocessor symbols in the header files +// that are used but never defined when building poppler using configure +// or cmake: DISABLE_OUTLINE, DEBUG_MEM, SPLASH_CMYK, HAVE_T1LIB_H, +// ENABLE_PLUGINS, DEBUG_FORMS, HAVE_FREETYPE_FREETYPE_H //------------------------------------------------------------------------ // version diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in index 81edac5..732e731 100644 --- a/poppler/poppler-config.h.in +++ b/poppler/poppler-config.h.in @@ -112,8 +112,10 @@ #undef USE_CMS #endif -// Also, there's a couple of preprocessor symbols in the header files -// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and +// Also, there are preprocessor symbols in the header files +// that are used but never defined when building poppler using configure +// or cmake: DISABLE_OUTLINE, DEBUG_MEM, SPLASH_CMYK, HAVE_T1LIB_H, +// ENABLE_PLUGINS, DEBUG_FORMS, HAVE_FREETYPE_FREETYPE_H //------------------------------------------------------------------------ // version commit edcc84ef0137a733cf3fab79b919af309d87325c Author: Albert Astals Cid <[email protected]> Date: Mon Jul 11 15:00:39 2011 +0100 Harmonize all SPLASH_CMYK to use #if diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc index 9f00115..92c7f00 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -410,7 +410,7 @@ static void splashOutBlendMultiply(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm) { int i; -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { SplashColor rgbSrc; SplashColor rgbDest; @@ -434,7 +434,7 @@ static void splashOutBlendScreen(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm) { int i; -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { SplashColor rgbSrc; SplashColor rgbDest; @@ -458,7 +458,7 @@ static void splashOutBlendOverlay(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm) { int i; -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { SplashColor rgbSrc; SplashColor rgbDest; @@ -486,7 +486,7 @@ static void splashOutBlendDarken(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm) { int i; -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { SplashColor rgbSrc; SplashColor rgbDest; @@ -510,7 +510,7 @@ static void splashOutBlendLighten(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm) { int i; -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { SplashColor rgbSrc; SplashColor rgbDest; @@ -535,7 +535,7 @@ static void splashOutBlendColorDodge(SplashColorPtr src, SplashColorPtr dest, SplashColorMode cm) { int i, x; -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { SplashColor rgbSrc; SplashColor rgbDest; @@ -569,7 +569,7 @@ static void splashOutBlendColorBurn(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm) { int i, x; -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { SplashColor rgbSrc; SplashColor rgbDest; @@ -603,7 +603,7 @@ static void splashOutBlendHardLight(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm) { int i; -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { SplashColor rgbSrc; SplashColor rgbDest; @@ -631,7 +631,7 @@ static void splashOutBlendSoftLight(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm) { int i, x; -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { SplashColor rgbSrc; SplashColor rgbDest; @@ -675,7 +675,7 @@ static void splashOutBlendDifference(SplashColorPtr src, SplashColorPtr dest, int i; for (i = 0; i < splashColorModeNComps[cm]; ++i) { -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { blend[i] = dest[i] < src[i] ? 255 - (src[i] - dest[i]) : 255 - (dest[i] - src[i]); @@ -692,7 +692,7 @@ static void splashOutBlendExclusion(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm) { int i; -#ifdef SPLASH_CMYK +#if SPLASH_CMYK if (cm == splashModeCMYK8) { SplashColor rgbSrc; SplashColor rgbDest; @@ -3657,7 +3657,7 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Catalog *catalog, Obje (paintType == 1) ? colorMode : splashModeMono8, gTrue); memset(bitmap->getAlphaPtr(), 0, bitmap->getWidth() * bitmap->getHeight()); if (paintType == 2) { -#ifdef SPLASH_CMYK +#if SPLASH_CMYK memset(bitmap->getDataPtr(), (colorMode == splashModeCMYK8) ? 0x00 : 0xFF, bitmap->getRowSize() * bitmap->getHeight()); #else memset(bitmap->getDataPtr(), 0xFF, bitmap->getRowSize() * bitmap->getHeight()); _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
