diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-11-15 00:06:26 +0100 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2016-11-15 00:06:26 +0100 |
| commit | f7f0f14e095425d171456a697804f2f34ed26426 (patch) | |
| tree | aec3464b6880d465dfe16fa1cc33a8956b9a26a6 | |
| parent | 07ac68603552b36a2a6b8ea5982f22f24f5835b1 (diff) | |
VS 2013 has fmin() and fmax()
| -rw-r--r-- | NEWS | 13 | ||||
| -rw-r--r-- | poppler/poppler-config.h.cmake | 3 |
2 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,16 @@ +Release 0.49.0 + core: + * Fix memory leak in parametrized gouraudTriangleShadedFill + * Fix crash on broken files + * PDFDoc::setDocInfoStringEntry(): treat value consisting of just the unicode marker as an empty string + * VS 2013 has fmin() and fmax() + + utils: + * pdfseparate: remove extra '%' in error message + + build system: + * configure: Fix typo in disable nss help string + Release 0.48.0 core: * Fix crashes and memory leaks in invalid files. diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake index e3e2cfb7..773f3ffd 100644 --- a/poppler/poppler-config.h.cmake +++ b/poppler/poppler-config.h.cmake @@ -15,6 +15,7 @@ // // Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com> // Copyright (C) 2014 Hib Eris <hib@hiberis.nl> +// Copyright (C) 2016 Tor Lillqvist <tml@collabora.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 @@ -186,7 +187,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 < 1800 #define fmax(a, b) std::max(a, b) #define fmin(a, b) std::min(a, b) #endif |