Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bug 74115. r=saari sr=scc

Browse Source
This commit is contained in:
pavlov%netscape.com 2001-03-31 00:50:30 +00:00
parent 606918fcbb
commit 33588e041f
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gfx/src/gtk/nsImageGTK.cpp
View File

@ -353,23 +353,38 @@ nsImageGTK::DrawScaled(nsIRenderingContext &aContext, nsDrawingSurface aSurface,
PRInt32 aSX, PRInt32 aSY, PRInt32 aSWidth, PRInt32 aSHeight,
PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight)
{
if (aSX < mDecodedX1) {
aSWidth -= mDecodedX1 - aSX;
aDX += mDecodedX1 - aSX;
aSX += mDecodedX1 - aSX;
}
PRInt32 origSHeight = aSHeight, origDHeight = aDHeight;
PRInt32 origSWidth = aSWidth, origDWidth = aDWidth;
if (aSWidth < 0 || aDWidth < 0 || aSHeight < 0 || aDHeight < 0)
return NS_ERROR_FAILURE;
if (0 == aSWidth || 0 == aDWidth || 0 == aSHeight || 0 == aDHeight)
return NS_OK;
// limit the size of the blit to the amount of the image read in
if (aSX + aSWidth > mDecodedX2) {
aSWidth -= aSX + aSWidth - mDecodedX2;
aDWidth -= ((aSX + aSWidth - mDecodedX2)*origDWidth)/origSWidth;
aSWidth = mDecodedX2 - mDecodedX1;
}
if (aSX < mDecodedX1) {
aDX += ((mDecodedX1 - aSX)*origDWidth)/origSWidth;
aSX = mDecodedX1;
}
if (aSY + aSHeight > mDecodedY2) {
aDHeight -= ((aSY + aSHeight - mDecodedY2)*origDHeight)/origSHeight;
aSHeight = mDecodedY2 - mDecodedY1;
}
if (aSY < mDecodedY1) {
aSHeight -= mDecodedY1 - aSY;
aDY += mDecodedY1 - aSY;
aSY += mDecodedY1 - aSY;
}
if (aSY + aSHeight > mDecodedY2) {
aSHeight -= (aSY + aSHeight) - mDecodedY2;
aDY += ((mDecodedY1 - aSY)*origDHeight)/origSHeight;
aSY = mDecodedY1;
}
if ((aDWidth <= 0 || aDHeight <= 0) || (aSWidth <= 0 || aSHeight <= 0))
return NS_OK;
nsDrawingSurfaceGTK *drawing = (nsDrawingSurfaceGTK*)aSurface;
if (mAlphaDepth == 1) {