summaryrefslogtreecommitdiffstats
path: root/generic/tkImgPhoto.c
diff options
context:
space:
mode:
authorericm <ericm>2000-08-18 17:02:09 (GMT)
committerericm <ericm>2000-08-18 17:02:09 (GMT)
commitc2853ac1040fa766ea6e792bbae97bad222308d6 (patch)
tree435473e0b617d11fd0cf04e9400b65bc95c0e2c4 /generic/tkImgPhoto.c
parentf3ec4667ce22197fbec6fdc451d7421a7a3562ec (diff)
downloadtk-c2853ac1040fa766ea6e792bbae97bad222308d6.zip
tk-c2853ac1040fa766ea6e792bbae97bad222308d6.tar.gz
tk-c2853ac1040fa766ea6e792bbae97bad222308d6.tar.bz2
* generic/tkImgPhoto.c (ImgPhotoGet): Removed redundant call to
DitherInstance; this call was formerly being made from ImgPhotoGet->ImgPhotoConfigureInstance->DitherInstance, and ImgPhotoGet->DitherInstance. The second call was removed.
Diffstat (limited to 'generic/tkImgPhoto.c')
-rw-r--r--generic/tkImgPhoto.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index e3aad9f..2547aba 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -15,7 +15,7 @@
* Department of Computer Science,
* Australian National University.
*
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.18 2000/04/25 01:03:06 hobbs Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.19 2000/08/18 17:02:10 ericm Exp $
*/
#include "tkInt.h"
@@ -2123,6 +2123,7 @@ ImgPhotoGet(tkwin, masterData)
/*
* Set configuration options and finish the initialization of the instance.
+ * This will also dither the image if necessary.
*/
ImgPhotoConfigureInstance(instancePtr);
@@ -2136,16 +2137,6 @@ ImgPhotoGet(tkwin, masterData)
masterPtr->width, masterPtr->height);
}
- /*
- * Dither the image to fill in this instance's pixmap.
- */
-
- TkClipBox(masterPtr->validRegion, &validBox);
- if ((validBox.width > 0) && (validBox.height > 0)) {
- DitherInstance(instancePtr, validBox.x, validBox.y, validBox.width,
- validBox.height);
- }
-
return (ClientData) instancePtr;
}