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

Fix clang warnings on new lensfun code (fixes #4086)

Browse Source
This commit is contained in:
Flössie
2017-09-17 11:06:11 +02:00
parent b1ce30c772
commit fb06a75c81
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/iptransform.cc
View File

@@ -307,7 +307,7 @@ void ImProcFunctions::transform (Imagefloat* original, Imagefloat* transformed,
std::unique_ptr<const LensCorrection> pLCPMap; std::unique_ptr<const LensCorrection> pLCPMap;
if (needsLensfun()) { if (needsLensfun()) {
pLCPMap = std::move(LFDatabase::findModifier(params->lensProf, metadata, oW, oH, params->coarse, rawRotationDeg)); pLCPMap = LFDatabase::findModifier(params->lensProf, metadata, oW, oH, params->coarse, rawRotationDeg);
} else if (needsLCP()) { // don't check focal length to allow distortion correction for lenses without chip } else if (needsLCP()) { // don't check focal length to allow distortion correction for lenses without chip
const std::shared_ptr<LCPProfile> pLCPProf = LCPStore::getInstance()->getProfile (params->lensProf.lcpFile); const std::shared_ptr<LCPProfile> pLCPProf = LCPStore::getInstance()->getProfile (params->lensProf.lcpFile);

2
rtengine/rawimagesource.cc
View File

@@ -1858,7 +1858,7 @@ void RawImageSource::preprocess (const RAWParams &raw, const LensProfParams &le
if (!hasFlatField && lensProf.useVign) { if (!hasFlatField && lensProf.useVign) {
std::unique_ptr<LensCorrection> pmap; std::unique_ptr<LensCorrection> pmap;
if (lensProf.useLensfun()) { if (lensProf.useLensfun()) {
pmap = std::move(LFDatabase::findModifier(lensProf, idata, W, H, coarse, -1)); pmap = LFDatabase::findModifier(lensProf, idata, W, H, coarse, -1);
} else { } else {
const std::shared_ptr<LCPProfile> pLCPProf = LCPStore::getInstance()->getProfile(lensProf.lcpFile); const std::shared_ptr<LCPProfile> pLCPProf = LCPStore::getInstance()->getProfile(lensProf.lcpFile);

2
rtengine/rtlensfun.h
View File

@@ -46,7 +46,7 @@ public:
bool isCACorrectionAvailable() const override; bool isCACorrectionAvailable() const override;
void correctCA(double &x, double &y, int channel) const override; void correctCA(double &x, double &y, int channel) const override;
void processVignetteLine(int width, int y, float *line) const override; void processVignetteLine(int width, int y, float *line) const override;
void processVignetteLine3Channels(int width, int y, float *line) const; void processVignetteLine3Channels(int width, int y, float *line) const override;
Glib::ustring getDisplayString() const; Glib::ustring getDisplayString() const;