Merge branch 'dev' into pfcorrect-cleanup

This commit is contained in:
heckflosse
2018-03-12 00:07:15 +01:00
4 changed files with 4 additions and 0 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -5349,6 +5349,10 @@ void RawImageSource::init ()
void RawImageSource::getRawValues(int x, int y, int rotate, int &R, int &G, int &B)
{
if(d1x) { // Nikon D1x has special sensor. We just skip it
R = G = B = 0;
return;
}
int xnew = x + border;
int ynew = y + border;
rotate += ri->get_rotateDegree();