[poppler] 4 commits - poppler/poppler-config.h.in qt5/src

[Albert Astals Cid]

 poppler/poppler-config.h.in |    3 +++
 qt5/src/poppler-private.h   |    7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0b639cd2ac1071f5b741031a78d8e2bc18d2b7d7
Merge: bb16c71 a5ad55b
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Jul 11 00:32:46 2014 +0200

    Merge remote-tracking branch 'origin/poppler-0.26'

commit a5ad55b7cb9dc4e62754954291e4ecb8e05b5d67
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Jul 11 00:32:07 2014 +0200

    Add Hib's (C)

diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index d26b7bf..a7d2efe 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -14,6 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
+// Copyright (C) 2014 Hib Eris <hib at hiberis.nl>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
commit 4f4ee736075d5b1d1bf4911a26c2f80a7122fe04
Author: Aki Koskinen <freedesktop at akikoskinen.info>
Date:   Fri Jul 11 00:30:52 2014 +0200

    Fix compilation of Qt5 frontend with MinGW

diff --git a/qt5/src/poppler-private.h b/qt5/src/poppler-private.h
index 0dd40d7..df6290b 100644
--- a/qt5/src/poppler-private.h
+++ b/qt5/src/poppler-private.h
@@ -8,6 +8,7 @@
  * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
  * Copyright (C) 2013 Anthony Granger <grangeranthony at gmail.com>
  * Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
+ * Copyright (C) 2014 Aki Koskinen <freedesktop at akikoskinen.info>
  * Inspired on code by
  * Copyright (C) 2004 by Albert Astals Cid <tsdgeos at terra.es>
  * Copyright (C) 2004 by Enrico Ros <eros.kde at email.it>
@@ -86,11 +87,7 @@ namespace Poppler {
 		m_filePath = filePath;	
 
 #ifdef _WIN32
-		wchar_t *fileName = new WCHAR[filePath.length()];
-		std::wstring wstr = (const wchar_t *)filePath.utf16();
-		int length = wstr._Copy_s(fileName, filePath.length(), filePath.length());
-		doc = new PDFDoc(fileName, length, ownerPassword, userPassword);
-		delete[] fileName;
+		doc = new PDFDoc((wchar_t *)filePath.utf16(), filePath.length(), ownerPassword, userPassword);
 #else
 		GooString *fileName = new GooString(QFile::encodeName(filePath));
 		doc = new PDFDoc(fileName, ownerPassword, userPassword);
commit ddd91675792d9d496b06223867e05d2a190b878b
Author: Hib Eris <hib at hiberis.nl>
Date:   Thu May 29 16:58:55 2014 +0200

    Include stdio.h from poppler-config.h
    
    In poppler-config.h there is a check for __MINGW_PRINTF_FORMAT,
    which is set by stdio.h.
    
    This fixes this warning when compling with the mingw-w64-compiler:
    
    XRef.cc: In member function 'virtual void
    XRef::XRefTableWriter::writeEntry(Goffset, int, XRefEntryType)':
    XRef.cc:1460:94: warning: unknown conversion type character 'l' in format [-Wformat=]
        outStr->printf("%010lli %05i %c\r\n", (long long)offset, gen, (type==xrefEntryFree)?'f':'n');
    ^
    XRef.cc:1460:94: warning: format '%i' expects argument of type 'int', but argument 3 has type 'Goffset {aka long long int}' [-Wformat=]
    XRef.cc:1460:94: warning: too many arguments for format [-Wformat-extra-args]
    
    https://bugs.freedesktop.org/show_bug.cgi?id=79762

diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index 8715406..d26b7bf 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -23,6 +23,8 @@
 #ifndef POPPLER_CONFIG_H
 #define POPPLER_CONFIG_H
 
+#include <stdio.h>
+
 // We duplicate some of the config.h #define's here since they are
 // used in some of the header files we install.  The #ifndef/#endif
 // around #undef look odd, but it's to silence warnings about