Tk Source Code

Check-in [d266a4ff]
Login

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

Overview
Comment:Merge 8.6
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | core-9-0-branch
Files: files | file ages | folders
SHA3-256: d266a4ff6b7a50eec558ff19f7c00215a28873cd2914cb58e54cd31e369de9e6
User & Date: jan.nijtmans 2025-08-15 22:23:08.478
Context
2025-08-16
22:12
Fix [92e4081d74]: Undefined behavior while touchpad scrolling check-in: 07d632f4 user: jan.nijtmans tags: core-9-0-branch
15:55
Proposed fix (slightly modified) for [92e4081d74]: Undefined behavior while touchpad scrolling Closed-Leaf check-in: a4410a92 user: jan.nijtmans tags: bug-92e4081d74
01:33
Alternative fix for CreateCGImageFromDrawableRect() returning smaller image than requested. See [f215a9fdaa]. check-in: 84c2ba4f user: chrstphrchvz tags: bug-df4b603950-alt
2025-08-15
22:25
Merge 9.0 check-in: 031211db user: jan.nijtmans tags: trunk, main
22:23
Merge 8.6 check-in: d266a4ff user: jan.nijtmans tags: core-9-0-branch
22:18
version => 8.6.18 Leaf check-in: 84ea4dfd user: jan.nijtmans tags: core-8-6-branch
22:03
Merge 8.6 check-in: 452179cb user: jan.nijtmans tags: core-9-0-branch
Changes
Unified Diff Ignore Whitespace Patch
Changes to generic/tkImgPhoto.c.
4140
4141
4142
4143
4144
4145
4146



4147
4148
4149
4150
4151
4152
4153
				 * the image data is returned here. */
    struct SubcommandOptions *optPtr)
{
    unsigned char *pixelPtr;
    int x, y, greenOffset, blueOffset, alphaOffset;

    Tk_PhotoGetImage((Tk_PhotoHandle) modelPtr, blockPtr);



    blockPtr->pixelPtr += optPtr->fromY * blockPtr->pitch
	    + optPtr->fromX * blockPtr->pixelSize;
    blockPtr->width = optPtr->fromX2 - optPtr->fromX;
    blockPtr->height = optPtr->fromY2 - optPtr->fromY;

    if (!(modelPtr->flags & COLOR_IMAGE) &&
	    (!(optPtr->options & OPT_BACKGROUND)







>
>
>







4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
				 * the image data is returned here. */
    struct SubcommandOptions *optPtr)
{
    unsigned char *pixelPtr;
    int x, y, greenOffset, blueOffset, alphaOffset;

    Tk_PhotoGetImage((Tk_PhotoHandle) modelPtr, blockPtr);
    if (!blockPtr->pixelPtr) {
	return NULL;
    }
    blockPtr->pixelPtr += optPtr->fromY * blockPtr->pitch
	    + optPtr->fromX * blockPtr->pixelSize;
    blockPtr->width = optPtr->fromX2 - optPtr->fromX;
    blockPtr->height = optPtr->fromY2 - optPtr->fromY;

    if (!(modelPtr->flags & COLOR_IMAGE) &&
	    (!(optPtr->options & OPT_BACKGROUND)