Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Couple of crash fixes to DrawComposited* suggested by

Browse Source 
pavlov and bryner@uiuc.edu.


git-svn-id: svn://10.0.0.236/trunk@68878 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tor%cs.brown.edu
2000-05-09 20:56:34 +00:00
parent 7a36b968bd
commit cb783928c7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/gfx/src/gtk/nsImageGTK.cpp
View File

@@ -627,12 +627,12 @@ nsImageGTK::DrawCompositedGeneral(PRBool isLSB, PRBool flipBytes,
}
// now composite
for (int y=0; y<mHeight; y++) {
unsigned char *targetRow = readData+3*y*mWidth;
for (int y=0; y<height; y++) {
unsigned char *targetRow = readData+3*y*width;
unsigned char *imageRow = mImageBits +(y+offsetY)*mRowBytes+3*offsetX;
unsigned char *alphaRow = mAlphaBits +(y+offsetY)*mAlphaRowBytes+offsetX;
for (int i=0; i<mWidth; i++) {
for (int i=0; i<width; i++) {
targetRow[3*i] = (unsigned(targetRow[3*i])*(255-alphaRow[i]) +
unsigned(imageRow[3*i])*alphaRow[i])>>8;
targetRow[3*i+1] = (unsigned(targetRow[3*i+1])*(255-alphaRow[i]) +
@@ -669,6 +669,11 @@ nsImageGTK::DrawComposited(nsIRenderingContext &aContext,
readX = aX; readY = aY;
destX = 0; destY = 0;
if ((readY>=surfaceHeight) || (readX>=surfaceWidth)) {
// This should never happen if the layout engine is sane,
// but pavlov says he saw it. Bulletproof gfx for now...
return;
}
if (readY<0) {
destY = -readY;
readY = 0;