Paul Cornett 70ef1e192d Index: src/generic/graphicc.cpp ...

===================================================================
--- src/generic/graphicc.cpp	(revision 76007)
+++ src/generic/graphicc.cpp	(working copy)
@@ -1569,12 +1569,13 @@
             {
                 const wxUint32 argb = *src++;
 
-                *alpha++ = (argb & 0xff000000) >> 24;
+                const unsigned char a = argb >> 24;
+                *alpha++ = a;
 
                 // Copy the RGB data undoing the pre-multiplication.
-                *dst++ = Unpremultiply(*alpha, (argb & 0x00ff0000) >> 16);
-                *dst++ = Unpremultiply(*alpha, (argb & 0x0000ff00) >>  8);
-                *dst++ = Unpremultiply(*alpha, (argb & 0x000000ff));
+                *dst++ = Unpremultiply(a, argb >> 16);
+                *dst++ = Unpremultiply(a, argb >>  8);
+                *dst++ = Unpremultiply(a, argb);
             }
 
             src = rowStart + stride;


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

2014-02-25 17:38:34 +00:00

..

aui

native GTK3 implementation for DrawSash()

2014-02-24 01:00:24 +00:00

cocoa

Fix assorted typos in comments and other non-code.

2013-09-17 15:25:59 +00:00

common

Always initialize values returned from wxGDDC::GetChar{Width,Height}().

2014-02-22 22:40:03 +00:00

dfb

Just deprecate but don't schedule for removal wxNORMAL and friends.

2014-01-06 12:42:37 +00:00

expat

Remove all lines containing cvs/svn "$Id$" keyword.

2013-07-26 16:02:46 +00:00

generic

Index: src/generic/graphicc.cpp

2014-02-25 17:38:34 +00:00

gtk

add support for wxDD_DIR_MUST_EXIST, closes #16002

2014-02-24 06:44:49 +00:00

gtk1

Just deprecate but don't schedule for removal wxNORMAL and friends.

2014-01-06 12:42:37 +00:00

html

Speed up wxHtmlHelpWindow startup time by freezing font choices.

2014-02-17 23:53:20 +00:00

jpeg

Remove the long obsolete and unused since 2.7.0 __WIN95__ define.

2013-07-13 23:23:19 +00:00

motif

Allow initializing wxScopedArray more conveniently.

2013-12-31 14:03:34 +00:00

msdos

Remove all lines containing cvs/svn "$Id$" keyword.

2013-07-26 16:02:46 +00:00

msw

Fix font size when using wxGraphicsContext with wxPrinterDC in wxMSW.

2014-02-25 17:26:48 +00:00

os2

Just deprecate but don't schedule for removal wxNORMAL and friends.

2014-01-06 12:42:37 +00:00

osx

using old code for carbon only, new code for cocoa, fixing doubly apply flip of y axis

2014-02-24 08:17:15 +00:00

png

Merge libpng 1.6.2 into the trunk.

2013-07-07 17:44:15 +00:00

propgrid

Fix several rounding problems with float values in wxPropertyGrid.

2014-02-22 14:54:54 +00:00

regex

Remove all lines containing cvs/svn "$Id$" keyword.

2013-07-26 16:02:46 +00:00

ribbon

Fix memory leak in wxRibbonToolBar in case of error.

2014-02-21 00:51:58 +00:00

richtext

Fix handling of wxTEXT_ATTR_EFFECT_SMALL_CAPITALS in wxRichTextFontPage.

2014-02-17 23:53:01 +00:00

stc

Expose ScintillaWX DoDragEnter() and DoDragLeave() methods.

2014-02-22 14:54:39 +00:00

tiff

Remove all lines containing cvs/svn "$Id$" keyword.

2013-07-26 16:02:46 +00:00

univ

Merge the changes from 3.0 branch.

2013-11-12 18:06:37 +00:00

unix

Don't show "deleted stale lock file" message by default.

2014-02-08 00:46:54 +00:00

x11

Just deprecate but don't schedule for removal wxNORMAL and friends.

2014-01-06 12:42:37 +00:00

xml

remove executable property from non-executable files, closes #15504

2013-09-16 15:47:27 +00:00

xrc

Remove confusing delete from wxIdRangeManager dtor.

2014-02-22 22:39:56 +00:00

zlib

Upgrade bundled zlib to 1.2.8.

2013-10-01 16:08:25 +00:00