diff options
| author |   Unit 193 <unit193@unit193.net> | 2020-07-21 06:15:04 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2020-07-21 06:15:04 -0400 |
| commit | fbc30002ab3438356c0476e70c4577a0310d52c0 (patch) | |
| tree | 62b4c241ad0b2a65b0e430b9f7710ed944d30fb1 /src/lib/platform/MSWindowsClipboardBitmapConverter.cpp | |
| parent | dff8b887edf10407f22aaab9d147948cd5491f0a (diff) | |
New upstream version 2.3.3+dfsg.upstream/2.3.3+dfsg
Diffstat (limited to 'src/lib/platform/MSWindowsClipboardBitmapConverter.cpp')
| -rw-r--r-- | src/lib/platform/MSWindowsClipboardBitmapConverter.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp b/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp index 16bd4bf..7d38fda 100644 --- a/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp +++ b/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp @@ -46,8 +46,7 @@ MSWindowsClipboardBitmapConverter::getWin32Format() const return CF_DIB; } -HANDLE -MSWindowsClipboardBitmapConverter::fromIClipboard(const String& data) const +HANDLE MSWindowsClipboardBitmapConverter::fromIClipboard(const std::string& data) const { // copy to memory handle HGLOBAL gData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, data.size()); @@ -67,13 +66,12 @@ MSWindowsClipboardBitmapConverter::fromIClipboard(const String& data) const return gData; } -String -MSWindowsClipboardBitmapConverter::toIClipboard(HANDLE data) const +std::string MSWindowsClipboardBitmapConverter::toIClipboard(HANDLE data) const { // get datator LPVOID src = GlobalLock(data); if (src == NULL) { - return String(); + return {}; } UInt32 srcSize = (UInt32)GlobalSize(data); @@ -85,7 +83,7 @@ MSWindowsClipboardBitmapConverter::toIClipboard(HANDLE data) const bitmap->bmiHeader.biBitCount == 32) && bitmap->bmiHeader.biCompression == BI_RGB) { // already in canonical form - String image(static_cast<char const*>(src), srcSize); + std::string image(static_cast<char const*>(src), srcSize); GlobalUnlock(data); return image; } @@ -138,7 +136,7 @@ MSWindowsClipboardBitmapConverter::toIClipboard(HANDLE data) const GdiFlush(); // extract data - String image((const char*)&info, info.biSize); + std::string image((const char*)&info, info.biSize); image.append((const char*)raw, 4 * w * h); // clean up GDI |