From fc0363196283264f821912af807e2507b8f0ab62 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Mon, 17 Jul 2000 23:03:20 +0000
Subject: * generic/tkStubImg.c (Tk_InitImageArgs): Applied patch from [Bug:
 5990], from Anselm Lingnau, which correctly sets the value of useNewImage to
 0 when the new image system is not to be used, instead of leaving it at -1,
 which causes the check to be performed more times than is really necessary.

---
 ChangeLog           | 6 ++++++
 generic/tkStubImg.c | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c12c380..9dd8116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-07-17  Eric Melski  <ericm@scriptics.com>
 
+	* generic/tkStubImg.c (Tk_InitImageArgs): Applied patch from [Bug:
+	5990], from Anselm Lingnau, which correctly sets the value of
+	useNewImage to 0 when the new image system is not to be used,
+	instead of leaving it at -1, which causes the check to be
+	performed more times than is really necessary.
+	
 	* library/bgerror.tcl: Fixed a typo in one of the bgerror dialog
 	label.
 
diff --git a/generic/tkStubImg.c b/generic/tkStubImg.c
index 7e1e23f..691bf78 100644
--- a/generic/tkStubImg.c
+++ b/generic/tkStubImg.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubImg.c,v 1.1 2000/02/08 11:31:33 hobbs Exp $
+ * RCS: @(#) $Id: tkStubImg.c,v 1.2 2000/07/17 23:03:20 ericm Exp $
  */
 
 #include "tcl.h"
@@ -61,6 +61,8 @@ Tk_InitImageArgs(interp, argc, argvPtr)
 	}
 	if (cmdInfo.isNativeObjectProc == 1) {
 	    useNewImage = 1; /* Tk uses the new image interface */
+	} else {
+	    useNewImage = 0; /* Tk uses old image interface */
 	}
     }
     if (useNewImage && (argc > 0)) {
-- 
cgit v0.12