diff options
| author | ericm <ericm> | 2000-07-17 23:03:20 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-07-17 23:03:20 (GMT) |
| commit | fc0363196283264f821912af807e2507b8f0ab62 (patch) | |
| tree | ba13ea841630089a796fe351551b0c4b8357cd05 | |
| parent | 5639e25fb3edd0cddd18009ca67ada39ec3bbb56 (diff) | |
| download | tk-fc0363196283264f821912af807e2507b8f0ab62.zip tk-fc0363196283264f821912af807e2507b8f0ab62.tar.gz tk-fc0363196283264f821912af807e2507b8f0ab62.tar.bz2 | |
* 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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tkStubImg.c | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -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)) { |