Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge 9.0 |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk | main |
| Files: | files | file ages | folders |
| SHA3-256: |
031211db5a16dd78a19bdc173f184996 |
| User & Date: | jan.nijtmans 2025-08-15 22:25:29.230 |
Context
|
2025-08-16
| ||
| 22:24 | Merge 9.0 check-in: e0a88b0c user: jan.nijtmans tags: trunk, main | |
| 07:43 | Ticket [9ba9729ef1]: text complements for man winfo and man send check-in: 731a5957 user: erikleunissen tags: bug-9ba9729ef1 | |
|
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 | |
|
2025-08-13
| ||
| 14:04 | Merge 9.0 check-in: 6242b4c1 user: jan.nijtmans tags: trunk, main | |
Changes
Changes to generic/tkImgPhoto.c.
| ︙ | ︙ | |||
4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 |
* 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)
| > > > | 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 |
* 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)
|
| ︙ | ︙ |
Changes to macosx/tkMacOSXInit.c.
| ︙ | ︙ | |||
268 269 270 271 272 273 274 |
* Apple never released macOS 10.16. To work around this we guess the
* OS version from the kernel release number, as reported by uname.
*/
struct utsname name;
char *endptr;
if (uname(&name) == 0) {
| | > > > | 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 |
* Apple never released macOS 10.16. To work around this we guess the
* OS version from the kernel release number, as reported by uname.
*/
struct utsname name;
char *endptr;
if (uname(&name) == 0) {
majorVersion = (int)strtol(name.release, &endptr, 10) + 1;
if (majorVersion < 26) {
majorVersion -= 10;
}
minorVersion = 0;
}
}
[NSApp setMacOSVersion: 10000*majorVersion + 100*minorVersion];
/*
* Be our own delegate.
|
| ︙ | ︙ |