[poppler] 3 commits - cpp/Doxyfile cpp/poppler-destination.cpp cpp/poppler-document.cpp cpp/poppler-embedded-file.cpp cpp/poppler-font.cpp cpp/poppler-global.cpp cpp/poppler-image.cpp cpp/poppler-page.cpp cpp/poppler-page-renderer.cpp cpp/poppler-page-transition.cpp cpp/poppler-rectangle.cpp cpp/poppler-toc.cpp cpp/poppler-version.cpp
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Feb 10 16:39:16 UTC 2019
cpp/Doxyfile | 2 +-
cpp/poppler-destination.cpp | 3 +++
cpp/poppler-document.cpp | 3 +++
cpp/poppler-embedded-file.cpp | 3 +++
cpp/poppler-font.cpp | 3 +++
cpp/poppler-global.cpp | 3 +++
cpp/poppler-image.cpp | 3 +++
cpp/poppler-page-renderer.cpp | 3 +++
cpp/poppler-page-transition.cpp | 3 +++
cpp/poppler-page.cpp | 3 +++
cpp/poppler-rectangle.cpp | 3 +++
cpp/poppler-toc.cpp | 3 +++
cpp/poppler-version.cpp | 27 +++++++++++++++++++++++++++
13 files changed, 61 insertions(+), 1 deletion(-)
New commits:
commit ae62db7d22c1dbd3b958ec571337d34c9fc7be7b
Author: Masamichi Hosoda <trueroad at trueroad.jp>
Date: Sun Feb 10 23:27:25 2019 +0900
cpp: docs: Add description of header version macro
This commit adds description of header version macro.
POPPLER_VERSION
POPPLER_VERSION_MAJOR
POPPLER_VERSION_MINOR
POPPLER_VERSION_MICRO
diff --git a/cpp/poppler-version.cpp b/cpp/poppler-version.cpp
index d165a336..f6e30a6f 100644
--- a/cpp/poppler-version.cpp
+++ b/cpp/poppler-version.cpp
@@ -24,6 +24,27 @@
*/
#include "poppler-version.h"
+/**
+ \def POPPLER_VERSION
+ \brief The version string of the poppler-cpp header files.
+ e.g. in poppler version 0.1.2 this is "0.1.2".
+ */
+/**
+ \def POPPLER_VERSION_MAJOR
+ \brief The "major" version number of the poppler-cpp header files.
+ e.g. in poppler version 0.1.2 this is 0.
+ */
+/**
+ \def POPPLER_VERSION_MINOR
+ \brief The "minor" version number of the poppler-cpp header files.
+ e.g. in poppler version 0.1.2 this is 1.
+ */
+/**
+ \def POPPLER_VERSION_MICRO
+ \brief The "micro" version number of the poppler-cpp header files.
+ e.g. in poppler version 0.1.2 this is 2.
+ */
+
using namespace poppler;
/**
commit dbc49f4805eff0ca9f200feebd433ab73b12ba73
Author: Masamichi Hosoda <trueroad at trueroad.jp>
Date: Sun Feb 10 22:04:45 2019 +0900
cpp: docs: Add header file information
This commit adds header files for the document.
It generates header file information
including dependency graphs and so on.
diff --git a/cpp/poppler-destination.cpp b/cpp/poppler-destination.cpp
index 2fcc98db..74dcc106 100644
--- a/cpp/poppler-destination.cpp
+++ b/cpp/poppler-destination.cpp
@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-destination.h
+ */
#include "poppler-destination.h"
#include "poppler-destination-private.h"
diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp
index c58f9663..498d9f78 100644
--- a/cpp/poppler-document.cpp
+++ b/cpp/poppler-document.cpp
@@ -20,6 +20,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-document.h
+ */
#include "poppler-destination.h"
#include "poppler-document.h"
#include "poppler-embedded-file.h"
diff --git a/cpp/poppler-embedded-file.cpp b/cpp/poppler-embedded-file.cpp
index 77772e23..2dae333c 100644
--- a/cpp/poppler-embedded-file.cpp
+++ b/cpp/poppler-embedded-file.cpp
@@ -18,6 +18,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-embedded-file.h
+ */
#include "poppler-embedded-file.h"
#include "poppler-embedded-file-private.h"
diff --git a/cpp/poppler-font.cpp b/cpp/poppler-font.cpp
index 61e90493..edbc9edd 100644
--- a/cpp/poppler-font.cpp
+++ b/cpp/poppler-font.cpp
@@ -18,6 +18,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-font.h
+ */
#include "poppler-font.h"
#include "poppler-document-private.h"
diff --git a/cpp/poppler-global.cpp b/cpp/poppler-global.cpp
index f17ce961..41ce08f7 100644
--- a/cpp/poppler-global.cpp
+++ b/cpp/poppler-global.cpp
@@ -23,6 +23,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-global.h
+ */
#include "poppler-global.h"
#include "poppler-private.h"
diff --git a/cpp/poppler-image.cpp b/cpp/poppler-image.cpp
index eab37a2a..261c5f7b 100644
--- a/cpp/poppler-image.cpp
+++ b/cpp/poppler-image.cpp
@@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-image.h
+ */
#include "poppler-image.h"
#include "poppler-image-private.h"
diff --git a/cpp/poppler-page-renderer.cpp b/cpp/poppler-page-renderer.cpp
index 4713cb17..fa548157 100644
--- a/cpp/poppler-page-renderer.cpp
+++ b/cpp/poppler-page-renderer.cpp
@@ -18,6 +18,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-page-renderer.h
+ */
#include "poppler-page-renderer.h"
#include "poppler-document-private.h"
diff --git a/cpp/poppler-page-transition.cpp b/cpp/poppler-page-transition.cpp
index 766d062b..7efabf1a 100644
--- a/cpp/poppler-page-transition.cpp
+++ b/cpp/poppler-page-transition.cpp
@@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-page-transition.h
+ */
#include "poppler-page-transition.h"
#include "PageTransition.h"
diff --git a/cpp/poppler-page.cpp b/cpp/poppler-page.cpp
index c4955471..426f0dbd 100644
--- a/cpp/poppler-page.cpp
+++ b/cpp/poppler-page.cpp
@@ -22,6 +22,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-page.h
+ */
#include "poppler-page.h"
#include "poppler-page-transition.h"
diff --git a/cpp/poppler-rectangle.cpp b/cpp/poppler-rectangle.cpp
index 83e5cc9b..20c8dc27 100644
--- a/cpp/poppler-rectangle.cpp
+++ b/cpp/poppler-rectangle.cpp
@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-rectangle.h
+ */
#include "poppler-rectangle.h"
#include <iostream>
diff --git a/cpp/poppler-toc.cpp b/cpp/poppler-toc.cpp
index c2cfc9ee..571bad27 100644
--- a/cpp/poppler-toc.cpp
+++ b/cpp/poppler-toc.cpp
@@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-toc.h
+ */
#include "poppler-toc.h"
#include "poppler-toc-private.h"
diff --git a/cpp/poppler-version.cpp b/cpp/poppler-version.cpp
index dcc100f6..d165a336 100644
--- a/cpp/poppler-version.cpp
+++ b/cpp/poppler-version.cpp
@@ -16,6 +16,12 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+/**
+ \file poppler-version.h.in
+ \brief poppler-version.h
+ \remark poppler-version.h.in is the file name in Poppler's source files.
+ The file name as an include file is poppler-version.h.
+ */
#include "poppler-version.h"
using namespace poppler;
commit 9802b5fc05817a9a4db6a65b22411068767fb681
Author: Masamichi Hosoda <trueroad at trueroad.jp>
Date: Sun Feb 10 21:22:50 2019 +0900
cpp: docs: Fix doc generating from poppler-version.h.in
Doxygen generated document did not contain
`poppler::version_string()`, `poppler::version_major()`,
`poppler::version_minor()`, and `poppler::version_micro()`.
These descriptions are written in `poppler-version.h.in`
in source files and doxygen could not parse `poppler-version.h.in`
because its extension is not mapped to any languages.
This commit adds `*.in` to C++ in extension mapping.
As a result, doxygen parses `poppler-version.h.in` as C++ file.
So generated document becomes to contain
`poppler::version_string()` etc.
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index 0b36e360..0c3244bd 100644
--- a/cpp/Doxyfile
+++ b/cpp/Doxyfile
@@ -217,7 +217,7 @@ OPTIMIZE_OUTPUT_VHDL = NO
# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-EXTENSION_MAPPING =
+EXTENSION_MAPPING = in=C++
# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
# to include (a tag file for) the STL sources as input, then you should
More information about the poppler
mailing list