From 9ecded6646c6fd2abf1d7af4b27025ceb195c7cb Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Thu, 27 Jan 2000 01:28:36 +0000
Subject: * generic/tkImgPhoto.c: Fixed bug with use of binary data for "-data"
option to "image create" command.
---
ChangeLog | 10 ++++++++++
generic/tkImgPhoto.c | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 754d848..7ab76b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2000-01-26 Eric Melski <ericm@scriptics.com>
+ * doc/getOpenFile.n:
+ * doc/chooseDirectory.n: Man page/cross links for
+ tk_chooseDirectory (bug #1786).
+
+ * library/tk.tcl:
+ * library/tclIndex: Added hooks for tk_chooseDirectory. (bug #1786)
+
+ * library/choosedir.tcl: tk_chooseDirectory implementation for
+ Unix/Mac (bug #1786).
+
* generic/tkImgPhoto.c: Added some comments regarding slow
processing of transparent images.
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 17b61eb..bad36fc 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.14 2000/01/26 21:11:00 ericm Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.15 2000/01/27 01:28:37 ericm Exp $
*/
#include "tkInt.h"
@@ -1671,7 +1671,7 @@ ImgPhotoConfigureMaster(interp, masterPtr, objc, objv, flags)
}
if (data) {
if (data->length
- || (data->typePtr == &tclByteArrayType
+ || (data->typePtr == Tcl_GetObjType("bytearray")
&& data->internalRep.otherValuePtr != NULL)) {
Tcl_IncrRefCount(data);
} else {
--
cgit v0.12