[poppler] qt5/src qt6/src

[GitLab Mirror]

 qt5/src/poppler-qiodeviceoutstream.cc |    8 ++++----
 qt6/src/poppler-qiodeviceoutstream.cc |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 222f96edc379d94661f5cab4c22c8cc9122d6e21
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Jan 18 00:33:49 2021 +0100

    qt: Fix regression in QIODeviceOutStream + MSVC
    
    vsnprintf actually works fine than qvsnprintf on MSVC nowadays so use
    that

diff --git a/qt5/src/poppler-qiodeviceoutstream.cc b/qt5/src/poppler-qiodeviceoutstream.cc
index d6ee0cdb..13941914 100644
--- a/qt5/src/poppler-qiodeviceoutstream.cc
+++ b/qt5/src/poppler-qiodeviceoutstream.cc
@@ -1,7 +1,7 @@
 /* poppler-qiodevicestream.cc: Qt5 interface to poppler
  * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  * Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
- * Copyright (C) 2020 Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2020, 2021 Albert Astals Cid <aacid at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,11 +42,11 @@ void QIODeviceOutStream::put(char c)
     m_device->putChar(c);
 }
 
-static int poppler_qvasprintf(char **buf_ptr, const char *format, va_list ap)
+static int poppler_vasprintf(char **buf_ptr, const char *format, va_list ap)
 {
     va_list ap_copy;
     va_copy(ap_copy, ap);
-    const size_t size = qvsnprintf(nullptr, 0, format, ap_copy) + 1;
+    const size_t size = vsnprintf(nullptr, 0, format, ap_copy) + 1;
     va_end(ap_copy);
     *buf_ptr = new char[size];
 
@@ -58,7 +58,7 @@ void QIODeviceOutStream::printf(const char *format, ...)
     va_list ap;
     va_start(ap, format);
     char *buf;
-    const size_t bufsize = poppler_qvasprintf(&buf, format, ap);
+    const size_t bufsize = poppler_vasprintf(&buf, format, ap);
     va_end(ap);
     m_device->write(buf, bufsize);
     delete[] buf;
diff --git a/qt6/src/poppler-qiodeviceoutstream.cc b/qt6/src/poppler-qiodeviceoutstream.cc
index c9c61e33..171f7399 100644
--- a/qt6/src/poppler-qiodeviceoutstream.cc
+++ b/qt6/src/poppler-qiodeviceoutstream.cc
@@ -1,7 +1,7 @@
 /* poppler-qiodevicestream.cc: Qt6 interface to poppler
  * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  * Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
- * Copyright (C) 2020 Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2020, 2021 Albert Astals Cid <aacid at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,11 +42,11 @@ void QIODeviceOutStream::put(char c)
     m_device->putChar(c);
 }
 
-static int poppler_qvasprintf(char **buf_ptr, const char *format, va_list ap)
+static int poppler_vasprintf(char **buf_ptr, const char *format, va_list ap)
 {
     va_list ap_copy;
     va_copy(ap_copy, ap);
-    const size_t size = qvsnprintf(nullptr, 0, format, ap_copy) + 1;
+    const size_t size = vsnprintf(nullptr, 0, format, ap_copy) + 1;
     va_end(ap_copy);
     *buf_ptr = new char[size];
 
@@ -58,7 +58,7 @@ void QIODeviceOutStream::printf(const char *format, ...)
     va_list ap;
     va_start(ap, format);
     char *buf;
-    const size_t bufsize = poppler_qvasprintf(&buf, format, ap);
+    const size_t bufsize = poppler_vasprintf(&buf, format, ap);
     va_end(ap);
     m_device->write(buf, bufsize);
     delete[] buf;