From fbc30002ab3438356c0476e70c4577a0310d52c0 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Tue, 21 Jul 2020 06:15:04 -0400
Subject: New upstream version 2.3.3+dfsg.

---
 src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp')

diff --git a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp
index 493b1e8..f6fed1c 100644
--- a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp
+++ b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp
@@ -122,8 +122,7 @@ XWindowsClipboardAnyBitmapConverter::getDataSize() const
     return 8;
 }
 
-String
-XWindowsClipboardAnyBitmapConverter::fromIClipboard(const String& bmp) const
+std::string XWindowsClipboardAnyBitmapConverter::fromIClipboard(const std::string& bmp) const
 {
     // fill BMP info header with native-endian data
     CBMPInfoHeader infoHeader;
@@ -145,7 +144,7 @@ XWindowsClipboardAnyBitmapConverter::fromIClipboard(const String& bmp) const
         infoHeader.biWidth == 0 || infoHeader.biHeight == 0 ||
         infoHeader.biPlanes != 0 || infoHeader.biCompression != 0 ||
         (infoHeader.biBitCount != 24 && infoHeader.biBitCount != 32)) {
-        return String();
+        return {};
     }
 
     // convert to image format
@@ -160,14 +159,13 @@ XWindowsClipboardAnyBitmapConverter::fromIClipboard(const String& bmp) const
     }
 }
 
-String
-XWindowsClipboardAnyBitmapConverter::toIClipboard(const String& image) const
+std::string XWindowsClipboardAnyBitmapConverter::toIClipboard(const std::string& image) const
 {
     // convert to raw BMP data
     UInt32 w, h, depth;
-    String rawBMP = doToIClipboard(image, w, h, depth);
+    std::string rawBMP = doToIClipboard(image, w, h, depth);
     if (rawBMP.empty() || w == 0 || h == 0 || (depth != 24 && depth != 32)) {
-        return String();
+        return {};
     }
 
     // fill BMP info header with little-endian data
@@ -186,6 +184,6 @@ XWindowsClipboardAnyBitmapConverter::toIClipboard(const String& image) const
     toLE(dst, static_cast<UInt32>(0));
 
     // construct image
-    return String(reinterpret_cast<const char*>(infoHeader),
-                            sizeof(infoHeader)) + rawBMP;
+    return std::string(reinterpret_cast<const char*>(infoHeader),
+                       sizeof(infoHeader)) + rawBMP;
 }
-- 
cgit v1.2.3