Bug 523554 - Copy from GIMP to Word broken

2009-01-11  Tor Lillqvist  <tml@iki.fi>

	Bug 523554 - Copy from GIMP to Word broken

	* gdk/win32/gdkselection-win32.c
	(_gdk_win32_selection_convert_to_dib): The DIB stored in the
	Windows Clipboard was for some unknown reason truncated by one
	byte. Don't do that.

svn path=/trunk/; revision=22086

diff --git a/ChangeLog b/ChangeLog
index dd3ebc05cf7100f6fdbe25deaf3cc9dfbc108942..94e85c926b72026b5f723986f288c6eef7157654 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-11  Tor Lillqvist  <tml@iki.fi>
+
+       Bug 523554 - Copy from GIMP to Word broken
+
+       * gdk/win32/gdkselection-win32.c
+       (_gdk_win32_selection_convert_to_dib): The DIB stored in the
+       Windows Clipboard was for some unknown reason truncated by one
+       byte. Don't do that.
+
 2009-01-11  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 567024 – gtktoolbutton doesn't create right proxy menu item 

diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index fbbaebbf224161ba09686a94a84b84d34e40296b..5ae4425893ec71c0efe48d2296e99b9dc2e7a76a 100644 (file)
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -1175,7 +1175,7 @@ _gdk_win32_selection_convert_to_dib (HGLOBAL  hdata,
       HGLOBAL hdatanew;
 
       g_free (target_name);
-      size = GlobalSize (hdata) - 1 - sizeof (BITMAPFILEHEADER);
+      size = GlobalSize (hdata) - sizeof (BITMAPFILEHEADER);
       ptr = GlobalLock (hdata);
       memmove (ptr, ptr + sizeof (BITMAPFILEHEADER), size);
       GlobalUnlock (hdata);