summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2014-05-16 12:07:01 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2014-05-16 12:23:52 +0800
commitd917bdc836821fc57abdc9f9b6d839de029a2615 (patch)
treed4fee54abbfcae4c78d752d7ab7e8392396b5179
parent84f6eefec832f1c7e24edca22e53945140167656 (diff)
downloadgtk+-d917bdc836821fc57abdc9f9b6d839de029a2615.tar.gz
gdkselection-win32.c: Declare Variables At Top Of Block
...so that builds on Visual C++ can be fixed.
-rw-r--r--gdk/win32/gdkselection-win32.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index 8c54240782..2bb7ffd7c8 100644
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -1285,12 +1285,15 @@ _gdk_win32_selection_convert_to_dib (HGLOBAL hdata,
if (target == _image_bmp)
{
+ HGLOBAL hdatanew;
+ SIZE_T size;
+ guchar *ptr;
+
g_return_val_if_fail (GlobalSize (hdata) >= sizeof (BITMAPFILEHEADER), NULL);
/* No conversion is needed, just strip the BITMAPFILEHEADER */
- HGLOBAL hdatanew;
- SIZE_T size = GlobalSize (hdata) - sizeof (BITMAPFILEHEADER);
- guchar *ptr = GlobalLock (hdata);
+ size = GlobalSize (hdata) - sizeof (BITMAPFILEHEADER);
+ ptr = GlobalLock (hdata);
memmove (ptr, ptr + sizeof (BITMAPFILEHEADER), size);
GlobalUnlock (hdata);