[poppler] 2 commits - CMakeLists.txt cpp/Doxyfile cpp/poppler-version.cpp NEWS qt5/src qt6/src

[GitLab Mirror]

 CMakeLists.txt              |    8 ++++----
 NEWS                        |   12 ++++++++++++
 cpp/Doxyfile                |    2 +-
 cpp/poppler-version.cpp     |    9 ++++++---
 qt5/src/Doxyfile            |    2 +-
 qt5/src/poppler-version.cpp |    9 ++++++---
 qt6/src/poppler-version.cpp |    9 ++++++---
 7 files changed, 36 insertions(+), 15 deletions(-)

New commits:
commit f1c9b9e2fadb18bc4d10836f05d5c8ca3343b950
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Aug 1 18:40:32 2020 +0200

    20.08.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76502a8c..edc529ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,9 +35,9 @@ if (ECM_FOUND)
     endif()
 endif()
 
-set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "90")
-set(POPPLER_MICRO_VERSION "1")
+set(POPPLER_MAJOR_VERSION "20")
+set(POPPLER_MINOR_VERSION "08")
+set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 set (CMAKE_CXX_STANDARD 14)
@@ -550,7 +550,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else()
 add_library(poppler ${poppler_SRCS})
 endif()
-set_target_properties(poppler PROPERTIES VERSION 101.0.0 SOVERSION 101)
+set_target_properties(poppler PROPERTIES VERSION 102.0.0 SOVERSION 102)
 if(MINGW AND BUILD_SHARED_LIBS)
     get_target_property(POPPLER_SOVERSION poppler SOVERSION)
     set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
diff --git a/NEWS b/NEWS
index e3744276..2f97d35d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Release 20.08.0:
+        core:
+         * Sub-page objects: initialize clip max values considering the render resolution. Issue #937
+         * Splash: Set initial line width to 1. Issue #674
+         * Fix stack overflow with specially crafted files
+         * GfxShading: Simplify holding the Function
+         * Splash: Fix x86 + windows asm build
+
+        qt5:
+         * Deprecate Document::toc
+         * Deprecate AnnotationUtils
+
 Release 0.90.1:
         core:
          * Fix regression on PS conversion.
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index 262a05ef..d17f2456 100644
--- a/cpp/Doxyfile
+++ b/cpp/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = "Poppler CPP"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.90.1
+PROJECT_NUMBER         = 20.08.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile
index 376542fc..9d8afeb3 100644
--- a/qt5/src/Doxyfile
+++ b/qt5/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = "Poppler Qt5"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.90.1
+PROJECT_NUMBER         = 20.08.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit 15a14b26571cc74c1888a565806852437151acfd
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Aug 1 19:03:04 2020 +0200

    Make the version reporting functions work with versions like 08
    
    numbers starting by 0 are octal so 08 is invalid so we stringify the version defines and then run atoi over them
    it's defenitely not very perfomant but it works

diff --git a/cpp/poppler-version.cpp b/cpp/poppler-version.cpp
index f6e30a6f..cc42aa9d 100644
--- a/cpp/poppler-version.cpp
+++ b/cpp/poppler-version.cpp
@@ -55,12 +55,15 @@ std::string poppler::version_string()
     return std::string(POPPLER_VERSION);
 }
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 /**
  \returns the "major" number of the version of the current poppler-cpp library
  */
 unsigned int poppler::version_major()
 {
-    return POPPLER_VERSION_MAJOR;
+    return atoi(xstr(POPPLER_VERSION_MAJOR));
 }
 
 /**
@@ -68,7 +71,7 @@ unsigned int poppler::version_major()
  */
 unsigned int poppler::version_minor()
 {
-    return POPPLER_VERSION_MINOR;
+    return atoi(xstr(POPPLER_VERSION_MINOR));
 }
 
 /**
@@ -76,5 +79,5 @@ unsigned int poppler::version_minor()
  */
 unsigned int poppler::version_micro()
 {
-    return POPPLER_VERSION_MICRO;
+    return atoi(xstr(POPPLER_VERSION_MICRO));
 }
diff --git a/qt5/src/poppler-version.cpp b/qt5/src/poppler-version.cpp
index 015267c1..0c640b02 100644
--- a/qt5/src/poppler-version.cpp
+++ b/qt5/src/poppler-version.cpp
@@ -24,17 +24,20 @@ QString Poppler::Version::string()
     return QStringLiteral(POPPLER_VERSION);
 }
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 unsigned int Poppler::Version::major()
 {
-    return POPPLER_VERSION_MAJOR;
+    return atoi(xstr(POPPLER_VERSION_MAJOR));
 }
 
 unsigned int Poppler::Version::minor()
 {
-    return POPPLER_VERSION_MINOR;
+    return atoi(xstr(POPPLER_VERSION_MINOR));
 }
 
 unsigned int Poppler::Version::micro()
 {
-    return POPPLER_VERSION_MICRO;
+    return atoi(xstr(POPPLER_VERSION_MICRO));
 }
diff --git a/qt6/src/poppler-version.cpp b/qt6/src/poppler-version.cpp
index 015267c1..0c640b02 100644
--- a/qt6/src/poppler-version.cpp
+++ b/qt6/src/poppler-version.cpp
@@ -24,17 +24,20 @@ QString Poppler::Version::string()
     return QStringLiteral(POPPLER_VERSION);
 }
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 unsigned int Poppler::Version::major()
 {
-    return POPPLER_VERSION_MAJOR;
+    return atoi(xstr(POPPLER_VERSION_MAJOR));
 }
 
 unsigned int Poppler::Version::minor()
 {
-    return POPPLER_VERSION_MINOR;
+    return atoi(xstr(POPPLER_VERSION_MINOR));
 }
 
 unsigned int Poppler::Version::micro()
 {
-    return POPPLER_VERSION_MICRO;
+    return atoi(xstr(POPPLER_VERSION_MICRO));
 }