From a24b341aea75b8fc45356601d48ffd18ad94e92c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 15 Nov 2010 00:22:01 +0000 Subject: [PATCH] VC6 compilation fix in wxDIB::Create(). Deal with the lack of scope around variables declared inside the for loop in this compiler, previously it gave "error C2360: initialization of 'x' is skipped by 'case' label" message and also complained about redefinition of 'x'. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/dib.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index 23ed673d49..da8b42d1fc 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -688,12 +688,14 @@ bool wxDIB::Create(const wxImage& image, PixelFormat pf) unsigned char *dst = dstLineStart; if ( alpha ) { + int x; + switch ( pf ) { case PixelFormat_PreMultiplied: // Pre-multiply pixel values so that the DIB could be used // with ::AlphaBlend(). - for ( int x = 0; x < w; x++ ) + for ( x = 0; x < w; x++ ) { const unsigned char a = *alpha++; *dst++ = (unsigned char)((src[2] * a + 127) / 255); @@ -706,7 +708,7 @@ bool wxDIB::Create(const wxImage& image, PixelFormat pf) case PixelFormat_NotPreMultiplied: // Just copy pixel data without changing it. - for ( int x = 0; x < w; x++ ) + for ( x = 0; x < w; x++ ) { *dst++ = src[2]; *dst++ = src[1]; -- 2.49.0