Attachment 112382 Details for Bug 88511 – Patch for fix

[patch] Patch for fix

poppler.patch (text/plain), 1.63 KB, created by Tamas Szekeres on 2015-01-17 11:21:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tamas Szekeres

Created: 2015-01-17 11:21:53 UTC

Size: 1.63 KB

patch

obsolete

>diff --git a/cpp/poppler-font.cpp b/cpp/poppler-font.cpp
>index e766b80..86dc23f 100644
>--- a/cpp/poppler-font.cpp
>+++ b/cpp/poppler-font.cpp
>@@ -22,6 +22,8 @@
> 
> #include "FontInfo.h"
> 
>+#include <algorithm>
>+
> using namespace poppler;
> 
> class poppler::font_info_private
>diff --git a/cpp/poppler-global.cpp b/cpp/poppler-global.cpp
>index b0edeb8..68f4a30 100644
>--- a/cpp/poppler-global.cpp
>+++ b/cpp/poppler-global.cpp
>@@ -22,6 +22,8 @@
> 
> #include "poppler-private.h"
> 
>+#include <algorithm>
>+
> #include <cerrno>
> #include <cstring>
> #include <ios>
>diff --git a/poppler/Annot.cc b/poppler/Annot.cc
>index d35cb9b..b511e7f 100644
>--- a/poppler/Annot.cc
>+++ b/poppler/Annot.cc
>@@ -71,6 +71,7 @@
> #include "DateInfo.h"
> #include "Link.h"
> #include <string.h>
>+#include <algorithm>
> 
> #if MULTITHREADED
> #  define annotLocker()   MutexLocker locker(&mutex)
>diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
>index b96232f..429ec7a 100644
>--- a/poppler/SplashOutputDev.cc
>+++ b/poppler/SplashOutputDev.cc
>@@ -72,6 +72,7 @@
> #include "splash/SplashFontFileID.h"
> #include "splash/Splash.h"
> #include "SplashOutputDev.h"
>+#include <algorithm>
> 
> #ifdef VMS
> #if (__VMS_VER < 70000000)
>diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake
>index b087a69..5a645a2 100644
>--- a/poppler/poppler-config.h.cmake
>+++ b/poppler/poppler-config.h.cmake
>@@ -186,7 +186,7 @@ char * strtok_r (char *s, const char *delim, char **save_ptr);
> #define GCC_PRINTF_FORMAT(fmt_index, va_index)
> #endif
> 
>-#if defined(_MSC_VER)
>+#if defined(_MSC_VER) && (_MSC_VER <= 1700)
> #define fmax(a, b) std::max(a, b)
> #define fmin(a, b) std::min(a, b)
> #endif

Actions: View | Splinter Review

Attachments on bug 88511: 112366 | 112382

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.