Tk Source Code

Check-in [4a4cce3d]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Eliminate empty if() statement, if DEBUG_LAYOUT_WITH_BASE_CHUNKS is not defined. (backported from androwish. Thanks, Christian!)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-6-branch
Files: files | file ages | folders
SHA1: 4a4cce3d79ca0945f2fe46f2148b973a248b8f8d
User & Date: jan.nijtmans 2017-05-19 13:33:54
Context
2017-05-20
18:51
Bug-fix [434d294df] continuation: fix logic error detected by Christian Werner. Thanks! check-in: 9ab129aa user: jan.nijtmans tags: core-8-6-branch
2017-05-19
13:35
merge core-8-6-branch check-in: 5c5f5864 user: jan.nijtmans tags: rfe-6c0d7aec67
13:33
Eliminate empty if() statement, if DEBUG_LAYOUT_WITH_BASE_CHUNKS is not defined. (backported from androwish. Thanks, Christian!) check-in: 4a4cce3d user: jan.nijtmans tags: core-8-6-branch
12:56
Change internal field TkFontAttributes.size from type integer to double. This causes less roundings overall in various font calculations. Hopefully this fixes bug [434d294df], still to be confirmed, and makes Tk work again on modern Linux Mint/Fedora systems. check-in: 6c1859a0 user: jan.nijtmans tags: core-8-6-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tkTextDisp.c.

8977
8978
8979
8980
8981
8982
8983

8984
8985
8986
8987
8988
8989
8990

8991
8992
8993
8994
8995
8996
8997

    /*
     * Remove the chunk data from the base chunk data.
     */

    bciPtr = baseCharChunkPtr->clientData;


    if ((ciPtr->baseOffset + ciPtr->numBytes)
	    != Tcl_DStringLength(&bciPtr->baseChars)) {
#ifdef DEBUG_LAYOUT_WITH_BASE_CHUNKS
	fprintf(stderr,"RemoveFromBaseChunk called with wrong chunk "
		"(not last)\n");
#endif
    }


    Tcl_DStringSetLength(&bciPtr->baseChars, ciPtr->baseOffset);

    /*
     * Invalidate the stored pixel width of the base chunk.
     */








>


<


<

>







8977
8978
8979
8980
8981
8982
8983
8984
8985
8986

8987
8988

8989
8990
8991
8992
8993
8994
8995
8996
8997

    /*
     * Remove the chunk data from the base chunk data.
     */

    bciPtr = baseCharChunkPtr->clientData;

#ifdef DEBUG_LAYOUT_WITH_BASE_CHUNKS
    if ((ciPtr->baseOffset + ciPtr->numBytes)
	    != Tcl_DStringLength(&bciPtr->baseChars)) {

	fprintf(stderr,"RemoveFromBaseChunk called with wrong chunk "
		"(not last)\n");

    }
#endif

    Tcl_DStringSetLength(&bciPtr->baseChars, ciPtr->baseOffset);

    /*
     * Invalidate the stored pixel width of the base chunk.
     */