* 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.

2 files changed, 9 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 70ca35b..648f4d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-18  Eric Melski  <ericm@ajubasolutions.com>
+
+	* 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.
+
 2000-08-10  Jeff Hobbs  <hobbs@scriptics.com>
 
 	* doc/SetOptions.3: added missing ')'.
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;
 }