Changeset 1159


Ignore:
Timestamp:
Aug 11, 2015, 3:56:54 PM (10 years ago)
Author:
Silvan Scherrer
Message:

poppler: update vendor to 0.35.0

Location:
poppler/vendor/current
Files:
2 added
61 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified poppler/vendor/current/CMakeLists.txt

    r1150 r1159  
    2323
    2424set(POPPLER_MAJOR_VERSION "0")
    25 set(POPPLER_MINOR_VERSION "33")
     25set(POPPLER_MINOR_VERSION "35")
    2626set(POPPLER_MICRO_VERSION "0")
    2727set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
    … …  
    4040option(ENABLE_LIBCURL "Build libcurl based HTTP support." OFF)
    4141option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF)
     42option(SPLASH_CMYK "Include support for CMYK rasterization." OFF)
    4243option(USE_FIXEDPOINT "Use fixed point arithmetic in the Splash backend" OFF)
    4344option(USE_FLOAT "Use single precision arithmetic in the Splash backend" OFF)
    … …  
    159160set(USE_OPENJPEG1 FALSE)
    160161set(USE_OPENJPEG2 FALSE)
     162set(WITH_OPENJPEG FALSE)
    161163if(ENABLE_LIBOPENJPEG STREQUAL "auto")
    162164  find_package(LIBOPENJPEG)
    … …  
    177179  set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
    178180endif()
     181set(ENABLE_LIBOPENJPEG "${WITH_OPENJPEG}")
    179182if(ENABLE_CMS STREQUAL "auto")
    180183  find_package(LCMS2)
    … …  
    475478add_library(poppler SHARED ${poppler_SRCS})
    476479endif(MSVC)
    477 set_target_properties(poppler PROPERTIES VERSION 52.0.0 SOVERSION 52)
     480set_target_properties(poppler PROPERTIES VERSION 54.0.0 SOVERSION 54)
    478481target_link_libraries(poppler ${poppler_LIBS})
    479482target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
    … …  
    702705show_end_message("font configuration" ${font_configuration})
    703706show_end_message_yesno("splash output" ENABLE_SPLASH)
     707if(SPLASH_CMYK)
     708  message("      with CMYK support")
     709endif()
    704710show_end_message_yesno("cairo output" CAIRO_FOUND)
    705711show_end_message_yesno("qt4 wrapper" QT4_FOUND)

  • TabularUnified poppler/vendor/current/ChangeLog

    r1150 r1159  
     1commit 1213501882cf2ec6e3dcb3c078391040c8cb0a57
     2Author: Albert Astals Cid <aacid@kde.org>
     3Date:   Sun Aug 9 18:27:06 2015 +0200
     4
     5    0.35.0
     6
     7 CMakeLists.txt         |  4 ++--
     8 NEWS                   | 29 +++++++++++++++++++++++++++++
     9 configure.ac           |  2 +-
     10 cpp/Doxyfile           |  2 +-
     11 poppler/Makefile.am    |  2 +-
     12 qt4/src/CMakeLists.txt |  2 +-
     13 qt4/src/Doxyfile       |  2 +-
     14 qt4/src/Makefile.am    |  2 +-
     15 qt5/src/CMakeLists.txt |  2 +-
     16 qt5/src/Doxyfile       |  2 +-
     17 qt5/src/Makefile.am    |  2 +-
     18 11 files changed, 40 insertions(+), 11 deletions(-)
     19
     20commit a7b1151ce7a14d359d85bacfe02352cdeb8d9a8f
     21Author: Hib Eris <hib@hiberis.nl>
     22Date:   Sun Jul 26 10:38:37 2015 +0200
     23
     24    glib-demo: Prefer gtk_label_set_{x,y}align() over deprecated
     25    gtk_misc_set_alignment()
     26
     27    https://bugs.freedesktop.org/show_bug.cgi?id=88788
     28
     29 glib/demo/main.c | 16 ++++++++++++----
     30 1 file changed, 12 insertions(+), 4 deletions(-)
     31
     32commit e6e7d1492b518d57136031a94069a994182693cc
     33Author: Hib Eris <hib@hiberis.nl>
     34Date:   Sun May 31 12:32:36 2015 +0200
     35
     36    pdftocairo: Fix cast to pointer from integer of different size
     37    on win64
     38
     39    Fixes warning:
     40
     41    [  322s]   CXX      pdftocairo-pdftocairo-win32.o
     42    [  324s] In file included from
     43    /usr/x86_64-w64-mingw32/sys-root/mingw/include/windows.h:72:0,
     44    [  324s]                  from
     45    /usr/x86_64-w64-mingw32/sys-root/mingw/include/cairo/cairo-win32.h:44,
     46    [  324s]                  from pdftocairo-win32.cc:16:
     47    [  324s] pdftocairo-win32.cc: In function 'HWND__*
     48    createGroupBox(HWND, HINSTANCE, int, const char*, RECT*)':
     49    [  324s] pdftocairo-win32.cc:170:23: warning: cast to pointer from
     50    integer of different size [-Wint-to-pointer-cast]
     51    [  324s]         parent, (HMENU)id,
     52    [  324s]                        ^
     53    [  324s] pdftocairo-win32.cc: In function 'HWND__*
     54    createCheckBox(HWND, HINSTANCE, int, const char*, RECT*)':
     55    [  324s] pdftocairo-win32.cc:186:23: warning: cast to pointer from
     56    integer of different size [-Wint-to-pointer-cast]
     57    [  324s]         parent, (HMENU)id,
     58    [  324s]                        ^
     59    [  324s] pdftocairo-win32.cc: In function 'HWND__*
     60    createStaticText(HWND, HINSTANCE, int, const char*, RECT*)':
     61    [  324s] pdftocairo-win32.cc:202:23: warning: cast to pointer from
     62    integer of different size [-Wint-to-pointer-cast]
     63    [  324s]         parent, (HMENU)id,
     64    [  324s]                        ^
     65    [  324s] pdftocairo-win32.cc: In function 'HWND__*
     66    createPageScaleComboBox(HWND, HINSTANCE, int, RECT*)':
     67    [  324s] pdftocairo-win32.cc:219:23: warning: cast to pointer from
     68    integer of different size [-Wint-to-pointer-cast]
     69    [  324s]         parent, (HMENU)id,
     70    [  324s]                        ^
     71
     72    https://bugs.freedesktop.org/show_bug.cgi?id=91465
     73
     74 utils/pdftocairo-win32.cc | 26 +++++++++++++-------------
     75 1 file changed, 13 insertions(+), 13 deletions(-)
     76
     77commit f3a0191abbf67c8b0f83739e1844a2fabe4138a4
     78Author: Hib Eris <hib@hiberis.nl>
     79Date:   Thu Jul 23 21:44:57 2015 +0200
     80
     81    Explicitly link poppler-glib against pthread
     82
     83    Debian complains about missing symbols:
     84
     85    dpkg-shlibdeps: warning: symbol pthread_mutexattr_destroy used by
     86    debian/libpoppler-glib8/usr/lib/i386-linux-gnu/libpoppler-glib.so.8.6.0
     87    found in none of the libraries
     88    dpkg-shlibdeps: warning: symbol pthread_mutexattr_init used by
     89    debian/libpoppler-glib8/usr/lib/i386-linux-gnu/libpoppler-glib.so.8.6.0
     90    found in none of the libraries
     91    dpkg-shlibdeps: warning: symbol pthread_mutexattr_settype used by
     92    debian/libpoppler-glib8/usr/lib/i386-linux-gnu/libpoppler-glib.so.8.6.0
     93    found in none of the libraries
     94
     95    https://bugs.freedesktop.org/show_bug.cgi?id=91450
     96
     97 glib/Makefile.am | 1 +
     98 1 file changed, 1 insertion(+)
     99
     100commit fb264bfa8bf7142cabc8d94a86594cf0e7c9f134
     101Author: Hib Eris <hib@hiberis.nl>
     102Date:   Fri Jul 24 22:18:26 2015 +0200
     103
     104    glib-demo: Remove code for no longer supported gtk versions
     105
     106    https://bugs.freedesktop.org/show_bug.cgi?id=88788
     107
     108 glib/demo/annots.c     |  8 --------
     109 glib/demo/selections.c | 16 ----------------
     110 2 files changed, 24 deletions(-)
     111
     112commit dd0883649ac296c6033474fe5991c534ac2ce594
     113Author: Hib Eris <hib@hiberis.nl>
     114Date:   Fri Jul 24 22:09:57 2015 +0200
     115
     116    glib-demo: Remove use of deprecated
     117    gtk_dialog_set_alternative_button_order()
     118
     119    https://bugs.freedesktop.org/show_bug.cgi?id=88788
     120
     121 glib/demo/main.c | 4 ----
     122 1 file changed, 4 deletions(-)
     123
     124commit ffc798a7fcf95d2aaf123772072ef956ceb2dff7
     125Author: Hib Eris <hib@hiberis.nl>
     126Date:   Sun Jan 25 18:16:04 2015 +0100
     127
     128    glib-demo: Remove deprecated use of gtk_misc_set_alignment()
     129
     130    https://bugs.freedesktop.org/show_bug.cgi?id=88788
     131
     132 glib/demo/main.c | 10 ++++++----
     133 1 file changed, 6 insertions(+), 4 deletions(-)
     134
     135commit 56915b2989fc244b58a454fe40412eb731e706bd
     136Author: Hib Eris <hib@hiberis.nl>
     137Date:   Sun Jan 25 13:10:31 2015 +0100
     138
     139    glib-demo: Remove use of deprecated GtkAlignment
     140
     141    https://bugs.freedesktop.org/show_bug.cgi?id=88788
     142
     143 glib/demo/annots.c | 23 +++++++++++---------
     144 glib/demo/forms.c  | 23 +++++++++++---------
     145 glib/demo/info.cc  | 18 +++++++++------
     146 glib/demo/main.c   | 12 +---------
     147 glib/demo/page.c   | 34 ++++++++++++++++++-----------
     148 glib/demo/text.c   | 18 +++++++++------
     149 glib/demo/utils.c  | 64
     150 +++++++++++++++++++++++++++++++-----------------------
     151 7 files changed, 107 insertions(+), 85 deletions(-)
     152
     153commit 49e33e1213a7957d4814656960bf269abcabc7c3
     154Author: Hib Eris <hib@hiberis.nl>
     155Date:   Sun Jan 25 12:21:41 2015 +0100
     156
     157    glib-demo: Remove deprecated use of gtk_tree_view_set_rules_hint()
     158
     159    The use of rules-hint is deprecated in gtk because it is
     160    considered bad application API and is not really usefull.
     161
     162    See
     163    https://git.gnome.org/browse/gtk+/commit/?id=0ed766ec866a2da7e3db05b1db2fc2519d6b1cdc
     164
     165    https://bugs.freedesktop.org/show_bug.cgi?id=88788
     166
     167 glib/demo/attachments.c | 1 -
     168 glib/demo/find.c        | 1 -
     169 glib/demo/fonts.c       | 1 -
     170 glib/demo/transitions.c | 1 -
     171 4 files changed, 4 deletions(-)
     172
     173commit 70f3c5ff0010775e5fcd590db1b8d475694fe3a4
     174Author: William Bader <williambader@hotmail.com>
     175Date:   Sat Jul 18 16:36:30 2015 +0200
     176
     177    Updated patch to add configure --enable-build-type
     178
     179    Bug #90796
     180
     181 configure.ac | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
     182 1 file changed, 52 insertions(+)
     183
     184commit 1aa2f6e8a41a6a86dc02bf7c5cbc62355e780961
     185Author: Albert Astals Cid <aacid@kde.org>
     186Date:   Fri Jul 17 00:40:56 2015 +0200
     187
     188    Silly micro optimization: Move vars inside case {}
     189
     190 poppler/SplashOutputDev.cc | 19 ++++++++++++-------
     191 1 file changed, 12 insertions(+), 7 deletions(-)
     192
     193commit 705615f7569bbadb555bbf45c15c7c01f1690db5
     194Author: Albert Astals Cid <aacid@kde.org>
     195Date:   Fri Jul 17 00:38:58 2015 +0200
     196
     197    More typo fix
     198
     199 poppler/Catalog.cc | 2 +-
     200 1 file changed, 1 insertion(+), 1 deletion(-)
     201
     202commit 3b6b3fefe97b885e42966fece84a123fc4671b20
     203Author: William Bader <williambader@hotmail.com>
     204Date:   Fri Jul 17 00:37:46 2015 +0200
     205
     206    [Splash] Fix wrong writes on non rgb outputs
     207
     208    Bug #90570
     209
     210 poppler/SplashOutputDev.cc | 52
     211 +++++++++++++++++++++++++++++++++++++++++++++-
     212 1 file changed, 51 insertions(+), 1 deletion(-)
     213
     214commit 885b23bfd16a3e4970a52956493e92a160b2d0a8
     215Author: Dmytro Morgun <lztoad@gmail.com>
     216Date:   Fri Jul 17 00:30:08 2015 +0200
     217
     218    GlobalParamsWin bug/fixes
     219
     220    Bug #91053
     221
     222 poppler/GlobalParamsWin.cc | 57
     223 ++++++++++++++++++++++++++--------------------
     224 1 file changed, 32 insertions(+), 25 deletions(-)
     225
     226commit 0ce4da8ab16b4a5497688a6cf86175aaec0f585f
     227Author: Albert Astals Cid <aacid@kde.org>
     228Date:   Wed Jul 15 23:59:11 2015 +0200
     229
     230    Make sure pageRootRef is a ref before using it
     231
     232    Bug #91344
     233
     234 poppler/Catalog.cc | 32 ++++++++++++++++++--------------
     235 1 file changed, 18 insertions(+), 14 deletions(-)
     236
     237commit b71431513b45f8a1aa4154332dae56af241258f8
     238Author: Albert Astals Cid <aacid@kde.org>
     239Date:   Wed Jul 15 13:10:27 2015 +0200
     240
     241    Typo fix in warning
     242
     243 poppler/Catalog.cc | 2 +-
     244 1 file changed, 1 insertion(+), 1 deletion(-)
     245
     246commit ccd780f9504f5b077ea12370fd5380ff7da5cd23
     247Author: Dmytro Morgun <lztoad@gmail.com>
     248Date:   Wed Jul 15 00:26:55 2015 +0200
     249
     250    [Windows] remove ifndef
     251
     252 splash/SplashFontEngine.cc | 9 +--------
     253 1 file changed, 1 insertion(+), 8 deletions(-)
     254
     255commit 2ed8465074c4fc2c88f745b29bdae92410751327
     256Author: William Bader <williambader@hotmail.com>
     257Date:   Wed Jul 15 00:07:48 2015 +0200
     258
     259    Allow configuring SPLASH_CMYK support from cmake/configure
     260
     261    Bug #90795
     262
     263 CMakeLists.txt              | 4 ++++
     264 config.h.cmake              | 3 +++
     265 configure.ac                | 7 +++++++
     266 poppler/SplashOutputDev.cc  | 4 ++--
     267 qt4/src/poppler-document.cc | 3 ++-
     268 qt4/src/poppler-page.cc     | 4 ++--
     269 qt5/src/poppler-document.cc | 3 ++-
     270 qt5/src/poppler-page.cc     | 4 ++--
     271 splash/Splash.cc            | 2 +-
     272 splash/SplashBitmap.cc      | 4 ++--
     273 10 files changed, 27 insertions(+), 11 deletions(-)
     274
     275commit 334dc56f2f9adf4daa33c20ce034a5b1f8259baf
     276Author: Albert Astals Cid <aacid@kde.org>
     277Date:   Sun Jul 12 23:29:30 2015 +0200
     278
     279    [qt] KeepAlphaChannel -> IgnorePaperColor
     280
     281 qt4/src/poppler-page.cc | 13 ++++++-------
     282 qt4/src/poppler-qt4.h   |  4 ++--
     283 qt5/src/poppler-page.cc | 13 ++++++-------
     284 qt5/src/poppler-qt5.h   |  4 ++--
     285 4 files changed, 16 insertions(+), 18 deletions(-)
     286
     287commit 2a1363a4a3129fe4b5e4fae1018dc8919a2d796a
     288Author: Albert Astals Cid <aacid@kde.org>
     289Date:   Sun Jul 12 23:22:32 2015 +0200
     290
     291    Update (C)
     292
     293 splash/SplashBitmap.cc | 1 +
     294 splash/SplashBitmap.h  | 1 +
     295 2 files changed, 2 insertions(+)
     296
     297commit e903b2364f55c4f6417d826ab85dcb60cd240563
     298Author: Albert Astals Cid <aacid@kde.org>
     299Date:   Sun Jul 12 23:20:20 2015 +0200
     300
     301    [qt] fix spacing in header
     302
     303 qt4/src/poppler-qt4.h | 4 ++--
     304 qt5/src/poppler-qt5.h | 4 ++--
     305 2 files changed, 4 insertions(+), 4 deletions(-)
     306
     307commit 810c659faea542c3bd6e9c48c9a7c60b886a9269
     308Author: Adam Reichold <adam.reichold@t-online.de>
     309Date:   Fri Jul 3 00:31:56 2015 +0200
     310
     311    Switch default image format of Qt frontends
     312
     313    This changes the Poppler::Page::renderToImage method w.r.t. to
     314    the image
     315    formats used to render using Splash, i.e. the default will be RGB8. If
     316    overprint preview is requested, DeviceN8 will be used and converted to
     317    XBGR8 for display. If the internal alpha channel is requested,
     318    XBGR8 will
     319    be used and augmented by Splash's separate alpha channel.
     320
     321    This yields some improvements w.r.t. to rendering including alpha
     322    blending
     323    with the paper colour, i.e. synthetic benchmarks using structurally
     324    simple
     325    documents yield more than two percent improvement.
     326
     327 qt4/src/poppler-page.cc | 115
     328 +++++++++++++++++++++++++++++-------------------
     329 qt5/src/poppler-page.cc | 114
     330 ++++++++++++++++++++++++++++-------------------
     331 2 files changed, 138 insertions(+), 91 deletions(-)
     332
     333commit 8fea54e48ec9ba35122c565f761e7e7f016a34f9
     334Author: Adam Reichold <adam.reichold@t-online.de>
     335Date:   Thu Jul 2 21:08:38 2015 +0200
     336
     337    Improve efficiency of Poppler::Page::renderToImage
     338
     339    Improves the efficiency of rendering into a QImage using
     340    the Splash output device by removing a copy of the raw bitmap data
     341    since Qt5 will properly free this data using a function supplied
     342    during construction, i.e. in this case gfree.
     343
     344    This improves performance in synthentic rendering benchmarks
     345    by approximately four percent and reduces the maximum working
     346    set size.
     347
     348 qt5/src/poppler-page.cc | 7 +++----
     349 1 file changed, 3 insertions(+), 4 deletions(-)
     350
     351commit 09db5a71fff4b7a0ed1d5d7e76c8270e2f6e9a8d
     352Author: Adam Reichold <adam.reichold@t-online.de>
     353Date:   Thu Jul 2 21:02:59 2015 +0200
     354
     355    Add KeepAlphaChannel render flag to Qt frontends
     356
     357    Adds a new render flag which will indicate that the image return by
     358    Poppler::Page::renderToImage will not be opaque and alpha blended with
     359    the paper colour, but retain its actually background transparency.
     360
     361    This improves performance in synthentic rendering benchmarks by almost
     362    five percent and the additional alpha blending that is then done
     363    by the
     364    consuming application is often a hardware-accellerated operation.
     365
     366 qt4/src/poppler-page.cc | 6 ++++--
     367 qt4/src/poppler-qt4.h   | 3 ++-
     368 qt5/src/poppler-page.cc | 6 ++++--
     369 qt5/src/poppler-qt5.h   | 3 ++-
     370 4 files changed, 12 insertions(+), 6 deletions(-)
     371
     372commit d604a075c6b171d5c3fe26c146d3469c4bc0af3f
     373Author: Adam Reichold <adam.reichold@t-online.de>
     374Date:   Thu Jul 2 21:00:16 2015 +0200
     375
     376    Make SplashBitmap XBGR transfer alpha channel
     377
     378    Adds an option to SplashBitmap::convertToXBGR and
     379    SplashBitmap::getXBGRLine
     380    so that both optionally transfer Splash's internal alpha channel
     381    into the
     382    fourth component of the resulting bitmap data.
     383
     384 splash/SplashBitmap.cc | 27 ++++++++++++++++++++++-----
     385 splash/SplashBitmap.h  |  4 ++--
     386 2 files changed, 24 insertions(+), 7 deletions(-)
     387
     388commit 17adfc848f99a5c5bfad35c94289ccf03fba1a16
     389Author: Adam Reichold <adamreichold@myopera.com>
     390Date:   Sun Jul 12 17:05:24 2015 +0200
     391
     392    Adjust memory layout computation of GooString
     393
     394    GooString uses the small string optimization but the static buffer
     395    size is
     396    hard-coded and hence the final object size becomes dependent on
     397    architecture.
     398    This adds a helper class to compute the memory layout at compile
     399    time so that
     400    the target object size of e.g. 32 or another multiple of 16 is
     401    achieved.
     402
     403    This also adds an overload so that the C string returned by
     404    GooString's
     405    getCString method respect the constness of this and fixes a constness
     406    issue
     407    in the lexer tests.
     408
     409 goo/GooString.h           | 24 ++++++++++++++++--------
     410 qt4/tests/check_lexer.cpp |  2 +-
     411 qt5/tests/check_lexer.cpp |  2 +-
     412 3 files changed, 18 insertions(+), 10 deletions(-)
     413
     414commit d1720740f3381f489f1ee83ce1ce53e73aafd537
     415Author: Albert Astals Cid <aacid@kde.org>
     416Date:   Wed Jul 8 23:22:13 2015 +0200
     417
     418    Poppler 0.34
     419
     420 CMakeLists.txt      |  4 ++--
     421 NEWS                | 13 +++++++++++++
     422 configure.ac        |  2 +-
     423 poppler/Makefile.am |  2 +-
     424 qt4/src/Doxyfile    |  2 +-
     425 qt5/src/Doxyfile    |  2 +-
     426 6 files changed, 19 insertions(+), 6 deletions(-)
     427
     428commit 2fc1f540754391ffa87d7fe9f3438e134d821207
     429Author: Thomas Freitag <Thomas.Freitag@alfa.de>
     430Date:   Tue Jul 7 18:48:51 2015 +0200
     431
     432    [Splash] Fix crash in PDF with nested softmasks
     433
     434    Bug #91240
     435
     436 poppler/SplashOutputDev.cc | 20 ++++++++++++--------
     437 1 file changed, 12 insertions(+), 8 deletions(-)
     438
     439commit 0b8919f19dd501c9962bca05c9b0559464e923c3
     440Author: Dmytro Morgun <lztoad@gmail.com>
     441Date:   Mon Jul 6 00:28:27 2015 +0200
     442
     443    Fix pedantic memory leak
     444
     445 poppler/StructElement.cc | 15 +++++++++++++++
     446 1 file changed, 15 insertions(+)
     447
     448commit 2ef22af960d3d800087209fea047009a8419134c
     449Author: Albert Astals Cid <aacid@kde.org>
     450Date:   Sun Jul 5 16:03:57 2015 +0200
     451
     452    [cmake] Make sure ENABLE_LIBOPENJPEG is either 0 or 1
     453
     454    Otherwise if it was auto it gets translated to 1 for the cmakedefine
     455    boolean
     456    which is wrong when the auto ends up meaning "i din't find it"
     457
     458 CMakeLists.txt | 2 ++
     459 1 file changed, 2 insertions(+)
     460
     461commit 50455bcf4f1644060b2187d4e60c3798793041cc
     462Author: Tamas Szekeres <szekerest@gmail.com>
     463Date:   Fri Jul 3 20:24:01 2015 +0200
     464
     465    std::max/min need <algorithm>
     466
     467    Bug #88511
     468
     469 cpp/poppler-font.cpp       | 3 +++
     470 cpp/poppler-global.cpp     | 3 +++
     471 poppler/Annot.cc           | 2 ++
     472 poppler/SplashOutputDev.cc | 2 ++
     473 4 files changed, 10 insertions(+)
     474
     475commit 346fc70dbf2803e23e70b093401aa2cda216492b
     476Author: Albert Astals Cid <aacid@kde.org>
     477Date:   Fri Jul 3 20:19:01 2015 +0200
     478
     479    Forgot the (C)
     480
     481 poppler/PSOutputDev.cc | 1 +
     482 1 file changed, 1 insertion(+)
     483
     484commit df09c1a84dfe80d2e6cfde3308c79da5b2ea7428
     485Author: Marek Kasik <mkasik@redhat.com>
     486Date:   Fri Jul 3 20:14:23 2015 +0200
     487
     488    Embed Type1 fonts to PostScript files correctly
     489
     490    Remove PFB headers from embedded Type1 fonts
     491    before embedding them into a PostScript file.
     492
     493    Bug #19747
     494
     495 poppler/PSOutputDev.cc | 57
     496 +++++++++++++++++++++++++++++++++++++++++++-------
     497 1 file changed, 50 insertions(+), 7 deletions(-)
     498
     499commit 11f117cc71641b89783b207232171f850a2b64ff
     500Author: Carlos Garcia Campos <carlosgc@gnome.org>
     501Date:   Thu Jun 4 10:51:36 2015 +0200
     502
     503    regtest: Disable pretty diffs for text files in HTML reports
     504
     505    difflib is entering in an infinite loop with some files, so disable it
     506    for now. We need to either fix that somehow or find a different way to
     507    generate pretty diffs of text files.
     508
     509 regtest/HTMLReport.py | 7 +++++--
     510 1 file changed, 5 insertions(+), 2 deletions(-)
     511
     512commit 3db4cb6f07229e26405bfb512c626a272f6351f5
     513Author: Thomas Freitag <Thomas.Freitag@alfa.de>
     514Date:   Sun May 24 18:41:30 2015 +0200
     515
     516    Splash: Speed up of rendering icc based images
     517
     518    Bug #90171
     519
     520 poppler/SplashOutputDev.cc | 142
     521 +++++++++++++++++++++++++++++++++++++++++++--
     522 poppler/SplashOutputDev.h  |   8 ++-
     523 splash/Splash.cc           |  17 ++++--
     524 splash/Splash.h            |   9 ++-
     525 4 files changed, 163 insertions(+), 13 deletions(-)
     526
     527commit c50720dcc9e15516e0e19072c0df03fbdee63dec
     528Author: Adrian Johnson <ajohnson@redneon.com>
     529Date:   Fri May 22 21:44:55 2015 +0930
     530
     531    glib: update new symbols section
     532
     533 glib/reference/poppler-docs.sgml | 8 ++++++++
     534 1 file changed, 8 insertions(+)
     535
     536commit b271a19ec30b20bc11f2240ae6b96672e3cafafb
     537Author: Albert Astals Cid <aacid@kde.org>
     538Date:   Thu May 14 21:56:47 2015 +0200
     539
     540    Poppler 0.33
     541
     542 CMakeLists.txt      |  4 ++--
     543 NEWS                | 25 +++++++++++++++++++++++++
     544 configure.ac        |  2 +-
     545 cpp/Doxyfile        |  2 +-
     546 glib/CMakeLists.txt |  2 +-
     547 glib/Makefile.am    |  2 +-
     548 poppler/Makefile.am |  2 +-
     549 qt4/src/Doxyfile    |  2 +-
     550 qt5/src/Doxyfile    |  2 +-
     551 9 files changed, 34 insertions(+), 9 deletions(-)
     552
    1553commit 2b2fb719aa5ffe32fbc3fb500444b1643b1c6099
    2554Author: Albert Astals Cid <aacid@kde.org>

  • TabularUnified poppler/vendor/current/NEWS

    r1150 r1159  
     1Release 0.35.0
     2        core:
     3         * Fix assert in broken file. Bug #91344
     4         * Adjust memory layout computation of GooString
     5         * Make SplashBitmap XBGR transfer alpha channel
     6         * Splash: Fix wrong writes on non rgb outputs. Bug #90570
     7         * Splash: remove ifndef in Windows code
     8         * GlobalParamsWin bugfixes. Bug #91053
     9
     10        qt4:
     11         * Switch default image format
     12         * Add IgnorePaperColor render flag
     13
     14        qt5:
     15         * Improve efficiency of Poppler::Page::renderToImage
     16         * Switch default image format
     17         * Add IgnorePaperColor render flag
     18
     19        build system:
     20         * Allow configuring SPLASH_CMYK support
     21         * Add configure --enable-build-type. Bug #90796
     22
     23        glib:
     24         * Explicitly link against pthread
     25         * Deprecation fixes
     26
     27        utils:
     28         * pdftocairo: Fix cast to pointer from integer of different size on win64
     29
     30Release 0.34.0
     31        core:
     32         * Splash: Fix crash in PDF with nested softmasks. Bug #91240
     33         * Splash: Speed up of rendering icc based images. Bug #90171
     34         * PSOutputDev: Embed Type1 fonts to PostScript files correctly. Bug #19747
     35         * Fix pedantic memory leak
     36
     37        glib:
     38         * update new symbols section
     39
     40        build system:
     41         * cmake: Make sure ENABLE_LIBOPENJPEG is either 0 or 1
     42
    143Release 0.33.0
    244        core:

  • TabularUnified poppler/vendor/current/config.h.cmake

    r937 r1159  
    174174/* Support for curl based doc builder is compiled in. */
    175175#cmakedefine POPPLER_HAS_CURL_SUPPORT 1
     176
     177/* Include support for CMYK rasterization */
     178#cmakedefine SPLASH_CMYK 1
    176179
    177180/* Define to 1 if you have the ANSI C header files. */

  • TabularUnified poppler/vendor/current/config.h.in

    r1019 r1159  
    197197   your system. */
    198198#undef PTHREAD_CREATE_JOINABLE
     199
     200/* Include support for CMYK rasterization */
     201#undef SPLASH_CMYK
    199202
    200203/* Define to 1 if you have the ANSI C header files. */

  • TabularUnified poppler/vendor/current/configure

    r1151 r1159  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for poppler 0.33.0.
     3# Generated by GNU Autoconf 2.69 for poppler 0.35.0.
    44#
    55# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>.
    … …  
    592592PACKAGE_NAME='poppler'
    593593PACKAGE_TARNAME='poppler'
    594 PACKAGE_VERSION='0.33.0'
    595 PACKAGE_STRING='poppler 0.33.0'
     594PACKAGE_VERSION='0.35.0'
     595PACKAGE_STRING='poppler 0.35.0'
    596596PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler'
    597597PACKAGE_URL=''
    … …  
    909909enable_libtool_lock
    910910enable_xpdf_headers
     911enable_build_type
    911912enable_single_precision
    912913enable_fixedpoint
     914enable_cmyk
    913915enable_relocatable
    914916with_x
    … …  
    15291531  # This message is too long to be a string in the A/UX 3.1 sh.
    15301532  cat <<_ACEOF
    1531 \`configure' configures poppler 0.33.0 to adapt to many kinds of systems.
     1533\`configure' configures poppler 0.35.0 to adapt to many kinds of systems.
    15321534
    15331535Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    16031605if test -n "$ac_init_help"; then
    16041606  case $ac_init_help in
    1605      short | recursive ) echo "Configuration of poppler 0.33.0:";;
     1607     short | recursive ) echo "Configuration of poppler 0.35.0:";;
    16061608   esac
    16071609  cat <<\_ACEOF
    … …  
    16231625  --disable-libtool-lock  avoid locking (might break parallel builds)
    16241626  --enable-xpdf-headers   Install unsupported xpdf headers.
     1627  --enable-build-type=[relwithdebinfo/release/debug/debugfull/profile]
     1628                          Build with options similar to 'cmake
     1629                          -DCMAKE_BUILD_TYPE=' values.
    16251630  --enable-single-precision     use single precision arithmetic (instead of double precision) in the Splash backend
    16261631  --enable-fixedpoint     use fixed point (instead of double precision) arithmetic in the Splash backend
     1632  --enable-cmyk           Include support for CMYK rasterization
    16271633  --disable-relocatable   Hardcode the poppler library location (on Windows).
    16281634  --enable-libopenjpeg=[auto/openjpeg1/openjpeg2/none]
    … …  
    18191825if $ac_init_version; then
    18201826  cat <<\_ACEOF
    1821 poppler configure 0.33.0
     1827poppler configure 0.35.0
    18221828generated by GNU Autoconf 2.69
    18231829
    … …  
    25132519running configure, to aid debugging if configure makes a mistake.
    25142520
    2515 It was created by poppler $as_me 0.33.0, which was
     2521It was created by poppler $as_me 0.35.0, which was
    25162522generated by GNU Autoconf 2.69.  Invocation command line was
    25172523
    … …  
    33773383# Define the identity of the package.
    33783384 PACKAGE='poppler'
    3379  VERSION='0.33.0'
     3385 VERSION='0.35.0'
    33803386
    33813387
    … …  
    1777317779
    1777417780cat >>confdefs.h <<_ACEOF
    17775 #define POPPLER_VERSION "0.33.0"
     17781#define POPPLER_VERSION "0.35.0"
    1777617782_ACEOF
    1777717783
    … …  
    1823718243
    1823818244
     18245
     18246# Check whether --enable-build-type was given.
     18247if test "${enable_build_type+set}" = set; then :
     18248  enableval=$enable_build_type; enable_build_type=no;
     18249              case "$enableval" in
     18250              relwithdebinfo|release|debug|debugfull|profile) enable_build_type="$enableval" ;;
     18251              *) as_fn_error $? "bad value $enableval for --enable-build-type option.
     18252                               Options are relwithdebinfo, release, debug, debugfull, and profile." "$LINENO" 5 ;;
     18253              esac
     18254else
     18255  enable_build_type=no
     18256fi
     18257
     18258
     18259if test "x$GCC" = "xyes"; then
     18260    case "$enable_build_type" in
     18261    relwithdebinfo)
     18262        CFLAGS="-O2 -g $CFLAGS"
     18263        CXXFLAGS="-O2 -g $CXXFLAGS"
     18264        ;;
     18265    release)
     18266        CFLAGS="-O2 $CFLAGS -g0 -DNDEBUG"
     18267        CXXFLAGS="-O2 $CXXFLAGS -g0 -DNDEBUG"
     18268        ;;
     18269    debug)
     18270        CFLAGS="-O2 -g $CFLAGS -fno-reorder-blocks -fno-schedule-insns -fno-inline"
     18271        CXXFLAGS="-O2 -g $CXXFLAGS -fno-reorder-blocks -fno-schedule-insns -fno-inline"
     18272        ;;
     18273    debugfull)
     18274        CFLAGS="$CFLAGS -g3 -fno-inline"
     18275        CXXFLAGS="$CXXFLAGS -g3 -fno-inline"
     18276        ;;
     18277    profile)
     18278        CFLAGS="$CFLAGS -g3 -fno-inline -ftest-coverage -fprofile-arcs"
     18279        CXXFLAGS="$CXXFLAGS -g3 -fno-inline -ftest-coverage -fprofile-arcs"
     18280        LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage -lgcov"
     18281        ;;
     18282    *)
     18283        enable_build_type=no
     18284        ;;
     18285    esac
     18286else
     18287    case "$enable_build_type" in
     18288    relwithdebinfo|release|debug|debugfull|profile)
     18289        echo "  Warning: --enable-build-type ignored for non-gcc compiler."
     18290        ;;
     18291    esac
     18292    enable_build_type=no
     18293fi
     18294
    1823918295# Check whether --enable-single-precision was given.
    1824018296if test "${enable_single_precision+set}" = set; then :
    … …  
    1824918305  enableval=$enable_fixedpoint;
    1825018306$as_echo "#define USE_FIXEDPOINT 1" >>confdefs.h
     18307
     18308fi
     18309
     18310
     18311# Check whether --enable-cmyk was given.
     18312if test "${enable_cmyk+set}" = set; then :
     18313  enableval=$enable_cmyk;
     18314$as_echo "#define SPLASH_CMYK 1" >>confdefs.h
    1825118315
    1825218316fi
    … …  
    2496725031POPPLER_MAJOR_VERSION=0
    2496825032
    24969 POPPLER_MINOR_VERSION=33
     25033POPPLER_MINOR_VERSION=35
    2497025034
    2497125035POPPLER_MICRO_VERSION=0
    2497225036
    24973 POPPLER_VERSION=0.33.0
     25037POPPLER_VERSION=0.35.0
    2497425038
    2497525039
    … …  
    2562325687# values after options handling.
    2562425688ac_log="
    25625 This file was extended by poppler $as_me 0.33.0, which was
     25689This file was extended by poppler $as_me 0.35.0, which was
    2562625690generated by GNU Autoconf 2.69.  Invocation command line was
    2562725691
    … …  
    2568925753ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    2569025754ac_cs_version="\\
    25691 poppler config.status 0.33.0
     25755poppler config.status 0.35.0
    2569225756configured by $0, generated by GNU Autoconf 2.69,
    2569325757  with options \\"\$ac_cs_config\\"
    … …  
    2777527839echo "  font configuration: $with_font_configuration"
    2777627840echo "  splash output:      $enable_splash_output"
     27841if test x$enable_cmyk = xyes;then
     27842        echo "      with CMYK support"
     27843fi
    2777727844echo "  cairo output:       $use_cairo"
    2777827845echo "  qt4 wrapper:        $enable_poppler_qt4"
    … …  
    2780327870    fi
    2780427871fi
     27872if test x$enable_build_type != xno;then
     27873        echo "  build type:         $enable_build_type"
     27874fi
    2780527875echo "  command line utils: $enable_utils"
    2780627876echo "  test data dir:      $TESTDATADIR"

  • TabularUnified poppler/vendor/current/configure.ac

    r1150 r1159  
    11m4_define([poppler_version_major],[0])
    2 m4_define([poppler_version_minor],[33])
     2m4_define([poppler_version_minor],[35])
    33m4_define([poppler_version_micro],[0])
    44m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
    … …  
    7272AM_CONDITIONAL(ENABLE_XPDF_HEADERS, test x$enable_xpdf_headers = xyes)
    7373
     74dnl ##### Emulate cmake -DCMAKE_BUILD_TYPE=Release using options from cmake/modules/PopplerMacros.cmake
     75
     76AC_ARG_ENABLE(build-type,
     77              AC_HELP_STRING([--enable-build-type=@<:@relwithdebinfo/release/debug/debugfull/profile@:>@],
     78                             [Build with options similar to 'cmake -DCMAKE_BUILD_TYPE=' values.]),
     79              [enable_build_type=no;
     80              case "$enableval" in
     81              relwithdebinfo|release|debug|debugfull|profile) enable_build_type="$enableval" ;;
     82              *) AC_MSG_ERROR([bad value $enableval for --enable-build-type option.
     83                               Options are relwithdebinfo, release, debug, debugfull, and profile.]) ;;
     84              esac],
     85              enable_build_type=no)
     86
     87if test "x$GCC" = "xyes"; then
     88    case "$enable_build_type" in
     89    relwithdebinfo)
     90        CFLAGS="-O2 -g $CFLAGS"
     91        CXXFLAGS="-O2 -g $CXXFLAGS"
     92        ;;
     93    release)
     94        CFLAGS="-O2 $CFLAGS -g0 -DNDEBUG"
     95        CXXFLAGS="-O2 $CXXFLAGS -g0 -DNDEBUG"
     96        ;;
     97    debug)
     98        CFLAGS="-O2 -g $CFLAGS -fno-reorder-blocks -fno-schedule-insns -fno-inline"
     99        CXXFLAGS="-O2 -g $CXXFLAGS -fno-reorder-blocks -fno-schedule-insns -fno-inline"
     100        ;;
     101    debugfull)
     102        CFLAGS="$CFLAGS -g3 -fno-inline"
     103        CXXFLAGS="$CXXFLAGS -g3 -fno-inline"
     104        ;;
     105    profile)
     106        CFLAGS="$CFLAGS -g3 -fno-inline -ftest-coverage -fprofile-arcs"
     107        CXXFLAGS="$CXXFLAGS -g3 -fno-inline -ftest-coverage -fprofile-arcs"
     108        LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage -lgcov"
     109        ;;
     110    *)
     111        enable_build_type=no
     112        ;;
     113    esac
     114else
     115    case "$enable_build_type" in
     116    relwithdebinfo|release|debug|debugfull|profile)
     117        echo "  Warning: --enable-build-type ignored for non-gcc compiler."
     118        ;;
     119    esac
     120    enable_build_type=no
     121fi
     122
    74123AC_ARG_ENABLE(single-precision,
    75124[  --enable-single-precision     use single precision arithmetic (instead of double precision) in the Splash backend],
    … …  
    79128[  --enable-fixedpoint     use fixed point (instead of double precision) arithmetic in the Splash backend],
    80129AC_DEFINE(USE_FIXEDPOINT, [1], [Use fixed point arithmetic in the Splash backend]))
     130
     131AC_ARG_ENABLE(cmyk,
     132[  --enable-cmyk           Include support for CMYK rasterization],
     133AC_DEFINE(SPLASH_CMYK, [1], [Include support for CMYK rasterization]))
    81134
    82135dnl Relocation support
    … …  
    939992echo "  font configuration: $with_font_configuration"
    940993echo "  splash output:      $enable_splash_output"
     994if test x$enable_cmyk = xyes;then
     995        echo "      with CMYK support"
     996fi
    941997echo "  cairo output:       $use_cairo"
    942998echo "  qt4 wrapper:        $enable_poppler_qt4"
    … …  
    9671023    fi
    9681024fi
     1025if test x$enable_build_type != xno;then
     1026        echo "  build type:         $enable_build_type"
     1027fi
    9691028echo "  command line utils: $enable_utils"
    9701029echo "  test data dir:      $TESTDATADIR"

  • TabularUnified poppler/vendor/current/cpp/poppler-font.cpp

    r721 r1159  
    11/*
    22 * Copyright (C) 2009, Pino Toscano <pino@kde.org>
     3 * Copyright (C) 2015, Tamas Szekeres <szekerest@gmail.com>
    34 *
    45 * This program is free software; you can redistribute it and/or modify
    … …  
    2324#include "FontInfo.h"
    2425
     26#include <algorithm>
     27
    2528using namespace poppler;
    2629

  • TabularUnified poppler/vendor/current/cpp/poppler-global.cpp

    r1019 r1159  
    33 * Copyright (C) 2010, Hib Eris <hib@hiberis.nl>
    44 * Copyright (C) 2014, Hans-Peter Deifel <hpdeifel@gmx.de>
     5 * Copyright (C) 2015, Tamas Szekeres <szekerest@gmail.com>
    56 *
    67 * This program is free software; you can redistribute it and/or modify
    … …  
    2223
    2324#include "poppler-private.h"
     25
     26#include <algorithm>
    2427
    2528#include <cerrno>

  • TabularUnified poppler/vendor/current/cpp/poppler-version.h

    r1150 r1159  
    2222#include "poppler-global.h"
    2323
    24 #define POPPLER_VERSION "0.33.0"
     24#define POPPLER_VERSION "0.35.0"
    2525#define POPPLER_VERSION_MAJOR 0
    26 #define POPPLER_VERSION_MINOR 33
     26#define POPPLER_VERSION_MINOR 35
    2727#define POPPLER_VERSION_MICRO 0
    2828

  • TabularUnified poppler/vendor/current/glib/Makefile.am

    r1150 r1159  
    7878        $(top_builddir)/poppler/libpoppler.la           \
    7979        $(top_builddir)/poppler/libpoppler-cairo.la     \
     80        $(PTHREAD_LIBS)                                 \
    8081        $(POPPLER_GLIB_LIBS)                            \
    8182        $(FREETYPE_LIBS)

  • TabularUnified poppler/vendor/current/glib/Makefile.in

    r1150 r1159  
    137137        $(top_builddir)/poppler/libpoppler.la \
    138138        $(top_builddir)/poppler/libpoppler-cairo.la \
    139         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
     139        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
     140        $(am__DEPENDENCIES_1)
    140141am__objects_1 = libpoppler_glib_la-poppler-enums.lo
    141142am_libpoppler_glib_la_OBJECTS = $(am__objects_1) \
    … …  
    556557        $(top_builddir)/poppler/libpoppler.la           \
    557558        $(top_builddir)/poppler/libpoppler-cairo.la     \
     559        $(PTHREAD_LIBS)                                 \
    558560        $(POPPLER_GLIB_LIBS)                            \
    559561        $(FREETYPE_LIBS)

  • TabularUnified poppler/vendor/current/glib/demo/annots.c

    r937 r1159  
    459459                         PgdAnnotsDemo *demo)
    460460{
    461 #if GTK_CHECK_VERSION(3,4,0)
    462461    gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &demo->annot_color);
    463 #else
    464     gtk_color_button_get_rgba (GTK_COLOR_BUTTON (button), &demo->annot_color);
    465 #endif
    466462}
    467463
    … …  
    620616                          PopplerAnnot  *annot)
    621617{
    622     GtkWidget  *alignment;
    623618    GtkWidget  *table;
    624619    gint        row = 0;
    … …  
    627622    PopplerRectangle rect;
    628623
    629     alignment = gtk_bin_get_child (GTK_BIN (demo->annot_view));
    630     if (alignment) {
    631         gtk_container_remove (GTK_CONTAINER (demo->annot_view), alignment);
    632     }
    633 
    634     alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
    635     gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 8, 5);
    636     gtk_container_add (GTK_CONTAINER (demo->annot_view), alignment);
    637     gtk_widget_show (alignment);
     624    table = gtk_bin_get_child (GTK_BIN (demo->annot_view));
     625    if (table) {
     626        gtk_container_remove (GTK_CONTAINER (demo->annot_view), table);
     627    }
    638628
    639629    if (!annot)
    … …  
    641631
    642632    table = gtk_grid_new ();
     633    gtk_widget_set_margin_top (table, 5);
     634    gtk_widget_set_margin_bottom (table, 5);
     635#if GTK_CHECK_VERSION(3, 12, 0)
     636    gtk_widget_set_margin_start (table, 8);
     637    gtk_widget_set_margin_end (table, 5);
     638#else
     639    gtk_widget_set_margin_left (table, 8);
     640    gtk_widget_set_margin_right (table, 5);
     641#endif
    643642    gtk_grid_set_column_spacing (GTK_GRID (table), 6);
    644643    gtk_grid_set_row_spacing (GTK_GRID (table), 6);
    … …  
    695694    }
    696695
    697     gtk_container_add (GTK_CONTAINER (alignment), table);
     696    gtk_container_add (GTK_CONTAINER (demo->annot_view), table);
    698697    gtk_widget_show (table);
    699698}
    … …  
    13341333    demo->annot_color.red = 65535;
    13351334    demo->annot_color.alpha = 1.0;
    1336 #if GTK_CHECK_VERSION(3,4,0)
    13371335    gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (button), &demo->annot_color);
    1338 #else
    1339     gtk_color_button_set_rgba (GTK_COLOR_BUTTON (button), &demo->annot_color);
    1340 #endif
    13411336    g_signal_connect (button, "notify::color",
    13421337                      G_CALLBACK (pgd_annot_color_changed),

  • TabularUnified poppler/vendor/current/glib/demo/attachments.c

    r937 r1159  
    8383        treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
    8484        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), TRUE);
    85         gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
    8685
    8786        renderer = gtk_cell_renderer_text_new ();

  • TabularUnified poppler/vendor/current/glib/demo/find.c

    r660 r1159  
    454454        g_object_unref (model);
    455455        demo->treeview = treeview;
    456         gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
    457456        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
    458457        gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);

  • TabularUnified poppler/vendor/current/glib/demo/fonts.c

    r591 r1159  
    256256        demo->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
    257257        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (demo->treeview), FALSE);
    258         gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (demo->treeview), TRUE);
    259258        gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (demo->treeview)),
    260259                                     GTK_SELECTION_NONE);

  • TabularUnified poppler/vendor/current/glib/demo/forms.c

    r591 r1159  
    130130                               PopplerFormField *field)
    131131{
    132         GtkWidget     *alignment;
    133132        GtkWidget     *table;
    134133        PopplerAction *action;
    … …  
    137136        gint           row = 0;
    138137
    139         alignment = gtk_bin_get_child (GTK_BIN (field_view));
    140         if (alignment) {
    141                 gtk_container_remove (GTK_CONTAINER (field_view), alignment);
    142         }
    143        
    144         alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
    145         gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 12, 5);
    146         gtk_container_add (GTK_CONTAINER (field_view), alignment);
    147         gtk_widget_show (alignment);
     138        table = gtk_bin_get_child (GTK_BIN (field_view));
     139        if (table) {
     140                gtk_container_remove (GTK_CONTAINER (field_view), table);
     141        }
    148142
    149143        if (!field)
    … …  
    151145
    152146        table = gtk_grid_new ();
     147        gtk_widget_set_margin_top (table, 5);
     148        gtk_widget_set_margin_bottom (table, 5);
     149#if GTK_CHECK_VERSION(3, 12, 0)
     150        gtk_widget_set_margin_start (table, 12);
     151        gtk_widget_set_margin_end (table, 5);
     152#else
     153        gtk_widget_set_margin_left (table, 12);
     154        gtk_widget_set_margin_right (table, 5);
     155#endif
    153156        gtk_grid_set_column_spacing (GTK_GRID (table), 6);
    154157        gtk_grid_set_row_spacing (GTK_GRID (table), 6);
    … …  
    252255        }
    253256
    254         gtk_container_add (GTK_CONTAINER (alignment), table);
     257        gtk_container_add (GTK_CONTAINER (field_view), table);
    255258        gtk_widget_show (table);
    256259}

  • TabularUnified poppler/vendor/current/glib/demo/info.cc

    r591 r1159  
    144144        GtkWidget *vbox;
    145145        GtkWidget *label;
    146         GtkWidget *frame, *alignment, *table;
     146        GtkWidget *frame, *table;
    147147        gchar     *str;
    148148        gchar     *title, *format, *author, *subject;
    … …  
    197197        gtk_frame_set_label_widget (GTK_FRAME (frame), label);
    198198        gtk_widget_show (label);
    199        
    200         alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
    201         gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 12, 5);
    202         gtk_container_add (GTK_CONTAINER (frame), alignment);
    203         gtk_widget_show (alignment);
    204199
    205200        table = gtk_grid_new ();
     201        gtk_widget_set_margin_top (table, 5);
     202        gtk_widget_set_margin_bottom (table, 5);
     203#if GTK_CHECK_VERSION(3, 12, 0)
     204        gtk_widget_set_margin_start (table, 12);
     205        gtk_widget_set_margin_end (table, 5);
     206#else
     207        gtk_widget_set_margin_left (table, 12);
     208        gtk_widget_set_margin_right (table, 5);
     209#endif
    206210        gtk_grid_set_column_spacing (GTK_GRID (table), 6);
    207211        gtk_grid_set_row_spacing (GTK_GRID (table), 6);
    … …  
    262266        /* TODO: view_prefs */
    263267
    264         gtk_container_add (GTK_CONTAINER (alignment), table);
     268        gtk_container_add (GTK_CONTAINER (frame), table);
    265269        gtk_widget_show (table);
    266270

  • TabularUnified poppler/vendor/current/glib/demo/main.c

    r937 r1159  
    171171        GtkDialog *dialog;
    172172        GtkWidget *content_area;
    173         GtkWidget *entry_container;
    174173        GtkWidget *password_entry;
    175174        GtkWidget *hbox, *main_vbox, *vbox, *icon;
    … …  
    197196        gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
    198197                                           GTK_RESPONSE_OK, FALSE);
    199         gtk_dialog_set_alternative_button_order (dialog,
    200                                                  GTK_RESPONSE_OK,
    201                                                  GTK_RESPONSE_CANCEL,
    202                                                  -1);
    203198
    204199        /* Build contents */
    … …  
    210205        icon = gtk_image_new_from_icon_name ("dialog-password",
    211206                                         GTK_ICON_SIZE_DIALOG);
    212 
    213         gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0);
     207        gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
     208        gtk_widget_set_valign (icon, GTK_ALIGN_START);
    214209        gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
    215210        gtk_widget_show (icon);
    … …  
    220215
    221216        label = gtk_label_new (NULL);
     217#if GTK_CHECK_VERSION(3, 15, 0)
     218        gtk_label_set_xalign (GTK_LABEL (label), 0.0);
     219        gtk_label_set_yalign (GTK_LABEL (label), 0.5);
     220#else
    222221        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     222#endif
    223223        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
    224224        file_name = g_file_get_basename (uri_file);
    … …  
    240240
    241241        /* The table that holds the entries */
    242         entry_container = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
    243 
    244         gtk_alignment_set_padding (GTK_ALIGNMENT (entry_container),
    245                                    0, 0, 0, 0);
    246 
    247         gtk_box_pack_start (GTK_BOX (vbox), entry_container,
    248                             FALSE, FALSE, 0);
    249         gtk_widget_show (entry_container);
    250 
    251242        table = gtk_grid_new ();
    252243        gtk_grid_set_column_spacing (GTK_GRID (table), 12);
    253244        gtk_grid_set_row_spacing (GTK_GRID (table), 6);
    254         gtk_container_add (GTK_CONTAINER (entry_container), table);
     245        gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
    255246        gtk_widget_show (table);
    256247
    257248        label = gtk_label_new_with_mnemonic ("_Password:");
     249#if GTK_CHECK_VERSION(3, 15, 0)
     250        gtk_label_set_xalign (GTK_LABEL (label), 0.0);
     251        gtk_label_set_yalign (GTK_LABEL (label), 0.5);
     252#else
    258253        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     254#endif
    259255
    260256        password_entry = gtk_entry_new ();

  • TabularUnified poppler/vendor/current/glib/demo/page.c

    r937 r1159  
    216216        GtkWidget   *hbox, *page_selector;
    217217        GtkWidget   *button;
    218         GtkWidget   *frame, *alignment;
     218        GtkWidget   *frame;
    219219        GtkWidget   *table;
    220220        GtkWidget   *label;
    … …  
    270270        gtk_widget_show (label);
    271271
    272         alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
    273         gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 12, 5);
    274         gtk_container_add (GTK_CONTAINER (frame), alignment);
    275         gtk_widget_show (alignment);
    276 
    277272        table = gtk_grid_new ();
     273        gtk_widget_set_margin_top (table, 5);
     274        gtk_widget_set_margin_bottom (table, 5);
     275#if GTK_CHECK_VERSION(3, 12, 0)
     276        gtk_widget_set_margin_start (table, 12);
     277        gtk_widget_set_margin_end (table, 5);
     278#else
     279        gtk_widget_set_margin_left (table, 12);
     280        gtk_widget_set_margin_right (table, 5);
     281#endif
    278282        gtk_grid_set_column_spacing (GTK_GRID (table), 6);
    279283        gtk_grid_set_row_spacing (GTK_GRID (table), 6);
    … …  
    288292                                                  &(demo->duration), NULL, &row);
    289293
    290         gtk_container_add (GTK_CONTAINER (alignment), table);
     294        gtk_container_add (GTK_CONTAINER (frame), table);
    291295        gtk_widget_show (table);
    292296
    … …  
    302306        gtk_widget_show (label);
    303307
    304         alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
    305         gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 12, 5);
    306         gtk_container_add (GTK_CONTAINER (frame), alignment);
    307         gtk_widget_show (alignment);
    308        
    309308        thumnail_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
     309        gtk_widget_set_margin_top (thumnail_box, 5);
     310        gtk_widget_set_margin_bottom (thumnail_box, 5);
     311#if GTK_CHECK_VERSION(3, 12, 0)
     312        gtk_widget_set_margin_start (thumnail_box, 12);
     313        gtk_widget_set_margin_end (thumnail_box, 5);
     314#else
     315        gtk_widget_set_margin_left (thumnail_box, 12);
     316        gtk_widget_set_margin_right (thumnail_box, 5);
     317#endif
    310318       
    311319        demo->thumbnail = gtk_image_new ();
    … …  
    318326        gtk_widget_show (demo->thumbnail_size);
    319327
    320         gtk_container_add (GTK_CONTAINER (alignment), thumnail_box);
     328        gtk_container_add (GTK_CONTAINER (frame), thumnail_box);
    321329        gtk_widget_show (thumnail_box);
    322330

  • TabularUnified poppler/vendor/current/glib/demo/selections.c

    r660 r1159  
    337337
    338338        gtk_style_context_get_color (style_context, GTK_STATE_FLAG_SELECTED, &rgba);
    339 #if GTK_CHECK_VERSION(3,4,0)
    340339        gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (demo->fg_color_button), &rgba);
    341 #else
    342         gtk_color_button_set_rgba (GTK_COLOR_BUTTON (demo->fg_color_button), &rgba);
    343 #endif
    344340        gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_SELECTED, &rgba);
    345 #if GTK_CHECK_VERSION(3,4,0)
    346341        gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (demo->bg_color_button), &rgba);
    347 #else
    348         gtk_color_button_set_rgba (GTK_COLOR_BUTTON (demo->bg_color_button), &rgba);
    349 #endif
    350342}
    351343
    … …  
    466458        GdkRGBA color;
    467459
    468 #if GTK_CHECK_VERSION(3,4,0)
    469460        gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &color);
    470 #else
    471         gtk_color_button_get_rgba (GTK_COLOR_BUTTON (button), &color);
    472 #endif
    473461        demo->glyph_color.red = CLAMP ((guint) (color.red * 65535), 0, 65535);
    474462        demo->glyph_color.green = CLAMP ((guint) (color.green * 65535), 0, 65535);
    … …  
    483471        GdkRGBA color;
    484472
    485 #if GTK_CHECK_VERSION(3,4,0)
    486473        gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &color);
    487 #else
    488         gtk_color_button_get_rgba (GTK_COLOR_BUTTON (button), &color);
    489 #endif
    490474        demo->background_color.red = CLAMP ((guint) (color.red * 65535), 0, 65535);
    491475        demo->background_color.green = CLAMP ((guint) (color.green * 65535), 0, 65535);

  • TabularUnified poppler/vendor/current/glib/demo/text.c

    r721 r1159  
    331331        GtkWidget        *swindow, *textview, *treeview;
    332332        GtkTreeSelection *selection;
    333         GtkWidget        *frame, *alignment, *table;
     333        GtkWidget        *frame, *table;
    334334        GtkWidget        *hpaned;
    335335        GtkCellRenderer  *renderer;
    … …  
    516516        gtk_widget_show (label);
    517517
    518         alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
    519         gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 12, 5);
    520         gtk_container_add (GTK_CONTAINER (frame), alignment);
    521         gtk_widget_show (alignment);
    522 
    523518        table = gtk_grid_new ();
     519        gtk_widget_set_margin_top (table, 5);
     520        gtk_widget_set_margin_bottom (table, 5);
     521#if GTK_CHECK_VERSION(3, 12, 0)
     522        gtk_widget_set_margin_start (table, 12);
     523        gtk_widget_set_margin_end (table, 5);
     524#else
     525        gtk_widget_set_margin_left (table, 12);
     526        gtk_widget_set_margin_right (table, 5);
     527#endif
    524528        gtk_grid_set_column_spacing (GTK_GRID (table), 6);
    525529        gtk_grid_set_row_spacing (GTK_GRID (table), 6);
    … …  
    534538        pgd_table_add_property_with_custom_widget (GTK_GRID (table), "<b>Color:</b>", demo->text_color, &row);
    535539
    536         gtk_container_add (GTK_CONTAINER (alignment), table);
     540        gtk_container_add (GTK_CONTAINER (frame), table);
    537541        gtk_widget_show (table);
    538542

  • TabularUnified poppler/vendor/current/glib/demo/transitions.c

    r591 r1159  
    208208        treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
    209209        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), TRUE);
    210         gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
    211210        gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
    212211                                     GTK_SELECTION_NONE);

  • TabularUnified poppler/vendor/current/glib/demo/utils.c

    r937 r1159  
    159159                        new_dest = poppler_document_find_dest (document, dest->named_dest);
    160160                        if (new_dest) {
    161                                 GtkWidget *new_table, *alignment;
     161                                GtkWidget *new_table;
    162162                                gint       new_row = 0;
    163163
    164                                 alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
    165                                 gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 12, 5);
    166                                
    167164                                new_table = gtk_grid_new ();
     165                                gtk_widget_set_margin_top (new_table, 5);
     166                                gtk_widget_set_margin_bottom (new_table, 5);
     167#if GTK_CHECK_VERSION(3, 12, 0)
     168                                gtk_widget_set_margin_start (new_table, 12);
     169                                gtk_widget_set_margin_end (new_table, 5);
     170#else
     171                                gtk_widget_set_margin_left (new_table, 12);
     172                                gtk_widget_set_margin_right (new_table, 5);
     173#endif
    168174                                gtk_grid_set_column_spacing (GTK_GRID (new_table), 6);
    169175                                gtk_grid_set_row_spacing (GTK_GRID (new_table), 6);
    170                                 gtk_grid_attach (GTK_GRID(table), alignment, 0, *row, 1, 1);
    171                                 gtk_widget_show (alignment);
    172176                               
    173177                                pgd_action_view_add_destination (action_view, GTK_GRID (new_table),
    … …  
    175179                                poppler_dest_free (new_dest);
    176180
    177                                 gtk_container_add (GTK_CONTAINER (alignment), new_table);
     181                                gtk_grid_attach (GTK_GRID(table), new_table, 0, *row, 1, 1);
    178182                                gtk_widget_show (new_table);
    179183
    … …  
    312316                            PopplerAction *action)
    313317{
    314         GtkWidget  *alignment;
    315318        GtkWidget  *table;
    316319        gint        row = 0;
    317320
    318         alignment = gtk_bin_get_child (GTK_BIN (action_view));
    319         if (alignment) {
    320                 gtk_container_remove (GTK_CONTAINER (action_view), alignment);
    321         }
    322        
    323         alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
    324         gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 12, 5);
    325         gtk_container_add (GTK_CONTAINER (action_view), alignment);
    326         gtk_widget_show (alignment);
     321        table = gtk_bin_get_child (GTK_BIN (action_view));
     322        if (table) {
     323                gtk_container_remove (GTK_CONTAINER (action_view), table);
     324        }
    327325
    328326        if (!action)
    … …  
    330328
    331329        table = gtk_grid_new ();
     330        gtk_widget_set_margin_top (table, 5);
     331        gtk_widget_set_margin_bottom (table, 5);
     332#if GTK_CHECK_VERSION(3, 12, 0)
     333        gtk_widget_set_margin_start (table, 12);
     334        gtk_widget_set_margin_end (table, 5);
     335#else
     336        gtk_widget_set_margin_left (table, 12);
     337        gtk_widget_set_margin_right (table, 5);
     338#endif
    332339        gtk_grid_set_column_spacing (GTK_GRID (table), 6);
    333340        gtk_grid_set_row_spacing (GTK_GRID (table), 6);
    … …  
    467474        }
    468475
    469         gtk_container_add (GTK_CONTAINER (alignment), table);
     476        gtk_container_add (GTK_CONTAINER (action_view), table);
    470477        gtk_widget_show (table);
    471478}
    … …  
    547554                          PopplerMovie *movie)
    548555{
    549         GtkWidget  *alignment;
    550556        GtkWidget  *table;
    551557        GtkWidget  *button;
    552558        gint        row = 0;
    553559
    554         alignment = gtk_bin_get_child (GTK_BIN (movie_view));
    555         if (alignment) {
    556                 gtk_container_remove (GTK_CONTAINER (movie_view), alignment);
    557         }
    558 
    559         alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
    560         gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 5, 5, 12, 5);
    561         gtk_container_add (GTK_CONTAINER (movie_view), alignment);
    562         gtk_widget_show (alignment);
     560        table = gtk_bin_get_child (GTK_BIN (movie_view));
     561        if (table) {
     562                gtk_container_remove (GTK_CONTAINER (movie_view), table);
     563        }
    563564
    564565        if (!movie)
    … …  
    566567
    567568        table = gtk_grid_new ();
     569        gtk_widget_set_margin_top (table, 5);
     570        gtk_widget_set_margin_bottom (table, 5);
     571#if GTK_CHECK_VERSION(3, 12, 0)
     572        gtk_widget_set_margin_start (table, 12);
     573        gtk_widget_set_margin_end (table, 5);
     574#else
     575        gtk_widget_set_margin_left (table, 12);
     576        gtk_widget_set_margin_right (table, 5);
     577#endif
    568578        gtk_grid_set_column_spacing (GTK_GRID (table), 6);
    569579        gtk_grid_set_row_spacing (GTK_GRID (table), 6);
    … …  
    580590        gtk_widget_show (button);
    581591
    582         gtk_container_add (GTK_CONTAINER (alignment), table);
     592        gtk_container_add (GTK_CONTAINER (movie_view), table);
    583593        gtk_widget_show (table);
    584594}

  • TabularUnified poppler/vendor/current/glib/reference/html/annotation-glossary.html

    r875 r1159  
    77<link rel="home" href="index.html" title="Poppler Reference Manual">
    88<link rel="up" href="index.html" title="Poppler Reference Manual">
    9 <link rel="prev" href="api-index-0-22.html" title="Index of new symbols in 0.22">
     9<link rel="prev" href="api-index-0-33.html" title="Index of new symbols in 0.33">
    1010<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
    1111<link rel="stylesheet" href="style.css" type="text/css">
    … …  
    2626<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
    2727<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
    28 <td><a accesskey="p" href="api-index-0-22.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
     28<td><a accesskey="p" href="api-index-0-33.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
    2929<td><img src="right-insensitive.png" width="16" height="16" border="0"></td>
    3030</tr></table>

  • TabularUnified poppler/vendor/current/glib/reference/html/api-index-0-22.html

    r937 r1159  
    88<link rel="up" href="index.html" title="Poppler Reference Manual">
    99<link rel="prev" href="api-index-0-20.html" title="Index of new symbols in 0.20">
    10 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
     10<link rel="next" href="api-index-0-26.html" title="Index of new symbols in 0.26">
    1111<meta name="generator" content="GTK-Doc V1.21 (XML mode)">
    1212<link rel="stylesheet" href="style.css" type="text/css">
    … …  
    2424<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
    2525<td><a accesskey="p" href="api-index-0-20.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
    26 <td><a accesskey="n" href="annotation-glossary.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
     26<td><a accesskey="n" href="api-index-0-26.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
    2727</tr></table>
    2828<div class="index">

  • TabularUnified poppler/vendor/current/glib/reference/html/index.html

    r1150 r1159  
    1616<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Poppler Reference Manual</p></th></tr></table></div>
    1717<div><p class="releaseinfo">
    18       for Poppler 0.33.0
     18      for Poppler 0.35.0
    1919
    2020    </p></div>
    … …  
    7676<dt><span class="index"><a href="api-index-0-20.html">Index of new symbols in 0.20</a></span></dt>
    7777<dt><span class="index"><a href="api-index-0-22.html">Index of new symbols in 0.22</a></span></dt>
     78<dt><span class="index"><a href="api-index-0-26.html">Index of new symbols in 0.26</a></span></dt>
     79<dt><span class="index"><a href="api-index-0-33.html">Index of new symbols in 0.33</a></span></dt>
    7880<dt><span class="glossary"><a href="annotation-glossary.html">Annotation Glossary</a></span></dt>
    7981</dl></div>

  • TabularUnified poppler/vendor/current/glib/reference/html/poppler-Version-and-Features-Information.html

    r1150 r1159  
    120120<div class="refsect2">
    121121<a name="POPPLER-MINOR-VERSION:CAPS"></a><h3>POPPLER_MINOR_VERSION</h3>
    122 <pre class="programlisting">#define POPPLER_MINOR_VERSION (33)
     122<pre class="programlisting">#define POPPLER_MINOR_VERSION (35)
    123123</pre>
    124124<p>The major version number of the poppler header files (e.g. in poppler version

  • TabularUnified poppler/vendor/current/glib/reference/html/poppler.devhelp2

    r1150 r1159  
    2727    <sub name="Index of new symbols in 0.20" link="api-index-0-20.html"/>
    2828    <sub name="Index of new symbols in 0.22" link="api-index-0-22.html"/>
     29    <sub name="Index of new symbols in 0.26" link="api-index-0-26.html"/>
     30    <sub name="Index of new symbols in 0.33" link="api-index-0-33.html"/>
    2931    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
    3032  </chapters>

  • TabularUnified poppler/vendor/current/glib/reference/poppler-docs.sgml

    r937 r1159  
    6262    <xi:include href="xml/api-index-0.22.xml"><xi:fallback /></xi:include>
    6363  </index>
     64  <index id="api-index-0-26">
     65    <title>Index of new symbols in 0.26</title>
     66    <xi:include href="xml/api-index-0.26.xml"><xi:fallback /></xi:include>
     67  </index>
     68  <index id="api-index-0-33">
     69    <title>Index of new symbols in 0.33</title>
     70    <xi:include href="xml/api-index-0.33.xml"><xi:fallback /></xi:include>
     71  </index>
    6472
    6573  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

  • TabularUnified poppler/vendor/current/glib/reference/version.xml

    r1150 r1159  
    1 0.33.0
     10.35.0

  • TabularUnified poppler/vendor/current/goo/GooString.h

    r937 r1159  
    2121// Copyright (C) 2012-2014 Fabio D'Urso <fabiodurso@hotmail.it>
    2222// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
     23// Copyright (C) 2015 Adam Reichold <adam.reichold@t-online.de>
    2324//
    2425// To see a description of the changes please see the Changelog file that
    … …  
    115116
    116117  // Get length.
    117   int getLength() { return length; }
     118  int getLength() const { return length; }
    118119
    119120  // Get C string.
    120   char *getCString() const { return s; }
     121  char *getCString() { return s; }
     122  const char *getCString() const { return s; }
    121123
    122124  // Get <i>th character.
    123   char getChar(int i) { return s[i]; }
     125  char getChar(int i) const { return s[i]; }
    124126
    125127  // Change <i>th character.
    … …  
    171173  GooString& operator=(const GooString &other);
    172174
    173   // you can tweak this number for a different speed/memory usage tradeoffs.
    174   // In libc malloc() rounding is 16 so it's best to choose a value that
    175   // results in sizeof(GooString) be a multiple of 16.
    176   // 24 makes sizeof(GooString) to be 32.
    177   static const int STR_STATIC_SIZE = 24;
     175  // You can tweak the final object size for different time/space tradeoffs.
     176  // In libc malloc(), rounding is 16 so it's best to choose a value that
     177  // is a multiple of 16.
     178  class MemoryLayout {
     179      char c[sizeof(char*)];
     180      int i;
     181      char* s;
     182  };
     183
     184  static const int STR_FINAL_SIZE = 32;
     185  static const int STR_STATIC_SIZE = STR_FINAL_SIZE - sizeof(MemoryLayout) + sizeof(char*);
    178186
    179187  int  roundedSize(int len);

  • TabularUnified poppler/vendor/current/poppler/Annot.cc

    r1150 r1159  
    3535// Copyright (C) 2015 Petr Gajdos <pgajdos@suse.cz>
    3636// Copyright (C) 2015 Philipp Reinkemeier <philipp.reinkemeier@offis.de>
     37// Copyright (C) 2015 Tamas Szekeres <szekerest@gmail.com>
    3738//
    3839// To see a description of the changes please see the Changelog file that
    … …  
    7475#include "Link.h"
    7576#include <string.h>
     77#include <algorithm>
    7678
    7779#if MULTITHREADED

  • TabularUnified poppler/vendor/current/poppler/Catalog.cc

    r1019 r1159  
    826826        catDict.dictLookupNF("Pages", &pageRootRef);
    827827
    828         error(errSyntaxError, -1, "Pages top-level is a single Page. The document is mal-formet, trying to recover...");
     828        error(errSyntaxError, -1, "Pages top-level is a single Page. The document is malformed, trying to recover...");
    829829
    830830        Dict *pageDict = pagesDict.getDict();
    831         const Ref pageRef = pageRootRef.getRef();
    832         Page *p = new Page(doc, 1, pageDict, pageRef, new PageAttrs(NULL, pageDict), form);
    833         if (p->isOk()) {
    834           pages = (Page **)gmallocn(1, sizeof(Page *));
    835           pageRefs = (Ref *)gmallocn(1, sizeof(Ref));
    836 
    837           pages[0] = p;
    838           pageRefs[0].num = pageRef.num;
    839           pageRefs[0].gen = pageRef.gen;
    840 
    841           numPages = 1;
    842           lastCachedPage = 1;
    843           pagesSize = 1;
     831        if (pageRootRef.isRef()) {
     832          const Ref pageRef = pageRootRef.getRef();
     833          Page *p = new Page(doc, 1, pageDict, pageRef, new PageAttrs(NULL, pageDict), form);
     834          if (p->isOk()) {
     835            pages = (Page **)gmallocn(1, sizeof(Page *));
     836            pageRefs = (Ref *)gmallocn(1, sizeof(Ref));
     837
     838            pages[0] = p;
     839            pageRefs[0].num = pageRef.num;
     840            pageRefs[0].gen = pageRef.gen;
     841
     842            numPages = 1;
     843            lastCachedPage = 1;
     844            pagesSize = 1;
     845          } else {
     846            delete p;
     847            numPages = 0;
     848          }
    844849        } else {
    845           delete p;
    846850          numPages = 0;
    847851        }

  • TabularUnified poppler/vendor/current/poppler/GlobalParamsWin.cc

    r660 r1159  
    88   // Copyright (C) 2012 Mark Brand <mabrand@mabrand.nl>
    99   // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
     10   // Copyright (C) 2013 Dmytro Morgun <lztoad@gmail.com>
    1011
    1112TODO: instead of a fixed mapping defined in displayFontTab, it could
    … …  
    444445        }
    445446
    446         if (displayFontTab[i].warnIfMissing)
    447           error(errSyntaxError, -1, "No display font for '{0:s}'", fontName);
     447        if (displayFontTab[i].warnIfMissing) {
     448            error(errSyntaxError, -1, "No display font for '{0:s}'", displayFontTab[i].name);
     449            delete fontName;
     450        }
    448451    }
    449452    if (winFontDir[0]) {
    450       sysFonts->scanWindowsFonts(new GooString(winFontDir));
     453        GooString gooWinFontsDir(winFontDir);
     454        sysFonts->scanWindowsFonts(&gooWinFontsDir);
    451455    }
    452456
    … …  
    469473      parser->getObj(&obj1);
    470474      while (!obj1.isEOF()) {
    471         parser->getObj(&obj2);
    472         if (obj1.isName()) {
    473           // Substitutions
    474           if (obj2.isDict()) {
    475             Object obj3;
    476             obj2.getDict()->lookup("Path", &obj3);
    477             if (obj3.isString())
    478               addFontFile(new GooString(obj1.getName()), obj3.getString()->copy());
    479             obj3.free();
    480           // Aliases
    481           } else if (obj2.isName()) {
    482             substFiles->add(new GooString(obj1.getName()), new GooString(obj2.getName()));
    483           }
    484         }
    485         obj2.free();
    486         obj1.free();
    487         parser->getObj(&obj1);
    488         // skip trailing ';'
    489         while (obj1.isCmd(";")) {
    490           obj1.free();
    491           parser->getObj(&obj1);
    492         }
     475            parser->getObj(&obj2);
     476            if (obj1.isName()) {
     477              // Substitutions
     478              if (obj2.isDict()) {
     479                Object obj3;
     480                obj2.getDict()->lookup("Path", &obj3);
     481                if (obj3.isString())
     482                  addFontFile(new GooString(obj1.getName()), obj3.getString()->copy());
     483                obj3.free();
     484              // Aliases
     485              } else if (obj2.isName()) {
     486                substFiles->add(new GooString(obj1.getName()), new GooString(obj2.getName()));
     487              }
     488            }
     489            obj2.free();
     490            obj1.free();
     491            parser->getObj(&obj1);
     492            // skip trailing ';'
     493            while (obj1.isCmd(";")) {
     494              obj1.free();
     495              parser->getObj(&obj1);
     496            }
    493497      }
    494498      delete file;
    495499      delete parser;
     500    }
     501    else {
     502        delete fileName;
    496503    }
    497504}

  • TabularUnified poppler/vendor/current/poppler/Makefile.am

    r1150 r1159  
    297297
    298298libpoppler_la_LDFLAGS =                         \
    299         -version-info 52:0:0                    \
     299        -version-info 54:0:0                    \
    300300        @create_shared_lib@                     \
    301301        @auto_import_flags@

  • TabularUnified poppler/vendor/current/poppler/Makefile.in

    r1150 r1159  
    795795
    796796libpoppler_la_LDFLAGS = \
    797         -version-info 52:0:0                    \
     797        -version-info 54:0:0                    \
    798798        @create_shared_lib@                     \
    799799        @auto_import_flags@

  • TabularUnified poppler/vendor/current/poppler/PSOutputDev.cc

    r1150 r1159  
    3030// Copyright (C) 2012 Lu Wang <coolwanglu@gmail.com>
    3131// Copyright (C) 2014 Till Kamppeter <till.kamppeter@gmail.com>
     32// Copyright (C) 2015 Marek Kasik <mkasik@redhat.com>
    3233//
    3334// To see a description of the changes please see the Changelog file that
    … …  
    21232124  Object refObj, strObj, obj1, obj2, obj3;
    21242125  Dict *dict;
    2125   int length1, length2, length3;
     2126  long length1, length2, length3;
    21262127  int c;
    21272128  int start[4];
    … …  
    21732174  embFontList->append("\n");
    21742175
     2176  strObj.streamReset();
     2177  if (strObj.streamGetChar() == 0x80 &&
     2178      strObj.streamGetChar() == 1) {
     2179    // PFB format
     2180    length1 = strObj.streamGetChar() |
     2181             (strObj.streamGetChar() << 8) |
     2182             (strObj.streamGetChar() << 16) |
     2183             (strObj.streamGetChar() << 24);
     2184  } else {
     2185    strObj.streamReset();
     2186  }
    21752187  // copy ASCII portion of font
    2176   strObj.streamReset();
    21772188  for (i = 0; i < length1 && (c = strObj.streamGetChar()) != EOF; ++i) {
    21782189    writePSChar(c);
    … …  
    22072218  // convert binary data to ASCII
    22082219  if (binMode) {
    2209     for (i = 0; i < 4; ++i) {
    2210       writePSChar(hexChar[(start[i] >> 4) & 0x0f]);
    2211       writePSChar(hexChar[start[i] & 0x0f]);
     2220    if (start[0] == 0x80 &&
     2221        start[1] == 2) {
     2222      length2 = start[2] |
     2223               (start[3] << 8) |
     2224               (strObj.streamGetChar() << 16) |
     2225               (strObj.streamGetChar() << 24);
     2226      i = 0;
     2227    } else {
     2228      for (i = 0; i < 4; ++i) {
     2229        writePSChar(hexChar[(start[i] >> 4) & 0x0f]);
     2230        writePSChar(hexChar[start[i] & 0x0f]);
     2231      }
    22122232    }
    22132233#if 0 // this causes trouble for various PostScript printers
    … …  
    22472267    if (length3 > 0) {
    22482268      // write fixed-content portion
    2249       while ((c = strObj.streamGetChar()) != EOF) {
    2250         writePSChar(c);
     2269      c = strObj.streamGetChar();
     2270      if (c == 0x80) {
     2271        c = strObj.streamGetChar();
     2272        if (c == 1) {
     2273          length3 = strObj.streamGetChar() |
     2274                   (strObj.streamGetChar() << 8) |
     2275                   (strObj.streamGetChar() << 16) |
     2276                   (strObj.streamGetChar() << 24);
     2277
     2278          i = 0;
     2279          while (i < length3) {
     2280            if ((c = strObj.streamGetChar()) == EOF) {
     2281              break;
     2282            }
     2283            writePSChar(c);
     2284            ++i;
     2285          }
     2286        }
     2287      } else {
     2288        if (c != EOF) {
     2289          writePSChar(c);
     2290
     2291          while ((c = strObj.streamGetChar()) != EOF) {
     2292            writePSChar(c);
     2293          }
     2294        }
    22512295      }
    22522296    } else {

  • TabularUnified poppler/vendor/current/poppler/SplashOutputDev.cc

    r1150 r1159  
    3535// Copyright (C) 2014 Ed Porras <ed@moto-research.com>
    3636// Copyright (C) 2014 Richard PALO <richard@netbsd.org>
     37// Copyright (C) 2015 Tamas Szekeres <szekerest@gmail.com>
    3738//
    3839// To see a description of the changes please see the Changelog file that
    … …  
    7374#include "splash/Splash.h"
    7475#include "SplashOutputDev.h"
     76#include <algorithm>
    7577
    7678#ifdef VMS
    … …  
    142144}
    143145
     146// Copy a color according to the color mode.
     147// Use convertGfxShortColor() below when the destination is a bitmap
     148// to avoid overwriting cells.
     149// Calling this in SplashGouraudPattern::getParameterizedColor() fixes bug 90570.
     150// Use convertGfxColor() above when the destination is an array of SPOT_NCOMPS+4 bytes,
     151// to ensure that everything is initialized.
     152
     153static inline void convertGfxShortColor(SplashColorPtr dest,
     154                                   SplashColorMode colorMode,
     155                                   GfxColorSpace *colorSpace,
     156                                   GfxColor *src) {
     157  switch (colorMode) {
     158    case splashModeMono1:
     159    case splashModeMono8:
     160    {
     161      GfxGray gray;
     162      colorSpace->getGray(src, &gray);
     163      dest[0] = colToByte(gray);
     164    }
     165    break;
     166    case splashModeXBGR8:
     167      dest[3] = 255;
     168    case splashModeBGR8:
     169    case splashModeRGB8:
     170    {
     171      GfxRGB rgb;
     172      colorSpace->getRGB(src, &rgb);
     173      dest[0] = colToByte(rgb.r);
     174      dest[1] = colToByte(rgb.g);
     175      dest[2] = colToByte(rgb.b);
     176    }
     177    break;
     178#if SPLASH_CMYK
     179    case splashModeCMYK8:
     180    {
     181      GfxCMYK cmyk;
     182      colorSpace->getCMYK(src, &cmyk);
     183      dest[0] = colToByte(cmyk.c);
     184      dest[1] = colToByte(cmyk.m);
     185      dest[2] = colToByte(cmyk.y);
     186      dest[3] = colToByte(cmyk.k);
     187    }
     188    break;
     189    case splashModeDeviceN8:
     190    {
     191      GfxColor deviceN;
     192      colorSpace->getDeviceN(src, &deviceN);
     193      for (int i = 0; i < SPOT_NCOMPS + 4; i++)
     194        dest[i] = colToByte(deviceN.c[i]);
     195    }
     196    break;
     197#endif
     198  }
     199}
     200
    144201//------------------------------------------------------------------------
    145202// SplashGouraudPattern
    … …  
    178235      dest[m] = colToByte(src.c[m]);
    179236  } else {
    180     convertGfxColor(dest, mode, srcColorSpace, &src);
     237    convertGfxShortColor(dest, mode, srcColorSpace, &src);
    181238  }
    182239}
    … …  
    887944                              SplashColorPtr blend, SplashColorMode cm) {
    888945  Guchar r0, g0, b0;
    889 #ifdef SPLASH_CMYK
     946#if SPLASH_CMYK
    890947  Guchar r1, g1, b1;
    891948  int i;
    … …  
    937994                                     SplashColorMode cm) {
    938995  Guchar r0, g0, b0;
    939 #ifdef SPLASH_CMYK
     996#if SPLASH_CMYK
    940997  Guchar r1, g1, b1;
    941998  int i;
    … …  
    12281285  int tx, ty;                   // translation coordinates
    12291286  SplashBitmap *tBitmap;        // bitmap for transparency group
     1287  SplashBitmap *softmask;       // bitmap for softmasks
    12301288  GfxColorSpace *blendingColorSpace;
    12311289  GBool isolated;
    … …  
    27792837  imgMaskData.y = 0;
    27802838
    2781   maskBitmap = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(), 1, splashModeMono8, gFalse);
    2782   maskSplash = new Splash(maskBitmap, vectorAntialias);
     2839  transpGroupStack->softmask = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(), 1, splashModeMono8, gFalse);
     2840  maskSplash = new Splash(transpGroupStack->softmask, vectorAntialias);
    27832841  maskColor[0] = 0;
    27842842  maskSplash->clear(maskColor);
    … …  
    27972855  // memcpy(maskBitmap->getAlphaPtr(), maskBitmap->getDataPtr(), bitmap->getRowSize() * bitmap->getHeight());
    27982856  // memset(maskBitmap->getDataPtr(), 0, bitmap->getRowSize() * bitmap->getHeight());
    2799   Guchar *dest = bitmap->getAlphaPtr();
    2800   Guchar *src = maskBitmap->getDataPtr();
    2801   for (int c= 0; c < maskBitmap->getRowSize() * maskBitmap->getHeight(); c++) {
    2802     dest[c] = src[c];
    2803   }
    2804   delete maskBitmap;
    2805   maskBitmap = NULL;
     2857  if (transpGroupStack->softmask != NULL) {
     2858    Guchar *dest = bitmap->getAlphaPtr();
     2859    Guchar *src = transpGroupStack->softmask->getDataPtr();
     2860    for (int c= 0; c < transpGroupStack->softmask->getRowSize() * transpGroupStack->softmask->getHeight(); c++) {
     2861      dest[c] = src[c];
     2862    }
     2863    delete transpGroupStack->softmask;
     2864    transpGroupStack->softmask = NULL;
     2865  }
    28062866  endTransparencyGroup(state);
    28072867  baseMatrix[4] += transpGroupStack->tx;
    … …  
    28182878  int width, height, y;
    28192879};
     2880
     2881#ifdef USE_CMS
     2882GBool SplashOutputDev::useIccImageSrc(void *data) {
     2883  SplashOutImageData *imgData = (SplashOutImageData *)data;
     2884
     2885  if (!imgData->lookup && imgData->colorMap->getColorSpace()->getMode() == csICCBased) {
     2886    GfxICCBasedColorSpace *colorSpace = (GfxICCBasedColorSpace *) imgData->colorMap->getColorSpace();
     2887    switch (imgData->colorMode) {
     2888    case splashModeMono1:
     2889    case splashModeMono8:
     2890      if (colorSpace->getAlt() != NULL && colorSpace->getAlt()->getMode() == csDeviceGray)
     2891        return gTrue;
     2892      break;
     2893    case splashModeXBGR8:
     2894    case splashModeRGB8:
     2895    case splashModeBGR8:
     2896      if (colorSpace->getAlt() != NULL && colorSpace->getAlt()->getMode() == csDeviceRGB)
     2897        return gTrue;
     2898      break;
     2899#if SPLASH_CMYK
     2900    case splashModeCMYK8:
     2901      if (colorSpace->getAlt() != NULL && colorSpace->getAlt()->getMode() == csDeviceCMYK)
     2902        return gTrue;
     2903      break;
     2904#endif
     2905    }
     2906  }
     2907
     2908  return gFalse;
     2909}
     2910#endif
    28202911
    28212912GBool SplashOutputDev::imageSrc(void *data, SplashColorPtr colorLine,
    … …  
    29653056  return gTrue;
    29663057}
     3058
     3059#ifdef USE_CMS
     3060GBool SplashOutputDev::iccImageSrc(void *data, SplashColorPtr colorLine,
     3061                                Guchar * /*alphaLine*/) {
     3062  SplashOutImageData *imgData = (SplashOutImageData *)data;
     3063  Guchar *p;
     3064  int nComps;
     3065
     3066  if (imgData->y == imgData->height) {
     3067    return gFalse;
     3068  }
     3069  if (!(p = imgData->imgStr->getLine())) {
     3070    int destComps = 1;
     3071    if (imgData->colorMode == splashModeRGB8 || imgData->colorMode == splashModeBGR8)
     3072        destComps = 3;
     3073    else if (imgData->colorMode == splashModeXBGR8)
     3074        destComps = 4;
     3075#if SPLASH_CMYK
     3076    else if (imgData->colorMode == splashModeCMYK8)
     3077        destComps = 4;
     3078    else if (imgData->colorMode == splashModeDeviceN8)
     3079        destComps = SPOT_NCOMPS + 4;
     3080#endif
     3081    memset(colorLine, 0, imgData->width * destComps);
     3082    return gFalse;
     3083  }
     3084
     3085  if (imgData->colorMode == splashModeXBGR8) {
     3086    SplashColorPtr q;
     3087    int x;
     3088    for (x = 0, q = colorLine; x < imgData->width; ++x) {
     3089      *q++ = *p++;
     3090      *q++ = *p++;
     3091      *q++ = *p++;
     3092      *q++ = 255;
     3093    }
     3094  } else {
     3095    nComps = imgData->colorMap->getNumPixelComps();
     3096    memcpy(colorLine, p, imgData->width * nComps);
     3097  }
     3098
     3099  ++imgData->y;
     3100  return gTrue;
     3101}
     3102
     3103void SplashOutputDev::iccTransform(void *data, SplashBitmap *bitmap) {
     3104  SplashOutImageData *imgData = (SplashOutImageData *)data;
     3105  int nComps = imgData->colorMap->getNumPixelComps();
     3106
     3107  Guchar *colorLine = (Guchar *) gmalloc(nComps * bitmap->getWidth());
     3108  Guchar *rgbxLine = (imgData->colorMode == splashModeXBGR8) ? (Guchar *) gmalloc(3 * bitmap->getWidth()) : NULL;
     3109  for (int i = 0; i < bitmap->getHeight(); i++) {
     3110    Guchar *p = bitmap->getDataPtr() + i * bitmap->getRowSize();
     3111    switch (imgData->colorMode) {
     3112    case splashModeMono1:
     3113    case splashModeMono8:
     3114      imgData->colorMap->getGrayLine(p, colorLine, bitmap->getWidth());
     3115      memcpy(p, colorLine, nComps * bitmap->getWidth());
     3116      break;
     3117    case splashModeRGB8:
     3118    case splashModeBGR8:
     3119      imgData->colorMap->getRGBLine(p, colorLine, bitmap->getWidth());
     3120      memcpy(p, colorLine, nComps * bitmap->getWidth());
     3121      break;
     3122#if SPLASH_CMYK
     3123    case splashModeCMYK8:
     3124      imgData->colorMap->getCMYKLine(p, colorLine, bitmap->getWidth());
     3125      memcpy(p, colorLine, nComps * bitmap->getWidth());
     3126      break;
     3127#endif
     3128    case splashModeXBGR8:
     3129      Guchar *q;
     3130      Guchar *b = p;
     3131      int x;
     3132      for (x = 0, q = rgbxLine; x < bitmap->getWidth(); ++x, ++b) {
     3133        *q++ = *b++;
     3134        *q++ = *b++;
     3135        *q++ = *b++;
     3136      }
     3137      imgData->colorMap->getRGBLine(rgbxLine, colorLine, bitmap->getWidth());
     3138      b = p;
     3139      for (x = 0, q = colorLine; x < bitmap->getWidth(); ++x, ++b) {
     3140        *b++ = *q++;
     3141        *b++ = *q++;
     3142        *b++ = *q++;
     3143      }
     3144      break;
     3145    }
     3146  }
     3147  gfree(colorLine);
     3148  if (rgbxLine != NULL)
     3149    gfree(rgbxLine);
     3150}
     3151#endif
    29673152
    29683153GBool SplashOutputDev::alphaImageSrc(void *data, SplashColorPtr colorLine,
    … …  
    31773362  SplashColorMode srcMode;
    31783363  SplashImageSource src;
     3364  SplashICCTransform tf;
    31793365  GfxGray gray;
    31803366  GfxRGB rgb;
    … …  
    32943480    srcMode = colorMode;
    32953481  }
     3482#ifdef USE_CMS
     3483  src = maskColors ? &alphaImageSrc : useIccImageSrc(&imgData) ? &iccImageSrc : &imageSrc;
     3484  tf = maskColors == NULL && useIccImageSrc(&imgData) ? &iccTransform : NULL;
     3485#else
    32963486  src = maskColors ? &alphaImageSrc : &imageSrc;
    3297   splash->drawImage(src, &imgData, srcMode, maskColors ? gTrue : gFalse,
     3487  tf = NULL;
     3488#endif
     3489  splash->drawImage(src, tf, &imgData, srcMode, maskColors ? gTrue : gFalse,
    32983490                    width, height, mat, interpolate);
    32993491  if (inlineImg) {
    … …  
    35973789      srcMode = colorMode;
    35983790    }
    3599     splash->drawImage(&maskedImageSrc, &imgData, srcMode, gTrue,
     3791    splash->drawImage(&maskedImageSrc, NULL, &imgData, srcMode, gTrue,
    36003792                      width, height, mat, interpolate);
    36013793    delete maskBitmap;
    … …  
    36723864  maskColor[0] = 0;
    36733865  maskSplash->clear(maskColor);
    3674   maskSplash->drawImage(&imageSrc, &imgMaskData, splashModeMono8, gFalse,
     3866  maskSplash->drawImage(&imageSrc, NULL, &imgMaskData, splashModeMono8, gFalse,
    36753867                        maskWidth, maskHeight, mat, maskInterpolate);
    36763868  delete imgMaskData.imgStr;
    … …  
    37603952    srcMode = colorMode;
    37613953  }
    3762   splash->drawImage(&imageSrc, &imgData, srcMode, gFalse, width, height, mat, interpolate);
     3954  splash->drawImage(&imageSrc, NULL, &imgData, srcMode, gFalse, width, height, mat, interpolate);
    37633955  splash->setSoftMask(NULL);
    37643956  gfree(imgData.lookup);
    … …  
    38534045  // push a new stack entry
    38544046  transpGroup = new SplashTransparencyGroup();
     4047  transpGroup->softmask = NULL;
    38554048  transpGroup->tx = tx;
    38564049  transpGroup->ty = ty;
    … …  
    43594552    retValue = gTrue;
    43604553  } else {
    4361     retValue = splash->drawImage(&tilingBitmapSrc, &imgData, colorMode, gTrue, result_width, result_height, matc, gFalse, gTrue) == splashOk;
     4554    retValue = splash->drawImage(&tilingBitmapSrc, NULL, &imgData, colorMode, gTrue, result_width, result_height, matc, gFalse, gTrue) == splashOk;
    43624555  }
    43634556  delete tBitmap;

  • TabularUnified poppler/vendor/current/poppler/SplashOutputDev.h

    r1019 r1159  
    1515//
    1616// Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
    17 // Copyright (C) 2009-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
     17// Copyright (C) 2009-2015 Thomas Freitag <Thomas.Freitag@alfa.de>
    1818// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
    1919// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
    … …  
    384384  void drawType3Glyph(GfxState *state, T3FontCache *t3Font,
    385385                      T3FontCacheTag *tag, Guchar *data);
     386#ifdef USE_CMS
     387  GBool useIccImageSrc(void *data);
     388  static void iccTransform(void *data, SplashBitmap *bitmap);
     389  static GBool iccImageSrc(void *data, SplashColorPtr colorLine,
     390                        Guchar *alphaLine);
     391#endif
    386392  static GBool imageMaskSrc(void *data, SplashColorPtr line);
    387393  static GBool imageSrc(void *data, SplashColorPtr colorLine,

  • TabularUnified poppler/vendor/current/poppler/StructElement.cc

    r937 r1159  
    88// Copyright 2014 Luigi Scarso <luigi.scarso@gmail.com>
    99// Copyright 2014 Albert Astals Cid <aacid@kde.org>
     10// Copyright 2015 Dmytro Morgun <lztoad@gmail.com>
    1011//
    1112//========================================================================
    … …  
    279280    Before.initName("Before");
    280281    Nat1.initInt(1);
     282  }
     283
     284  ~AttributeDefaults() {
     285    Inline.free();
     286    LrTb.free();
     287    Normal.free();
     288    Distribute.free();
     289    off.free();
     290    Zero.free();
     291    Auto.free();
     292    Start.free();
     293    None.free();
     294    Before.free();
     295    Nat1.free();
    281296  }
    282297};

  • TabularUnified poppler/vendor/current/qt4/src/CMakeLists.txt

    r1019 r1159  
    3131qt4_automoc(${poppler_qt4_SRCS})
    3232add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
    33 set_target_properties(poppler-qt4 PROPERTIES VERSION 4.6.0 SOVERSION 4)
     33set_target_properties(poppler-qt4 PROPERTIES VERSION 4.7.0 SOVERSION 4)
    3434target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
    3535if(MSVC)

  • TabularUnified poppler/vendor/current/qt4/src/Makefile.am

    r1019 r1159  
    6161
    6262libpoppler_qt4_la_LDFLAGS =                     \
    63         -version-info 10:0:6                    \
     63        -version-info 11:0:7                    \
    6464        @create_shared_lib@                     \
    6565        @auto_import_flags@

  • TabularUnified poppler/vendor/current/qt4/src/Makefile.in

    r1019 r1159  
    510510
    511511libpoppler_qt4_la_LDFLAGS = \
    512         -version-info 10:0:6                    \
     512        -version-info 11:0:7                    \
    513513        @create_shared_lib@                     \
    514514        @auto_import_flags@

  • TabularUnified poppler/vendor/current/qt4/src/poppler-document.cc

    r721 r1159  
    99 * Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
    1010 * Copyright (C) 2014 Adam Reichold <adamreichold@myopera.com>
     11 * Copyright (C) 2015 William Bader <williambader@hotmail.com>
    1112 *
    1213 * This program is free software; you can redistribute it and/or modify
    … …  
    692693
    693694    bool isOverprintPreviewAvailable() {
    694 #if defined(SPLASH_CMYK)
     695#if SPLASH_CMYK
    695696        return true;
    696697#else

  • TabularUnified poppler/vendor/current/qt4/src/poppler-page.cc

    r1019 r1159  
    295295#if defined(HAVE_SPLASH)
    296296      SplashColor bgColor;
    297       GBool overprint = gFalse;
    298 #if defined(SPLASH_CMYK)
    299       overprint = m_page->parentDoc->m_hints & Document::OverprintPreview ? gTrue : gFalse;
    300       if (overprint)
     297      GBool overprintPreview = gFalse;
     298#if SPLASH_CMYK
     299      overprintPreview = m_page->parentDoc->m_hints & Document::OverprintPreview ? gTrue : gFalse;
     300      if (overprintPreview)
    301301      {
    302302        Guchar c, m, y, k;
    … …  
    327327        bgColor[2] = m_page->parentDoc->paperColor.red();
    328328      }
     329
     330      SplashColorMode colorMode = splashModeRGB8;
     331
     332      const bool ignorePaperColor = m_page->parentDoc->m_hints & Document::IgnorePaperColor;
     333      if (ignorePaperColor) colorMode = splashModeXBGR8;
     334
     335#if SPLASH_CMYK
     336      if (overprintPreview) colorMode = splashModeDeviceN8;
     337#endif
    329338 
    330339      SplashThinLineMode thinLineMode = splashThinLineDefault;
    … …  
    332341      if (m_page->parentDoc->m_hints & Document::ThinLineSolid) thinLineMode = splashThinLineSolid;
    333342
    334       SplashOutputDev * splash_output = new SplashOutputDev(
    335 #if defined(SPLASH_CMYK)
    336                       (overprint) ? splashModeDeviceN8 : splashModeXBGR8,
    337 #else
    338                       splashModeXBGR8,
    339 #endif
    340                       4, gFalse, bgColor, gTrue, thinLineMode, overprint);
    341 
    342       splash_output->setFontAntialias(m_page->parentDoc->m_hints & Document::TextAntialiasing ? gTrue : gFalse);
    343       splash_output->setVectorAntialias(m_page->parentDoc->m_hints & Document::Antialiasing ? gTrue : gFalse);
    344       splash_output->setFreeTypeHinting(m_page->parentDoc->m_hints & Document::TextHinting ? gTrue : gFalse,
     343      SplashOutputDev splash_output(
     344                  colorMode, 4,
     345                  gFalse,
     346                  ignorePaperColor ? NULL : bgColor,
     347                  gTrue,
     348                  thinLineMode,
     349                  overprintPreview);
     350
     351      splash_output.setFontAntialias(m_page->parentDoc->m_hints & Document::TextAntialiasing ? gTrue : gFalse);
     352      splash_output.setVectorAntialias(m_page->parentDoc->m_hints & Document::Antialiasing ? gTrue : gFalse);
     353      splash_output.setFreeTypeHinting(m_page->parentDoc->m_hints & Document::TextHinting ? gTrue : gFalse,
    345354                                        m_page->parentDoc->m_hints & Document::TextSlightHinting ? gTrue : gFalse);
    346355
    347       splash_output->startDoc(m_page->parentDoc->doc);     
    348 
    349       m_page->parentDoc->doc->displayPageSlice(splash_output, m_page->index + 1, xres, yres,
     356      splash_output.startDoc(m_page->parentDoc->doc);
     357
     358      m_page->parentDoc->doc->displayPageSlice(&splash_output, m_page->index + 1, xres, yres,
    350359                                               rotation, false, true, false, x, y, w, h,
    351360                                               NULL, NULL, NULL, NULL, gTrue);
    352361
    353       SplashBitmap *bitmap = splash_output->getBitmap();
    354       int bw = bitmap->getWidth();
    355       int bh = bitmap->getHeight();
    356 
    357       if (bitmap->convertToXBGR())
    358       {
    359         SplashColorPtr dataPtr = bitmap->getDataPtr();
    360 
    361         if (QSysInfo::BigEndian == QSysInfo::ByteOrder)
    362         {
    363             uchar c;
    364             int count = bw * bh * 4;
    365             for (int k = 0; k < count; k += 4)
    366             {
    367             c = dataPtr[k];
    368             dataPtr[k] = dataPtr[k+3];
    369             dataPtr[k+3] = c;
    370 
    371             c = dataPtr[k+1];
    372             dataPtr[k+1] = dataPtr[k+2];
    373             dataPtr[k+2] = c;
    374             }
    375         }
    376 
    377         // construct a qimage SHARING the raw bitmap data in memory
    378         QImage tmpimg( dataPtr, bw, bh, QImage::Format_ARGB32 );
    379         img = tmpimg.copy();
     362      SplashBitmap *bitmap = splash_output.getBitmap();
     363
     364      const int bw = bitmap->getWidth();
     365      const int bh = bitmap->getHeight();
     366      const int brs = bitmap->getRowSize();
     367
     368      // If we use DeviceN8, convert to XBGR8.
     369      // If requested, also transfer Splash's internal alpha channel.
     370      if (overprintPreview || ignorePaperColor) {
     371          if (bitmap->convertToXBGR(ignorePaperColor)) {
     372              SplashColorPtr data = bitmap->getDataPtr();
     373
     374              if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
     375                  // Convert byte order from RGBX to XBGR.
     376                  for (int i = 0; i < bh; ++i) {
     377                      for (int j = 0; j < bw; ++j) {
     378                          SplashColorPtr pixel = &data[i * brs + j];
     379
     380                          qSwap(pixel[0], pixel[3]);
     381                          qSwap(pixel[1], pixel[2]);
     382                      }
     383                  }
     384              }
     385
     386              // Construct a Qt image sharing the raw bitmap data.
     387              img = QImage(data, bw, bh, brs, QImage::Format_ARGB32).copy();
     388          }
     389      } else {
     390          SplashColorPtr data = bitmap->getDataPtr();
     391
     392          if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
     393              // Convert byte order from BGR to RGB.
     394              for (int i = 0; i < bh; ++i) {
     395                  for (int j = 0; j < bw; ++j) {
     396                      SplashColorPtr pixel = &data[i * brs + j];
     397
     398                      qSwap(pixel[0], pixel[2]);
     399                  }
     400              }
     401          }
     402
     403          // Construct a Qt image sharing the raw bitmap data.
     404          img = QImage(data, bw, bh, brs, QImage::Format_RGB888).copy();
    380405      }
    381       delete splash_output;
    382406#endif
    383407      break;

  • TabularUnified poppler/vendor/current/qt4/src/poppler-qt4.h

    r1019 r1159  
    22 * Copyright (C) 2005, Net Integration Technologies, Inc.
    33 * Copyright (C) 2005, 2007, Brad Hards <bradh@frogmouth.net>
    4  * Copyright (C) 2005-2012, 2014, Albert Astals Cid <aacid@kde.org>
     4 * Copyright (C) 2005-2012, 2014, 2015, Albert Astals Cid <aacid@kde.org>
    55 * Copyright (C) 2005, Stefan Kebekus <stefan.kebekus@math.uni-koeln.de>
    66 * Copyright (C) 2006-2011, Pino Toscano <pino@kde.org>
    … …  
    902902            OverprintPreview = 0x00000010,  ///< Overprint preview \since 0.22
    903903            ThinLineSolid = 0x00000020,     ///< Enhance thin lines solid \since 0.24
    904             ThinLineShape = 0x00000040      ///< Enhance thin lines shape. Wins over ThinLineSolid \since 0.24
     904            ThinLineShape = 0x00000040,     ///< Enhance thin lines shape. Wins over ThinLineSolid \since 0.24
     905            IgnorePaperColor = 0x00000080   ///< Do not compose with the paper color \since 0.35
    905906        };
    906907        Q_DECLARE_FLAGS( RenderHints, RenderHint )

  • TabularUnified poppler/vendor/current/qt4/tests/check_lexer.cpp

    r660 r1159  
    1313void TestLexer::testNumbers()
    1414{
    15     char *data = "0 1 -1 2147483647 -2147483647 2147483648 -2147483648 4294967297 -2147483649 0.1 1.1 -1.1 2147483647.1 -2147483647.1 2147483648.1 -2147483648.1 4294967297.1 -2147483649.1 9223372036854775807 18446744073709551615";
     15    char data[] = "0 1 -1 2147483647 -2147483647 2147483648 -2147483648 4294967297 -2147483649 0.1 1.1 -1.1 2147483647.1 -2147483647.1 2147483648.1 -2147483648.1 4294967297.1 -2147483649.1 9223372036854775807 18446744073709551615";
    1616    Object dummy;
    1717    MemStream *stream = new MemStream(data, 0, strlen(data), &dummy);

  • TabularUnified poppler/vendor/current/qt5/src/CMakeLists.txt

    r1019 r1159  
    3333)
    3434add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS})
    35 set_target_properties(poppler-qt5 PROPERTIES VERSION 1.3.0 SOVERSION 1)
     35set_target_properties(poppler-qt5 PROPERTIES VERSION 1.4.0 SOVERSION 1)
    3636target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES})
    3737if(MSVC)

  • TabularUnified poppler/vendor/current/qt5/src/Makefile.am

    r1019 r1159  
    6161
    6262libpoppler_qt5_la_LDFLAGS =                     \
    63         -version-info 4:0:3                     \
     63        -version-info 5:0:4                     \
    6464        @create_shared_lib@                     \
    6565        @auto_import_flags@

  • TabularUnified poppler/vendor/current/qt5/src/Makefile.in

    r1019 r1159  
    510510
    511511libpoppler_qt5_la_LDFLAGS = \
    512         -version-info 4:0:3                     \
     512        -version-info 5:0:4                     \
    513513        @create_shared_lib@                     \
    514514        @auto_import_flags@

  • TabularUnified poppler/vendor/current/qt5/src/poppler-document.cc

    r721 r1159  
    99 * Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
    1010 * Copyright (C) 2014 Adam Reichold <adamreichold@myopera.com>
     11 * Copyright (C) 2015 William Bader <williambader@hotmail.com>
    1112 *
    1213 * This program is free software; you can redistribute it and/or modify
    … …  
    673674
    674675    bool isOverprintPreviewAvailable() {
    675 #if defined(SPLASH_CMYK)
     676#if SPLASH_CMYK
    676677        return true;
    677678#else

  • TabularUnified poppler/vendor/current/qt5/src/poppler-page.cc

    r1019 r1159  
    295295#if defined(HAVE_SPLASH)
    296296      SplashColor bgColor;
    297       GBool overprint = gFalse;
    298 #if defined(SPLASH_CMYK)
    299       overprint = m_page->parentDoc->m_hints & Document::OverprintPreview ? gTrue : gFalse;
    300       if (overprint)
     297      GBool overprintPreview = gFalse;
     298#if SPLASH_CMYK
     299      overprintPreview = m_page->parentDoc->m_hints & Document::OverprintPreview ? gTrue : gFalse;
     300      if (overprintPreview)
    301301      {
    302302        Guchar c, m, y, k;
    … …  
    327327        bgColor[2] = m_page->parentDoc->paperColor.red();
    328328      }
     329
     330      SplashColorMode colorMode = splashModeRGB8;
    329331 
     332      const bool ignorePaperColor = m_page->parentDoc->m_hints & Document::IgnorePaperColor;
     333      if (ignorePaperColor) colorMode = splashModeXBGR8;
     334
     335#if SPLASH_CMYK
     336      if (overprintPreview) colorMode = splashModeDeviceN8;
     337#endif
     338
    330339      SplashThinLineMode thinLineMode = splashThinLineDefault;
    331340      if (m_page->parentDoc->m_hints & Document::ThinLineShape) thinLineMode = splashThinLineShape;
    332341      if (m_page->parentDoc->m_hints & Document::ThinLineSolid) thinLineMode = splashThinLineSolid;
    333342
    334       SplashOutputDev * splash_output = new SplashOutputDev(
    335 #if defined(SPLASH_CMYK)
    336                       (overprint) ? splashModeDeviceN8 : splashModeXBGR8,
    337 #else
    338                       splashModeXBGR8,
    339 #endif
    340                       4, gFalse, bgColor, gTrue, thinLineMode, overprint);
    341 
    342       splash_output->setFontAntialias(m_page->parentDoc->m_hints & Document::TextAntialiasing ? gTrue : gFalse);
    343       splash_output->setVectorAntialias(m_page->parentDoc->m_hints & Document::Antialiasing ? gTrue : gFalse);
    344       splash_output->setFreeTypeHinting(m_page->parentDoc->m_hints & Document::TextHinting ? gTrue : gFalse,
     343      SplashOutputDev splash_output(
     344                  colorMode, 4,
     345                  gFalse,
     346                  ignorePaperColor ? NULL : bgColor,
     347                  gTrue,
     348                  thinLineMode,
     349                  overprintPreview);
     350
     351      splash_output.setFontAntialias(m_page->parentDoc->m_hints & Document::TextAntialiasing ? gTrue : gFalse);
     352      splash_output.setVectorAntialias(m_page->parentDoc->m_hints & Document::Antialiasing ? gTrue : gFalse);
     353      splash_output.setFreeTypeHinting(m_page->parentDoc->m_hints & Document::TextHinting ? gTrue : gFalse,
    345354                                        m_page->parentDoc->m_hints & Document::TextSlightHinting ? gTrue : gFalse);
    346355
    347       splash_output->startDoc(m_page->parentDoc->doc);     
    348 
    349       m_page->parentDoc->doc->displayPageSlice(splash_output, m_page->index + 1, xres, yres,
     356      splash_output.startDoc(m_page->parentDoc->doc);
     357
     358      m_page->parentDoc->doc->displayPageSlice(&splash_output, m_page->index + 1, xres, yres,
    350359                                               rotation, false, true, false, x, y, w, h,
    351360                                               NULL, NULL, NULL, NULL, gTrue);
    352361
    353       SplashBitmap *bitmap = splash_output->getBitmap();
    354       int bw = bitmap->getWidth();
    355       int bh = bitmap->getHeight();
    356 
    357       if (bitmap->convertToXBGR())
    358       {
    359         SplashColorPtr dataPtr = bitmap->getDataPtr();
    360 
    361         if (QSysInfo::BigEndian == QSysInfo::ByteOrder)
    362         {
    363             uchar c;
    364             int count = bw * bh * 4;
    365             for (int k = 0; k < count; k += 4)
    366             {
    367             c = dataPtr[k];
    368             dataPtr[k] = dataPtr[k+3];
    369             dataPtr[k+3] = c;
    370 
    371             c = dataPtr[k+1];
    372             dataPtr[k+1] = dataPtr[k+2];
    373             dataPtr[k+2] = c;
    374             }
    375         }
    376 
    377         // construct a qimage SHARING the raw bitmap data in memory
    378         QImage tmpimg( dataPtr, bw, bh, QImage::Format_ARGB32 );
    379         img = tmpimg.copy();
     362      SplashBitmap *bitmap = splash_output.getBitmap();
     363
     364      const int bw = bitmap->getWidth();
     365      const int bh = bitmap->getHeight();
     366      const int brs = bitmap->getRowSize();
     367
     368      // If we use DeviceN8, convert to XBGR8.
     369      // If requested, also transfer Splash's internal alpha channel.
     370      if (overprintPreview || ignorePaperColor) {
     371          if (bitmap->convertToXBGR(ignorePaperColor)) {
     372              SplashColorPtr data = bitmap->takeData();
     373
     374              if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
     375                  // Convert byte order from RGBX to XBGR.
     376                  for (int i = 0; i < bh; ++i) {
     377                      for (int j = 0; j < bw; ++j) {
     378                          SplashColorPtr pixel = &data[i * brs + j];
     379
     380                          qSwap(pixel[0], pixel[3]);
     381                          qSwap(pixel[1], pixel[2]);
     382                      }
     383                  }
     384              }
     385
     386              // Construct a Qt image holding (and also owning) the raw bitmap data.
     387              img = QImage(data, bw, bh, brs, QImage::Format_ARGB32, gfree, data);
     388          }
     389      } else {
     390          SplashColorPtr data = bitmap->takeData();
     391
     392          if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
     393              // Convert byte order from BGR to RGB.
     394              for (int i = 0; i < bh; ++i) {
     395                  for (int j = 0; j < bw; ++j) {
     396                      SplashColorPtr pixel = &data[i * brs + j];
     397
     398                      qSwap(pixel[0], pixel[2]);
     399                  }
     400              }
     401          }
     402
     403          // Construct a Qt image holding (and also owning) the raw bitmap data.
     404          img = QImage(data, bw, bh, brs, QImage::Format_RGB888, gfree, data);
    380405      }
    381       delete splash_output;
    382406#endif
    383407      break;

  • TabularUnified poppler/vendor/current/qt5/src/poppler-qt5.h

    r1019 r1159  
    22 * Copyright (C) 2005, Net Integration Technologies, Inc.
    33 * Copyright (C) 2005, 2007, Brad Hards <bradh@frogmouth.net>
    4  * Copyright (C) 2005-2014, Albert Astals Cid <aacid@kde.org>
     4 * Copyright (C) 2005-2015, Albert Astals Cid <aacid@kde.org>
    55 * Copyright (C) 2005, Stefan Kebekus <stefan.kebekus@math.uni-koeln.de>
    66 * Copyright (C) 2006-2011, Pino Toscano <pino@kde.org>
    … …  
    892892            OverprintPreview = 0x00000010,  ///< Overprint preview \since 0.22
    893893            ThinLineSolid = 0x00000020,     ///< Enhance thin lines solid \since 0.24
    894             ThinLineShape = 0x00000040      ///< Enhance thin lines shape. Wins over ThinLineSolid \since 0.24
     894            ThinLineShape = 0x00000040,     ///< Enhance thin lines shape. Wins over ThinLineSolid \since 0.24
     895            IgnorePaperColor = 0x00000080   ///< Do not compose with the paper color \since 0.35
    895896        };
    896897        Q_DECLARE_FLAGS( RenderHints, RenderHint )

  • TabularUnified poppler/vendor/current/qt5/tests/check_lexer.cpp

    r660 r1159  
    1313void TestLexer::testNumbers()
    1414{
    15     char *data = "0 1 -1 2147483647 -2147483647 2147483648 -2147483648 4294967297 -2147483649 0.1 1.1 -1.1 2147483647.1 -2147483647.1 2147483648.1 -2147483648.1 4294967297.1 -2147483649.1 9223372036854775807 18446744073709551615";
     15    char data[] = "0 1 -1 2147483647 -2147483647 2147483648 -2147483648 4294967297 -2147483649 0.1 1.1 -1.1 2147483647.1 -2147483647.1 2147483648.1 -2147483648.1 4294967297.1 -2147483649.1 9223372036854775807 18446744073709551615";
    1616    Object dummy;
    1717    MemStream *stream = new MemStream(data, 0, strlen(data), &dummy);

  • TabularUnified poppler/vendor/current/splash/Splash.cc

    r1150 r1159  
    1414// Copyright (C) 2005-2015 Albert Astals Cid <aacid@kde.org>
    1515// Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
    16 // Copyright (C) 2010-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
     16// Copyright (C) 2010-2015 Thomas Freitag <Thomas.Freitag@alfa.de>
    1717// Copyright (C) 2010 Christian FeuersÀnger <cfeuersaenger@googlemail.com>
    1818// Copyright (C) 2011-2013, 2015 William Bader <williambader@hotmail.com>
    … …  
    606606
    607607    if (state->blendFunc) {
    608 #ifdef SPLASH_CMYK
     608#if SPLASH_CMYK
    609609      if (bitmap->mode == splashModeDeviceN8) {
    610610        for (int k = 4; k < 4 + SPOT_NCOMPS; k++) {
    … …  
    36603660}
    36613661
    3662 SplashError Splash::drawImage(SplashImageSource src, void *srcData,
     3662SplashError Splash::drawImage(SplashImageSource src, SplashICCTransform tf, void *srcData,
    36633663                              SplashColorMode srcMode, GBool srcAlpha,
    36643664                              int w, int h, SplashCoord *mat, GBool interpolate,
    … …  
    37513751        return splashErrBadArg;
    37523752      }
     3753      if  (tf != NULL) {
     3754        (*tf)(srcData, scaledImg);
     3755      }
    37533756      blitImage(scaledImg, srcAlpha, x0, y0, clipRes);
    37543757      delete scaledImg;
    … …  
    37893792        return splashErrBadArg;
    37903793      }
     3794      if  (tf != NULL) {
     3795        (*tf)(srcData, scaledImg);
     3796      }
    37913797      vertFlipImage(scaledImg, scaledWidth, scaledHeight, nComps);
    37923798      blitImage(scaledImg, srcAlpha, x0, y0, clipRes);
    … …  
    37963802  // all other cases
    37973803  } else {
    3798     return arbitraryTransformImage(src, srcData, srcMode, nComps, srcAlpha,
     3804    return arbitraryTransformImage(src, tf, srcData, srcMode, nComps, srcAlpha,
    37993805                            w, h, mat, interpolate, tilingPattern);
    38003806  }
    … …  
    38033809}
    38043810
    3805 SplashError Splash::arbitraryTransformImage(SplashImageSource src, void *srcData,
     3811SplashError Splash::arbitraryTransformImage(SplashImageSource src, SplashICCTransform tf, void *srcData,
    38063812                                     SplashColorMode srcMode, int nComps,
    38073813                                     GBool srcAlpha,
    … …  
    39383944  }
    39393945
     3946  if  (tf != NULL) {
     3947    (*tf)(srcData, scaledImg);
     3948  }
    39403949  // construct the three sections
    39413950  i = 0;

  • TabularUnified poppler/vendor/current/splash/Splash.h

    r660 r1159  
    1414// Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
    1515// Copyright (C) 2007, 2011 Albert Astals Cid <aacid@kde.org>
    16 // Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
     16// Copyright (C) 2010-2013, 2015 Thomas Freitag <Thomas.Freitag@alfa.de>
    1717// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
    1818// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
    … …  
    5656typedef GBool (*SplashImageSource)(void *data, SplashColorPtr colorLine,
    5757                                   Guchar *alphaLine);
     58
     59// Use ICCColorSpace to transform a bitmap
     60typedef void (*SplashICCTransform)(void *data, SplashBitmap *bitmap);
    5861
    5962//------------------------------------------------------------------------
    … …  
    212215  //    CMYK8        CMYK8
    213216  // The matrix behaves as for fillImageMask.
    214   SplashError drawImage(SplashImageSource src, void *srcData,
     217  SplashError drawImage(SplashImageSource src, SplashICCTransform tf, void *srcData,
    215218                        SplashColorMode srcMode, GBool srcAlpha,
    216219                        int w, int h, SplashCoord *mat, GBool interpolate,
    … …  
    358361  void blitMask(SplashBitmap *src, int xDest, int yDest,
    359362                SplashClipResult clipRes);
    360   SplashError arbitraryTransformImage(SplashImageSource src, void *srcData,
     363  SplashError arbitraryTransformImage(SplashImageSource src, SplashICCTransform tf, void *srcData,
    361364                               SplashColorMode srcMode, int nComps,
    362365                               GBool srcAlpha,

  • TabularUnified poppler/vendor/current/splash/SplashBitmap.cc

    r1150 r1159  
    1919// Copyright (C) 2010 Harry Roberts <harry.roberts@midnight-labs.org>
    2020// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
    21 // Copyright (C) 2010 William Bader <williambader@hotmail.com>
     21// Copyright (C) 2010, 2015 William Bader <williambader@hotmail.com>
    2222// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
    2323// Copyright (C) 2012 Anthony Wesley <awesley@smartnetworks.com.au>
     24// Copyright (C) 2015 Adam Reichold <adamreichold@myopera.com>
    2425//
    2526// To see a description of the changes please see the Changelog file that
    … …  
    362363
    363364    #ifdef ENABLE_LIBJPEG
    364     #ifdef SPLASH_CMYK
     365    #if SPLASH_CMYK
    365366    case splashFormatJpegCMYK:
    366367      writer = new JpegWriter(JpegWriter::CMYK);
    … …  
    461462}
    462463
    463 void SplashBitmap::getXBGRLine(int yl, SplashColorPtr line) {
     464void SplashBitmap::getXBGRLine(int yl, SplashColorPtr line, bool useAlpha) {
    464465  SplashColor col;
    465466  double c, m, y, k, c1, m1, y1, k1, r, g, b;
    … …  
    504505    *line++ = dblToByte(clip01(g));
    505506    *line++ = dblToByte(clip01(r));
    506     *line++ = 255;
    507   }
    508 }
    509 
    510 GBool SplashBitmap::convertToXBGR() {
    511   if (mode == splashModeXBGR8)
     507    *line++ = useAlpha ? getAlpha(x, yl) : 255;
     508  }
     509}
     510
     511GBool SplashBitmap::convertToXBGR(bool useAlpha) {
     512  if (mode == splashModeXBGR8) {
     513    if (useAlpha) {
     514      // Copy the alpha channel into the fourth component so that XBGR becomes ABGR.
     515      const SplashColorPtr dbegin = data;
     516      const SplashColorPtr dend = data + rowSize * height;
     517
     518      Guchar *const abegin = alpha;
     519      Guchar *const aend = alpha + width * height;
     520
     521      SplashColorPtr d = dbegin + 3;
     522      Guchar *a = abegin;
     523
     524      for(; d < dend && a < aend; d += 4, a += 1) {
     525        *d = *a;
     526      }
     527    }
     528
    512529    return gTrue;
     530  }
    513531 
    514532  int newrowSize = width * 4;
    … …  
    517535    for (int y = 0; y < height; y++) {
    518536      unsigned char *row = newdata + y * newrowSize;
    519       getXBGRLine(y, row);
     537      getXBGRLine(y, row, useAlpha);
    520538    }
    521539    if (rowSize < 0) {

  • TabularUnified poppler/vendor/current/splash/SplashBitmap.h

    r591 r1159  
    2121// Copyright (C) 2010 William Bader <williambader@hotmail.com>
    2222// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
     23// Copyright (C) 2015 Adam Reichold <adamreichold@myopera.com>
    2324//
    2425// To see a description of the changes please see the Changelog file that
    … …  
    7677  SplashError writeImgFile(ImgWriter *writer, FILE *f, int hDPI, int vDPI);
    7778
    78   GBool convertToXBGR();
     79  GBool convertToXBGR(bool useAlpha = false);
    7980
    8081  void getPixel(int x, int y, SplashColorPtr pixel);
    8182  void getRGBLine(int y, SplashColorPtr line);
    82   void getXBGRLine(int y, SplashColorPtr line);
     83  void getXBGRLine(int y, SplashColorPtr line, bool useAlpha = false);
    8384#if SPLASH_CMYK
    8485  void getCMYKLine(int y, SplashColorPtr line);

  • TabularUnified poppler/vendor/current/splash/SplashFontEngine.cc

    r721 r1159  
    1818// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
    1919// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
     20// Copyright (C) 2015 Dmytro Morgun <lztoad@gmail.com>
    2021//
    2122// To see a description of the changes please see the Changelog file that
    … …  
    150151#endif
    151152
    152 #ifndef _WIN32
    153   // delete the (temporary) font file -- with Unix hard link
    154   // semantics, this will remove the last link; otherwise it will
    155   // return an error, leaving the file to be deleted later (if
    156   // loadXYZFont failed, the file will always be deleted)
    157   if (src->isFile)
    158     src->unref();
    159 #endif
     153  // delete the (temporary) font file -- with Unix hard link
     154  // semantics, this will remove the last link; otherwise it will
     155  // return an error, leaving the file to be deleted later (if
     156  // loadXYZFont failed, the file will always be deleted)
     157  if (src->isFile)
     158    src->unref();
    160159
    161160  return fontFile;
    … …  
    179178#endif
    180179
    181 #ifndef _WIN32
    182   // delete the (temporary) font file -- with Unix hard link
    183   // semantics, this will remove the last link; otherwise it will
    184   // return an error, leaving the file to be deleted later (if
    185   // loadXYZFont failed, the file will always be deleted)
    186   if (src->isFile)
    187     src->unref();
    188 #endif
     180  // delete the (temporary) font file -- with Unix hard link
     181  // semantics, this will remove the last link; otherwise it will
     182  // return an error, leaving the file to be deleted later (if
     183  // loadXYZFont failed, the file will always be deleted)
     184  if (src->isFile)
     185    src->unref();
    189186
    190187  return fontFile;
    … …  
    224221#endif
    225222
    226 #ifndef _WIN32
    227   // delete the (temporary) font file -- with Unix hard link
    228   // semantics, this will remove the last link; otherwise it will
    229   // return an error, leaving the file to be deleted later (if
    230   // loadXYZFont failed, the file will always be deleted)
    231   if (src->isFile)
    232     src->unref();
    233 #endif
     223  // delete the (temporary) font file -- with Unix hard link
     224  // semantics, this will remove the last link; otherwise it will
     225  // return an error, leaving the file to be deleted later (if
     226  // loadXYZFont failed, the file will always be deleted)
     227  if (src->isFile)
     228    src->unref();
    234229
    235230  return fontFile;
    … …  
    278273  }
    279274
    280 #ifndef _WIN32
    281   // delete the (temporary) font file -- with Unix hard link
    282   // semantics, this will remove the last link; otherwise it will
    283   // return an error, leaving the file to be deleted later (if
    284   // loadXYZFont failed, the file will always be deleted)
    285   if (src->isFile)
    286     src->unref();
    287 #endif
     275  // delete the (temporary) font file -- with Unix hard link
     276  // semantics, this will remove the last link; otherwise it will
     277  // return an error, leaving the file to be deleted later (if
     278  // loadXYZFont failed, the file will always be deleted)
     279  if (src->isFile)
     280    src->unref();
    288281
    289282  return fontFile;

  • TabularUnified poppler/vendor/current/utils/pdftocairo-win32.cc

    r937 r1159  
    160160}
    161161
    162 static HWND createGroupBox(HWND parent, HINSTANCE hInstance, int id, const char *label, RECT *rect)
     162static HWND createGroupBox(HWND parent, HINSTANCE hInstance, HMENU id, const char *label, RECT *rect)
    163163{
    164164  HWND hwnd = CreateWindowA(WC_BUTTONA,
    … …  
    168168                            rect->right - rect->left,
    169169                            rect->bottom - rect->top,
    170                             parent, (HMENU)id,
     170                            parent, id,
    171171                            hInstance, NULL);
    172172  HFONT hFont = (HFONT)SendMessage(parent, WM_GETFONT, (WPARAM)0, (LPARAM)0);
    … …  
    176176}
    177177
    178 static HWND createCheckBox(HWND parent, HINSTANCE hInstance, int id, const char *label, RECT *rect)
     178static HWND createCheckBox(HWND parent, HINSTANCE hInstance, HMENU id, const char *label, RECT *rect)
    179179{
    180180  HWND hwnd = CreateWindowA(WC_BUTTONA,
    … …  
    184184                            rect->right - rect->left,
    185185                            rect->bottom - rect->top,
    186                             parent, (HMENU)id,
     186                            parent, id,
    187187                            hInstance, NULL);
    188188  HFONT hFont = (HFONT)SendMessage(parent, WM_GETFONT, (WPARAM)0, (LPARAM)0);
    … …  
    192192}
    193193
    194 static HWND createStaticText(HWND parent, HINSTANCE hinstance, int id, const char *text, RECT *rect)
     194static HWND createStaticText(HWND parent, HINSTANCE hinstance, HMENU id, const char *text, RECT *rect)
    195195{
    196196  HWND hwnd = CreateWindowA(WC_STATICA,
    … …  
    200200                            rect->right - rect->left,
    201201                            rect->bottom - rect->top,
    202                             parent, (HMENU)id,
     202                            parent, id,
    203203                            hinstance, NULL);
    204204  HFONT hFont = (HFONT)SendMessage(parent, WM_GETFONT, (WPARAM)0, (LPARAM)0);
    … …  
    208208}
    209209
    210 HWND createPageScaleComboBox(HWND parent, HINSTANCE hinstance, int id, RECT *rect)
     210HWND createPageScaleComboBox(HWND parent, HINSTANCE hinstance, HMENU id, RECT *rect)
    211211{
    212212  HWND hwnd = CreateWindowA(WC_COMBOBOX,
    … …  
    217217                            rect->right - rect->left,
    218218                            rect->bottom - rect->top,
    219                             parent, (HMENU)id,
     219                            parent, id,
    220220                            hinstance, NULL);
    221221  HFONT hFont = (HFONT)SendMessage(parent, WM_GETFONT, (WPARAM)0, (LPARAM)0);
    … …  
    297297    pdfGroupBoxRect.top = printRangeGroupRect.bottom + interGroupSpace;
    298298    pdfGroupBoxRect.bottom = pdfGroupBoxRect.top + groupHeight;
    299     createGroupBox(hdlg, hinstance, grp3, "PDF Print Options", &pdfGroupBoxRect);
     299    createGroupBox(hdlg, hinstance, (HMENU)grp3, "PDF Print Options", &pdfGroupBoxRect);
    300300
    301301    RECT textRect;
    … …  
    304304    textRect.top = pdfGroupBoxRect.top + nameLabelRect.top - printerGroupRect.top;
    305305    textRect.bottom = textRect.top + nameLabelRect.bottom - nameLabelRect.top;
    306     createStaticText(hdlg, hinstance, stc1, "Page Scaling:", &textRect);
     306    createStaticText(hdlg, hinstance, (HMENU)stc1, "Page Scaling:", &textRect);
    307307
    308308    RECT comboBoxRect;
    … …  
    311311    comboBoxRect.top = pdfGroupBoxRect.top + printerComboRect.top - printerGroupRect.top;
    312312    comboBoxRect.bottom = textRect.top + 4*(printerComboRect.bottom - printerComboRect.top);
    313     HWND comboBoxWind = createPageScaleComboBox(hdlg, hinstance, cmb1, &comboBoxRect);
     313    HWND comboBoxWind = createPageScaleComboBox(hdlg, hinstance, (HMENU)cmb1, &comboBoxRect);
    314314
    315315    RECT checkBox1Rect;
    … …  
    318318    checkBox1Rect.top = pdfGroupBoxRect.top + statusLabelRect.top - printerGroupRect.top;
    319319    checkBox1Rect.bottom = checkBox1Rect.top + radio1Rect.bottom - radio1Rect.top;
    320     HWND checkBox1Wind = createCheckBox(hdlg, hinstance, chx3, "Center", &checkBox1Rect);
     320    HWND checkBox1Wind = createCheckBox(hdlg, hinstance, (HMENU)chx3, "Center", &checkBox1Rect);
    321321
    322322    RECT checkBox2Rect;
    … …  
    325325    checkBox2Rect.top =  checkBox1Rect.top + radio2Rect.top - radio1Rect.top;
    326326    checkBox2Rect.bottom = checkBox2Rect.top + radio1Rect.bottom - radio1Rect.top;
    327     HWND checkBox2Wind = createCheckBox(hdlg, hinstance, chx4, "Select page size using document page size", &checkBox2Rect);
     327    HWND checkBox2Wind = createCheckBox(hdlg, hinstance, (HMENU)chx4, "Select page size using document page size", &checkBox2Rect);
    328328
    329329    // Move OK and Cancel buttons down ensuring they are last in the Z order
Note: See TracChangeset for help on using the changeset viewer.