Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vertical alpha adjustment in wxPixelData<wxImage>::Offset().

Browse Source 
Handle "y" parameter correctly when offsetting m_pAlpha, it was just ignored
before, i.e. Offset(x, y) and OffsetY(y) always behaved as if y were 1.
This commit is contained in:
Vadim Zeitlin
2015-04-01 14:20:10 +02:00
parent 2a13ad64d8
commit 62f8950e0e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -590,6 +590,7 @@ All (GUI):
- Fix handling of fast consecutive clicks in wxRibbonBar (atobi). - Fix handling of fast consecutive clicks in wxRibbonBar (atobi).
- Fix updating nested window scrollbars in some cases (sbrowne). - Fix updating nested window scrollbars in some cases (sbrowne).
- Fix wxPGChoices copy ctor (Snoits). - Fix wxPGChoices copy ctor (Snoits).
- Fix wxPixelData<wxImage>::Offset() for alpha (Markus Rollmann).
wxGTK: wxGTK:

4
include/wx/rawbmp.h
View File

@@ -381,7 +381,7 @@ struct wxPixelDataOut<wxImage>
{ {
m_pRGB += data.GetRowStride()*y + PixelFormat::SizePixel*x; m_pRGB += data.GetRowStride()*y + PixelFormat::SizePixel*x;
if ( m_pAlpha ) if ( m_pAlpha )
m_pAlpha += data.GetWidth() + x; m_pAlpha += data.GetWidth()*y + x;
} }
// move x pixels to the right (again, no row wrapping) // move x pixels to the right (again, no row wrapping)
@@ -397,7 +397,7 @@ struct wxPixelDataOut<wxImage>
{ {
m_pRGB += data.GetRowStride()*y; m_pRGB += data.GetRowStride()*y;
if ( m_pAlpha ) if ( m_pAlpha )
m_pAlpha += data.GetWidth(); m_pAlpha += data.GetWidth()*y;
} }
// go to the given position // go to the given position