Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Bug-2433260: non-critical error in Tk_PhotoPutBlock |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
b2a3d1b59cbecf55012b5336272064ce |
| User & Date: | jan.nijtmans 2012-01-25 22:07:33 |
Context
|
2012-01-26
| ||
| 07:21 | [Bug-1754043] and [Bug-2321450]: When -blockcursor is true, the cursor appears as a blinking bar which expands to the right edge of the widget. check-in: 45e345b1 user: fvogel tags: trunk | |
|
2012-01-25
| ||
| 22:07 | Bug-2433260: non-critical error in Tk_PhotoPutBlock check-in: b2a3d1b5 user: jan.nijtmans tags: trunk | |
| 22:06 | Bug-2433260: non-critical error in Tk_PhotoPutBlock check-in: 53c0922f user: jan.nijtmans tags: core-8-5-branch | |
| 21:35 | Don't increase the epoch twice. check-in: 16d8b47d user: fvogel tags: trunk | |
Changes
Changes to ChangeLog.
1 2 3 4 5 6 7 | 2012-01-25 Francois Vogel <[email protected]> * generic/tkText.c: Don't increase the epoch twice 2012-01-25 Francois Vogel <[email protected]> * generic/tkText.c: [Bug-1630271]: segfault/infinite loop | > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 | 2012-01-25 Jan Nijtmans <[email protected]> * generic/tkImgPhoto.c: [Bug 2433260]: non-critical error in Tk_PhotoPutBlock 2012-01-25 Francois Vogel <[email protected]> * generic/tkText.c: Don't increase the epoch twice 2012-01-25 Francois Vogel <[email protected]> * generic/tkText.c: [Bug-1630271]: segfault/infinite loop |
| ︙ | ︙ |
Changes to generic/tkImgPhoto.c.
| ︙ | ︙ | |||
2678 2679 2680 2681 2682 2683 2684 |
}
if ((greenOffset != 0) || (blueOffset != 0)) {
masterPtr->flags |= COLOR_IMAGE;
}
/*
* Copy the data into our local 32-bit/pixel array. If we can do it with a
| | | | | 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 |
}
if ((greenOffset != 0) || (blueOffset != 0)) {
masterPtr->flags |= COLOR_IMAGE;
}
/*
* Copy the data into our local 32-bit/pixel array. If we can do it with a
* single memmove, we do.
*/
destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
pitch = masterPtr->width * 4;
/*
* Test to see if we can do the whole write in a single copy. This test is
* probably too restrictive. We should also be able to do a memmove if
* pixelSize == 3 and alphaOffset == 0. Maybe other cases too.
*/
if ((blockPtr->pixelSize == 4)
&& (greenOffset == 1) && (blueOffset == 2) && (alphaOffset == 3)
&& (width <= blockPtr->width) && (height <= blockPtr->height)
&& ((height == 1) || ((x == 0) && (width == masterPtr->width)
&& (blockPtr->pitch == pitch)))
&& (compRule == TK_PHOTO_COMPOSITE_SET)) {
memmove(destLinePtr, blockPtr->pixelPtr + blockPtr->offset[0],
(size_t) (height * width * 4));
/*
* We know there's an alpha offset and we're setting the data, so skip
* directly to the point when we recompute the photo validity region.
*/
|
| ︙ | ︙ |