diff options
author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-01-25 22:07:33 (GMT) |
---|---|---|
committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-01-25 22:07:33 (GMT) |
commit | 903df9eb192211c4e951d0ba38247f07da3a6cbe (patch) | |
tree | d3d3d3f7e0691e127c233bce6fb18386d26d6b28 /generic | |
parent | d0907b7db4c752d587b508f2dacf6761f8eb203d (diff) | |
parent | a11f5f7fbf58e795c67a33dce5a81c36907bda2b (diff) | |
download | tk-903df9eb192211c4e951d0ba38247f07da3a6cbe.zip tk-903df9eb192211c4e951d0ba38247f07da3a6cbe.tar.gz tk-903df9eb192211c4e951d0ba38247f07da3a6cbe.tar.bz2 |
Bug-2433260: non-critical error in Tk_PhotoPutBlock
FossilOrigin-Name: b2a3d1b59cbecf55012b5336272064ce52ac918f
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkImgPhoto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index a833e29..7d8bf0d 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -2682,7 +2682,7 @@ Tk_PhotoPutBlock( /* * Copy the data into our local 32-bit/pixel array. If we can do it with a - * single memcpy, we do. + * single memmove, we do. */ destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4; @@ -2690,7 +2690,7 @@ Tk_PhotoPutBlock( /* * 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 memcpy if + * probably too restrictive. We should also be able to do a memmove if * pixelSize == 3 and alphaOffset == 0. Maybe other cases too. */ @@ -2700,7 +2700,7 @@ Tk_PhotoPutBlock( && ((height == 1) || ((x == 0) && (width == masterPtr->width) && (blockPtr->pitch == pitch))) && (compRule == TK_PHOTO_COMPOSITE_SET)) { - memcpy(destLinePtr, blockPtr->pixelPtr + blockPtr->offset[0], + memmove(destLinePtr, blockPtr->pixelPtr + blockPtr->offset[0], (size_t) (height * width * 4)); /* |