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

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:15:11 +02:00
parent 2349bce2c4
commit ffd2857571

View File

@@ -372,7 +372,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)
@@ -388,7 +388,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