From c8a3f6f325bfd89ded61d6b1c9d88bdb012e90b1 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 8 Nov 2013 09:16:05 +0000 Subject: Since fontCache is the first field of struct TkFontInfo, make the code somewhat better readable. But actually it's no change at all. This is my only review comment! Good work! --- generic/tkFont.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/generic/tkFont.c b/generic/tkFont.c index 27cd4af..cbc4cf4 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -1094,7 +1094,7 @@ Tk_AllocFontFromObj( NamedFont *nfPtr; if (objPtr->typePtr != &tkFontObjType - || objPtr->internalRep.twoPtrValue.ptr2 != &fiPtr->fontCache) { + || objPtr->internalRep.twoPtrValue.ptr2 != fiPtr) { SetFontFromAny(interp, objPtr); } @@ -1134,7 +1134,7 @@ Tk_AllocFontFromObj( fontPtr->resourceRefCount++; fontPtr->objRefCount++; objPtr->internalRep.twoPtrValue.ptr1 = fontPtr; - objPtr->internalRep.twoPtrValue.ptr2 = &fiPtr->fontCache; + objPtr->internalRep.twoPtrValue.ptr2 = fiPtr; return (Tk_Font) fontPtr; } } @@ -1245,7 +1245,7 @@ Tk_AllocFontFromObj( } objPtr->internalRep.twoPtrValue.ptr1 = fontPtr; - objPtr->internalRep.twoPtrValue.ptr2 = &fiPtr->fontCache; + objPtr->internalRep.twoPtrValue.ptr2 = fiPtr; return (Tk_Font) fontPtr; } @@ -1279,7 +1279,7 @@ Tk_GetFontFromObj( Tcl_HashEntry *hashPtr; if (objPtr->typePtr != &tkFontObjType - || objPtr->internalRep.twoPtrValue.ptr2 != &fiPtr->fontCache) { + || objPtr->internalRep.twoPtrValue.ptr2 != fiPtr) { SetFontFromAny(NULL, objPtr); } @@ -1315,7 +1315,7 @@ Tk_GetFontFromObj( if (Tk_Screen(tkwin) == fontPtr->screen) { fontPtr->objRefCount++; objPtr->internalRep.twoPtrValue.ptr1 = fontPtr; - objPtr->internalRep.twoPtrValue.ptr2 = &fiPtr->fontCache; + objPtr->internalRep.twoPtrValue.ptr2 = fiPtr; return (Tk_Font) fontPtr; } } -- cgit v0.12