liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3816 from Beep6581/cppcheck3

Browse Source 
Merged to get more tests. Additional fixes will follow.
This commit is contained in:
Ingo Weyrich
2017-04-09 23:58:07 +02:00
committed by GitHub
parent 8f1e2cee42 ffd80a96e2
commit 3ff2519302
41 changed files with 225 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/guiutils.cc
View File

@@ -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) {