[X2Go-Commits] [pale-moon] 35/294: Preserve transparency when copying a DIB to/from the clipboard.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit 77e1b07f3015ca5d5b3de99e9474efa4fb711b0c
Author: wolfbeast <mcwerewolf at wolfbeast.com>
Date:   Thu Feb 14 22:42:55 2019 +0100

    Preserve transparency when copying a DIB to/from the clipboard.
    
    In order to get the alpha channel when encoding BMP images from a
    surface, we need to supply bmp=32 in the encoder options.
---
 widget/windows/nsDataObj.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/widget/windows/nsDataObj.cpp b/widget/windows/nsDataObj.cpp
index ee2db7b..a19dcb1 100644
--- a/widget/windows/nsDataObj.cpp
+++ b/widget/windows/nsDataObj.cpp
@@ -921,7 +921,7 @@ nsDataObj::GetDib(const nsACString& inFlavor,
   if ( image ) {
     nsCOMPtr<imgITools> imgTools = do_CreateInstance("@mozilla.org/image/tools;1");
 
-    nsAutoString options;
+    nsAutoString options(NS_LITERAL_STRING("bpp=32;"));
     if (aFormat.cfFormat == CF_DIBV5) {
       options.AppendLiteral("version=5");
     } else {
@@ -1580,7 +1580,7 @@ HRESULT nsDataObj::DropImage(FORMATETC& aFE, STGMEDIUM& aSTG)
     nsCOMPtr<imgITools> imgTools = do_CreateInstance("@mozilla.org/image/tools;1");
     nsCOMPtr<nsIInputStream> inputStream;
     rv = imgTools->EncodeImage(image, NS_LITERAL_CSTRING(IMAGE_BMP),
-                               NS_LITERAL_STRING("version=3"),
+                               NS_LITERAL_STRING("bpp=32;version=3"),
                                getter_AddRefs(inputStream));
     if (NS_FAILED(rv) || !inputStream) {
       return E_FAIL;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git