Tk Source Code

Check-in [1597671a]
Login
Bounty program for improvements to Tcl and certain Tcl packages.

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

Overview
Comment:Support build against Tcl 9 headers.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | main
Files: files | file ages | folders
SHA3-256: 1597671a5e01ad99d27c65a530b6148cf62a846cd3e6e8ff7acc3c13ffb58dd6
User & Date: dgp 2020-12-10 19:22:38
Context
2020-12-11
08:56
TIP #591: Rotate ttk::notebook window with mousewheel on tab check-in: 16da36d6 user: jan.nijtmans tags: trunk, main
08:49
After TIP #481 reaches Tcl9.0, TkGetStringFromObj() becomes obsolete. This commit shows how. check-in: b5665222 user: jan.nijtmans tags: tip-481
2020-12-10
19:22
Support build against Tcl 9 headers. check-in: 1597671a user: dgp tags: trunk, main
14:48
Merge 8.6 check-in: 5db5c61e user: jan.nijtmans tags: trunk, main
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tkImgSVGnano.c.

187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
	return 0;
    }
    if (!Tcl_Eof(chan) && (Tcl_ReadChars(chan, dataObj, -1, 1) == TCL_IO_FAILURE)) {
	/* in case of an error reading the file */
	Tcl_DecrRefCount(dataObj);
	return 0;
    }
    data = Tcl_GetStringFromObj(dataObj, &length);
    nsvgImage = ParseSVGWithOptions(interp, data, length, formatObj, &ropts);
    Tcl_DecrRefCount(dataObj);
    if (nsvgImage != NULL) {
        GetScaleFromParameters(nsvgImage, &ropts, widthPtr, heightPtr);
        if ((*widthPtr <= 0.0) || (*heightPtr <= 0.0)) {
	    nsvgDelete(nsvgImage);
	    return 0;






|







187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
	return 0;
    }
    if (!Tcl_Eof(chan) && (Tcl_ReadChars(chan, dataObj, -1, 1) == TCL_IO_FAILURE)) {
	/* in case of an error reading the file */
	Tcl_DecrRefCount(dataObj);
	return 0;
    }
    data = TkGetStringFromObj(dataObj, &length);
    nsvgImage = ParseSVGWithOptions(interp, data, length, formatObj, &ropts);
    Tcl_DecrRefCount(dataObj);
    if (nsvgImage != NULL) {
        GetScaleFromParameters(nsvgImage, &ropts, widthPtr, heightPtr);
        if ((*widthPtr <= 0.0) || (*heightPtr <= 0.0)) {
	    nsvgDelete(nsvgImage);
	    return 0;