From 13ebbc81d1a13536e1451da9f5f85bcfed3f1a9e Mon Sep 17 00:00:00 2001 From: hobbs Date: Sat, 13 May 2006 00:48:36 +0000 Subject: * generic/tkImgPhoto.c (Tk_PhotoPutBlock, Tk_PhotoPutZoomedBlock): Fix opt added 2006-03 that caused slowdown for some common cases. [Bug 1409140] --- ChangeLog | 6 ++++++ generic/tkImgPhoto.c | 48 +++++++++++++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a0c0a1..4e35e38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-12 Jeff Hobbs + + * generic/tkImgPhoto.c (Tk_PhotoPutBlock, Tk_PhotoPutZoomedBlock): + Fix opt added 2006-03 that caused slowdown for some common cases. + [Bug 1409140] + 2006-05-13 Daniel Steffen * generic/tkCanvWind.c (DisplayWinItem, WinItemRequestProc): ensure diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index c6c5e2c..85d841b 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -17,7 +17,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPhoto.c,v 1.36.2.16 2006/03/16 00:42:55 dkf Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.36.2.17 2006/05/13 00:48:37 hobbs Exp $ */ #include "tkInt.h" @@ -4605,25 +4605,30 @@ Tk_PhotoPutBlock(handle, blockPtr, x, y, width, height, compRule) * Check if display code needs alpha blending... */ - if (!sourceIsSimplePhoto || masterPtr->flags & COMPLEX_ALPHA) { + if (!sourceIsSimplePhoto && (width == 1) && (height == 1)) { /* - * Note that we skip in the single pixel case if we can. This speeds - * up code that builds up large simple-alpha images by single pixels, - * which seems to be a common use-case. [Bug 1409140] + * Optimize the single pixel case if we can. This speeds up code that + * builds up large simple-alpha images by single pixels. We don't + * negate COMPLEX_ALPHA in this case. [Bug 1409140] */ - - if (width == 1 && height == 1 && !(masterPtr->flags & COMPLEX_ALPHA)) { + if (!(masterPtr->flags & COMPLEX_ALPHA)) { unsigned char newAlpha; destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4; newAlpha = destLinePtr[3]; - if (newAlpha > 0 && newAlpha < 255) { + if (newAlpha && newAlpha != 255) { masterPtr->flags |= COMPLEX_ALPHA; } - } else { - ToggleComplexAlphaIfNeeded(masterPtr); } + } else if ((alphaOffset != 0) || (masterPtr->flags & COMPLEX_ALPHA)) { + /* + * Check for partial transparency if alpha pixels are specified, or + * rescan if we already knew such pixels existed. To restrict this + * Toggle to only checking the changed pixels requires knowing where + * the alpha pixels are. + */ + ToggleComplexAlphaIfNeeded(masterPtr); } /* @@ -4919,25 +4924,30 @@ Tk_PhotoPutZoomedBlock(handle, blockPtr, x, y, width, height, zoomX, zoomY, * Check if display code needs alpha blending... */ - if (!sourceIsSimplePhoto || masterPtr->flags & COMPLEX_ALPHA) { + if (!sourceIsSimplePhoto && (width == 1) && (height == 1)) { /* - * Note that we skip in the single pixel case if we can. This speeds - * up code that builds up large simple-alpha images by single pixels, - * which seems to be a common use-case. [Bug 1409140] + * Optimize the single pixel case if we can. This speeds up code that + * builds up large simple-alpha images by single pixels. We don't + * negate COMPLEX_ALPHA in this case. [Bug 1409140] */ - - if (width == 1 && height == 1 && !(masterPtr->flags & COMPLEX_ALPHA)) { + if (!(masterPtr->flags & COMPLEX_ALPHA)) { unsigned char newAlpha; destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4; newAlpha = destLinePtr[3]; - if (newAlpha > 0 && newAlpha < 255) { + if (newAlpha && newAlpha != 255) { masterPtr->flags |= COMPLEX_ALPHA; } - } else { - ToggleComplexAlphaIfNeeded(masterPtr); } + } else if ((alphaOffset != 0) || (masterPtr->flags & COMPLEX_ALPHA)) { + /* + * Check for partial transparency if alpha pixels are specified, or + * rescan if we already knew such pixels existed. To restrict this + * Toggle to only checking the changed pixels requires knowing where + * the alpha pixels are. + */ + ToggleComplexAlphaIfNeeded(masterPtr); } /* -- cgit v0.12