Merge pull request #3816 from Beep6581/cppcheck3
Merged to get more tests. Additional fixes will follow.
This commit is contained in:
@@ -1454,8 +1454,6 @@ bool BackBuffer::setDrawRectangle(Cairo::Format format, int newX, int newY, int
|
||||
*/
|
||||
void BackBuffer::copyRGBCharData(const unsigned char *srcData, int srcX, int srcY, int srcW, int srcH, int srcRowStride, int dstX, int dstY)
|
||||
{
|
||||
const unsigned char *src;
|
||||
unsigned char *dst;
|
||||
unsigned char r, g, b;
|
||||
|
||||
if (!surface) {
|
||||
@@ -1477,8 +1475,8 @@ void BackBuffer::copyRGBCharData(const unsigned char *srcData, int srcX, int src
|
||||
break;
|
||||
}
|
||||
|
||||
src = srcData + i * srcRowStride;
|
||||
dst = dstData + ((dstY + i) * surfW + dstX) * 4;
|
||||
const unsigned char *src = srcData + i * srcRowStride;
|
||||
unsigned char *dst = dstData + ((dstY + i) * surfW + dstX) * 4;
|
||||
|
||||
for (int j = 0; j < srcW; ++j) {
|
||||
if (dstX + j >= surfW) {
|
||||
|
Reference in New Issue
Block a user