[poppler] cpp/poppler-font.cpp cpp/poppler-global.cpp poppler/Annot.cc poppler/SplashOutputDev.cc

[Albert Astals Cid]

 cpp/poppler-font.cpp       |    3 +++
 cpp/poppler-global.cpp     |    3 +++
 poppler/Annot.cc           |    2 ++
 poppler/SplashOutputDev.cc |    2 ++
 4 files changed, 10 insertions(+)

New commits:
commit 50455bcf4f1644060b2187d4e60c3798793041cc
Author: Tamas Szekeres <szekerest at gmail.com>
Date:   Fri Jul 3 20:24:01 2015 +0200

    std::max/min need <algorithm>
    
    Bug #88511

diff --git a/cpp/poppler-font.cpp b/cpp/poppler-font.cpp
index e766b80..fcf0f7a 100644
--- a/cpp/poppler-font.cpp
+++ b/cpp/poppler-font.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009, Pino Toscano <pino at kde.org>
+ * Copyright (C) 2015, Tamas Szekeres <szekerest at gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +23,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..525dc99 100644
--- a/cpp/poppler-global.cpp
+++ b/cpp/poppler-global.cpp
@@ -2,6 +2,7 @@
  * Copyright (C) 2009-2010, Pino Toscano <pino at kde.org>
  * Copyright (C) 2010, Hib Eris <hib at hiberis.nl>
  * Copyright (C) 2014, Hans-Peter Deifel <hpdeifel at gmx.de>
+ * Copyright (C) 2015, Tamas Szekeres <szekerest at gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +23,8 @@
 
 #include "poppler-private.h"
 
+#include <algorithm>
+
 #include <cerrno>
 #include <cstring>
 #include <ios>
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index dd99eee..18576c8 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -34,6 +34,7 @@
 // Copyright (C) 2014 Anuj Khare <khareanuj18 at gmail.com>
 // Copyright (C) 2015 Petr Gajdos <pgajdos at suse.cz>
 // Copyright (C) 2015 Philipp Reinkemeier <philipp.reinkemeier at offis.de>
+// Copyright (C) 2015 Tamas Szekeres <szekerest at gmail.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -73,6 +74,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 5a9832d..801d7e1 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -34,6 +34,7 @@
 // Copyright (C) 2013 Li Junling <lijunling at sina.com>
 // Copyright (C) 2014 Ed Porras <ed at moto-research.com>
 // Copyright (C) 2014 Richard PALO <richard at netbsd.org>
+// Copyright (C) 2015 Tamas Szekeres <szekerest at gmail.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -72,6 +73,7 @@
 #include "splash/SplashFontFileID.h"
 #include "splash/Splash.h"
 #include "SplashOutputDev.h"
+#include <algorithm>
 
 #ifdef VMS
 #if (__VMS_VER < 70000000)