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 | core-8-5-branch |
| Files: | files | file ages | folders |
| SHA1: |
53c0922fea8c748f58a0e5db0bcba68c |
| User & Date: | jan.nijtmans 2012-01-25 22:06:29 |
Context
|
2012-01-26
| ||
| 07:20 | [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: fa26af8a user: fvogel tags: core-8-5-branch | |
|
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 | |
| 22:00 | Bug-2433260: non-critical error in Tk_PhotoPutBlock check-in: a2b769a6 user: jan.nijtmans tags: core-8-4-branch | |
| 21:33 | Don't increase the epoch twice. check-in: a26d55ff user: fvogel tags: core-8-5-branch | |
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.
| ︙ | ︙ | |||
4383 4384 4385 4386 4387 4388 4389 |
}
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
| | | | | 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 |
}
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.
*/
|
| ︙ | ︙ |