Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 03:24:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1301136 - fix buggy pixel offset in DrawTargetSkia VerifyRGBXCorners. r=me

Browse Source 
MozReview-Commit-ID: KIksLQ44JfA
This commit is contained in:
Lee Salzman 2016-09-28 19:20:13 -04:00
parent ee329d7b88
commit c09d407ee8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/2d/DrawTargetSkia.cpp
View File

@ -180,28 +180,28 @@ VerifyRGBXCorners(uint8_t* aData, const IntSize &aSize, const int32_t aStride, S
const int strideDiff = aStride - (width * pixelSize);
MOZ_ASSERT(width * pixelSize <= aStride);
const int topLeft = kARGBAlphaOffset;
const int topRight = width * pixelSize + kARGBAlphaOffset - pixelSize;
const int bottomRight = aStride * height - strideDiff + kARGBAlphaOffset - pixelSize;
const int bottomLeft = aStride * height - aStride + kARGBAlphaOffset;
const int topLeft = 0;
const int topRight = width * pixelSize - pixelSize;
const int bottomRight = aStride * height - strideDiff - pixelSize;
const int bottomLeft = aStride * height - aStride;
// Lastly the center pixel
int middleRowHeight = height / 2;
int middleRowWidth = (width / 2) * pixelSize;
const int middle = aStride * middleRowHeight + middleRowWidth + kARGBAlphaOffset;
const int middle = aStride * middleRowHeight + middleRowWidth;
const int offsets[] = { topLeft, topRight, bottomRight, bottomLeft, middle };
for (size_t i = 0; i < MOZ_ARRAY_LENGTH(offsets); i++) {
int offset = offsets[i];
if (aData[offset] != 0xFF) {
if (aData[offset + kARGBAlphaOffset] != 0xFF) {
int row = offset / aStride;
int column = (offset % aStride) / pixelSize;
gfxCriticalError() << "RGBX corner pixel at (" << column << "," << row << ") in "
<< width << "x" << height << " surface is not opaque: "
<< int(aData[column]) << ","
<< int(aData[column+1]) << ","
<< int(aData[column+2]) << ","
<< int(aData[column+3]);
<< int(aData[offset]) << ","
<< int(aData[offset+1]) << ","
<< int(aData[offset+2]) << ","
<< int(aData[offset+3]);
}
}