[poppler] 2 commits - poppler/poppler-config.h.cmake poppler/UTF.cc poppler/UTF.h

[GitLab Mirror]

 poppler/UTF.cc                 |    4 ++--
 poppler/UTF.h                  |    4 ++--
 poppler/poppler-config.h.cmake |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6fdf76631cb98012a051f4659583d67c0d5e0fad
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Jan 3 13:51:56 2020 +0100

    Mark 'in' in unicodeToAscii7 as const

diff --git a/poppler/UTF.cc b/poppler/UTF.cc
index 32a13d46..b009abf1 100644
--- a/poppler/UTF.cc
+++ b/poppler/UTF.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2008 Koji Otani <sho at bbr.jp>
 // Copyright (C) 2012, 2017 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2012 Hib Eris <hib at hiberis.nl>
-// Copyright (C) 2016, 2018, 2019 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2016, 2018-2020 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
 // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
 // Copyright (C) 2018 Nelson Benítez León <nbenitezl at gmail.com>
@@ -430,7 +430,7 @@ struct Ascii7Map
   }
 };
 
-void unicodeToAscii7(Unicode *in, int len, Unicode **ucs4_out,
+void unicodeToAscii7(const Unicode *in, int len, Unicode **ucs4_out,
                      int *out_len, const int *in_idx, int **indices)
 {
   static Ascii7Map uMap;
diff --git a/poppler/UTF.h b/poppler/UTF.h
index 44844796..c9d693c3 100644
--- a/poppler/UTF.h
+++ b/poppler/UTF.h
@@ -8,7 +8,7 @@
 // Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
 // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
 // Copyright (C) 2018 Nelson Benítez León <nbenitezl at gmail.com>
-// Copyright (C) 2019 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2019, 2020 Albert Astals Cid <aacid at kde.org>
 //
 //========================================================================
 
@@ -88,6 +88,6 @@ char *utf16ToUtf8(const uint16_t *utf16, int *len = nullptr);
 //              of length @out_len + 1, for each character in the ascii string giving the index
 //              of the corresponding character in the text of the line (thanks to this info
 //              being passed in @in_idx parameter).
-void unicodeToAscii7(Unicode *in, int len, Unicode **ucs4_out, int *out_len, const int *in_idx, int **indices);
+void unicodeToAscii7(const Unicode *in, int len, Unicode **ucs4_out, int *out_len, const int *in_idx, int **indices);
 
 #endif
commit 98f5383030929c9b2895ffff9a561023b7de867f
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Jan 3 13:51:39 2020 +0100

    Welcome 2020

diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake
index 2adf181c..4e6cc522 100644
--- a/poppler/poppler-config.h.cmake
+++ b/poppler/poppler-config.h.cmake
@@ -121,7 +121,7 @@
 //------------------------------------------------------------------------
 
 // copyright notice
-#define popplerCopyright "Copyright 2005-2019 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2020 The Poppler Developers - http://poppler.freedesktop.org"
 #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
 
 //------------------------------------------------------------------------