poppler/ArthurOutputDev.cc | 4 +--- poppler/poppler-config.h.cmake | 5 +++++ poppler/poppler-config.h.in | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit ac32021704178721ee007a6b6831283e323e500f Author: Pino Toscano <[email protected]> Date: Fri Apr 30 01:14:14 2010 +0200 demote the #warning to a simple FIXME comment diff --git a/poppler/ArthurOutputDev.cc b/poppler/ArthurOutputDev.cc index 821b84e..7573f3f 100644 --- a/poppler/ArthurOutputDev.cc +++ b/poppler/ArthurOutputDev.cc @@ -600,9 +600,7 @@ void ArthurOutputDev::drawChar(GfxState *state, double x, double y, fontPath->pts[i+1].x+x0, fontPath->pts[i+1].y+y0); ++i; } -#ifdef __GNUC__ -#warning FIX THIS -#endif +// FIXME fix this // else if (fontPath->flags[i] & splashPathArcCW) { // qDebug() << "Need to implement arc"; // } commit 8c1bc17552c989c15f318d9d109607a9a594ca6b Author: Pino Toscano <[email protected]> Date: Fri Apr 30 01:12:19 2010 +0200 MSVC: define fmax() and fmin() MSVC does not provide those functions, so we need to define them to the existing max()/mix() macros. Thanks to Patrick Spendrin for the hint! diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake index 95e95cc..3131f6b 100644 --- a/poppler/poppler-config.h.cmake +++ b/poppler/poppler-config.h.cmake @@ -101,5 +101,10 @@ #define GCC_PRINTF_FORMAT(fmt_index, va_index) #endif +#if defined(_MSC_VER) +#define fmax(a, b) max(a, b) +#define fmin(a, b) min(a, b) +#endif + #endif /* POPPLER_CONFIG_H */ diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in index 7b0644c..1764363 100644 --- a/poppler/poppler-config.h.in +++ b/poppler/poppler-config.h.in @@ -101,5 +101,10 @@ #define GCC_PRINTF_FORMAT(fmt_index, va_index) #endif +#if defined(_MSC_VER) +#define fmax(a, b) max(a, b) +#define fmin(a, b) min(a, b) +#endif + #endif /* POPPLER_CONFIG_H */ _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
