diff options
| author | nijtmans <nijtmans> | 2008-11-12 01:19:27 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-11-12 01:19:27 (GMT) |
| commit | 04666d812c43d66a4289f50939d07f42e6cc9bc5 (patch) | |
| tree | ac2eb97641642127a10991ca2c3a1321840ea76d | |
| parent | a2f61dd482bfb6b338660093c7d65c0ee089028e (diff) | |
| download | tk-04666d812c43d66a4289f50939d07f42e6cc9bc5.zip tk-04666d812c43d66a4289f50939d07f42e6cc9bc5.tar.gz tk-04666d812c43d66a4289f50939d07f42e6cc9bc5.tar.bz2 | |
fix [Bug 2265860] new test failures
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | generic/tkImgPhoto.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2008-11-11 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tkImgPhoto.c Fix [Bug 2265860] new test failures + 2008-11-11 Joe English <jenglish@users.sourceforge.net> * generic/ttk/ttkWidget.c(BeginDrawing): Don't crash when diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 6213472..44a63fe 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -17,7 +17,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPhoto.c,v 1.86 2008/11/12 00:15:26 nijtmans Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.87 2008/11/12 01:19:27 nijtmans Exp $ */ #include "tkImgPhoto.h" @@ -2522,7 +2522,7 @@ Tk_FindPhoto( ClientData clientData = Tk_GetImageMasterData(interp, imageName, &typePtr); - if (typePtr != &tkPhotoImageType) { + if ((typePtr == NULL) || (typePtr->name != tkPhotoImageType.name)) { return NULL; } return clientData; |