From 58b48fa2091bea369674024e242e9d4944f01891 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 16 May 2014 12:07:01 +0800 Subject: [PATCH] gdkselection-win32.c: Declare Variables At Top Of Block ...so that builds on Visual C++ can be fixed. --- gdk/win32/gdkselection-win32.c | 9 ++++++--- 1 file 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);