Skip to content
This repository has been archived by the owner on Jan 16, 2024. It is now read-only.

Commit

Permalink
update to 0.46.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen committed Aug 11, 2016
1 parent d6281d4 commit aed6284
Show file tree
Hide file tree
Showing 16 changed files with 49 additions and 9 deletions.
16 changes: 16 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Using upstream poppler 0.46.0
export PKG_CONFIG="/c/msys2-i686/mingw32/bin/pkg-config"
export PKG_CONFIG_PATH="/c/msys2-i686/mingw32/lib/pkgconfig"
export CFLAGS="-m32"
export CXXLAGS="-m32 -Dpoppler_cpp_EXPORTS"
../poppler-0.46.0/configure \
--enable-shared \
--enable-static \
--disable-libjpeg \
--disable-libopenjpeg \
--disable-libpng \
--disable-cms \
--disable-cairo-output \
--disable-poppler-glib \
--disable-splash-output \
--disable-utils
28 changes: 28 additions & 0 deletions include/poppler/cpp/poppler-document.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2009-2010, Pino Toscano <[email protected]>
* Copyright (C) 2016 Jakub Kucharski <[email protected]>
*
* 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
Expand Down Expand Up @@ -61,8 +62,32 @@ class POPPLER_CPP_EXPORT document : public poppler::noncopyable
page_layout_enum page_layout() const;
void get_pdf_version(int *major, int *minor) const;
std::vector<std::string> info_keys() const;

ustring info_key(const std::string &key) const;
bool set_info_key(const std::string &key, const ustring &val);

time_type info_date(const std::string &key) const;
bool set_info_date(const std::string &key, time_type val);

ustring get_title() const;
bool set_title(const ustring &title);
ustring get_author() const;
bool set_author(const ustring &author);
ustring get_subject() const;
bool set_subject(const ustring &subject);
ustring get_keywords() const;
bool set_keywords(const ustring &keywords);
ustring get_creator() const;
bool set_creator(const ustring &creator);
ustring get_producer() const;
bool set_producer(const ustring &producer);
time_type get_creation_date() const;
bool set_creation_date(time_type creation_date);
time_type get_modification_date() const;
bool set_modification_date(time_type mod_date);

bool remove_info();

bool is_encrypted() const;
bool is_linearized() const;
bool has_permission(permission_enum which) const;
Expand All @@ -81,6 +106,9 @@ class POPPLER_CPP_EXPORT document : public poppler::noncopyable
bool has_embedded_files() const;
std::vector<embedded_file *> embedded_files() const;

bool save(const std::string &filename) const;
bool save_a_copy(const std::string &filename) const;

static document* load_from_file(const std::string &file_name,
const std::string &owner_password = std::string(),
const std::string &user_password = std::string());
Expand Down
4 changes: 2 additions & 2 deletions include/poppler/cpp/poppler-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

#include "poppler-global.h"

#define POPPLER_VERSION "0.42.0"
#define POPPLER_VERSION "0.46.0"
#define POPPLER_VERSION_MAJOR 0
#define POPPLER_VERSION_MINOR 42
#define POPPLER_VERSION_MINOR 46
#define POPPLER_VERSION_MICRO 0

namespace poppler
Expand Down
Binary file removed lib-4.6.3/i386/libiconv.a
Binary file not shown.
Binary file modified lib-4.6.3/i386/libpoppler-cpp.a
Binary file not shown.
Binary file modified lib-4.6.3/i386/libpoppler.a
Binary file not shown.
Binary file modified lib-4.6.3/x64/libpoppler-cpp.a
Binary file not shown.
Binary file modified lib-4.6.3/x64/libpoppler.a
Binary file not shown.
Binary file removed lib-4.9.3/i386/libiconv.a
Binary file not shown.
Binary file modified lib-4.9.3/i386/libpoppler-cpp.a
Binary file not shown.
Binary file modified lib-4.9.3/i386/libpoppler.a
Binary file not shown.
Binary file modified lib-4.9.3/x64/libpoppler-cpp.a
Binary file not shown.
Binary file modified lib-4.9.3/x64/libpoppler.a
Binary file not shown.
Binary file renamed lib-4.9.3/x64/libiconv.a → lib/i386/libiconv.a
Binary file not shown.
File renamed without changes.
10 changes: 3 additions & 7 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
This contains the c++ interface to poppler. This build only depends on libiconv:

CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/local/lib" \
CFLAGS="-m64" CXXFLAGS="-m64 -Dpoppler_cpp_EXPORTS" \
../poppler-0.41.0/configure --disable-shared --enable-static --disable-splash-output
C++ interface to poppler. This build only depends on libiconv.
All the PDF rendering stuff is disabled.

In Makevars.win in the R package make sure to set:

PKG_CXXFLAGS="-Dpoppler_cpp_EXPORTS"

Maybe I should enable libpng, libtiff, libjpeg as well, not sure what they are
used for.
See build.sh

0 comments on commit aed6284

Please sign in to comment.