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

Minor cleanups after #5315 and #5368

Browse Source
This commit is contained in:
Flössie 2019-07-09 13:18:08 +02:00
parent e980d9b225
commit 3b78a5c227
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/dfmanager.cc
View File

@ -257,7 +257,7 @@ void dfInfo::updateBadPixelList( RawImage *df )
} }
if( df->data[row][3 * col] > m[0]*threshold || df->data[row][3 * col + 1] > m[1]*threshold || df->data[row][3 * col + 2] > m[2]*threshold) { if( df->data[row][3 * col] > m[0]*threshold || df->data[row][3 * col + 1] > m[1]*threshold || df->data[row][3 * col + 2] > m[2]*threshold) {
badPixels.push_back( badPix(col, row) ); badPixels.emplace_back(col, row);
} }
} }
} }
@ -571,7 +571,7 @@ int DFManager::scanBadPixelsFile( Glib::ustring filename )
while( fgets(line, sizeof(line), file ) ) { while( fgets(line, sizeof(line), file ) ) {
if( sscanf(line, "%d %d", &x, &y) == 2 ) { if( sscanf(line, "%d %d", &x, &y) == 2 ) {
bp.push_back( badPix(x + offset, y + offset) ); bp.emplace_back(x + offset, y + offset);
} }
} }
} }
@ -592,7 +592,7 @@ std::vector<badPix> *DFManager::getBadPixels ( const std::string &mak, const std
bool found = false; bool found = false;
if( !serial.empty() ) { if( !serial.empty() ) {
// search with sreial number first // search with serial number first
std::ostringstream s; std::ostringstream s;
s << mak << " " << mod << " " << serial; s << mak << " " << mod << " " << serial;
iter = bpList.find( s.str() ); iter = bpList.find( s.str() );

2
rtgui/mydiagonalcurve.cc
View File

@ -25,8 +25,6 @@
#include "editcallbacks.h" #include "editcallbacks.h"
#include "../rtengine/curves.h" #include "../rtengine/curves.h"
#include <cstring>
#include <gdkmm/types.h>
MyDiagonalCurve::MyDiagonalCurve () : MyDiagonalCurve::MyDiagonalCurve () :
MyCurve(), MyCurve(),