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

Merge branch 'dev' into spot-removal-tool

Browse Source
This commit is contained in:
Hombre
2019-08-06 15:19:38 +02:00
parent 0db64d49a2 972d6907d5
commit e3052c67e2
16 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/image16.cc
View File

@@ -74,7 +74,7 @@ void Image16::getScanline(int row, unsigned char* buffer, int bps, bool isFloat)
}
}
void Image16::setScanline(int row, unsigned char* buffer, int bps, unsigned int numSamples)
void Image16::setScanline(int row, const unsigned char* buffer, int bps, unsigned int numSamples)
{
if (data == nullptr) {
@@ -101,7 +101,7 @@ void Image16::setScanline(int row, unsigned char* buffer, int bps, unsigned int
}
case (IIOSF_UNSIGNED_SHORT): {
unsigned short* sbuffer = (unsigned short*) buffer;
const unsigned short* sbuffer = (const unsigned short*) buffer;
int ix = 0;
for (int i = 0; i < width; ++i) {