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

one more refinement to the lensfun automatching logic

Browse Source 
hopefully this is the good one :-)
This commit is contained in:
Alberto Griggio 2017-09-09 09:53:57 +02:00
parent 66979d290a
commit 13c4b0c284
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/rtlensfun.cc
View File

@ -295,8 +295,6 @@ LFLens LFDatabase::findLens(const LFCamera &camera, const Glib::ustring &name) c
if (found) { if (found) {
ret.data_ = found[0]; ret.data_ = found[0];
lf_free(found); lf_free(found);
} else if (camera.ok() && !stdlens) {
ret = findLens(LFCamera(), name);
} }
} }
return ret; return ret;
@ -333,7 +331,7 @@ LFModifier *LFDatabase::findModifier(const LensProfParams &lensProf, const Image
lens = lensProf.lfLens; lens = lensProf.lfLens;
} }
LFCamera c = db->findCamera(make, model); LFCamera c = db->findCamera(make, model);
LFLens l = db->findLens(c, lens); LFLens l = db->findLens(lensProf.lfAutoMatch ? c : LFCamera(), lens);
bool swap_xy = false; bool swap_xy = false;
if (rawRotationDeg >= 0) { if (rawRotationDeg >= 0) {
int rot = (coarse.rotate + rawRotationDeg) % 360; int rot = (coarse.rotate + rawRotationDeg) % 360;

6
rtengine/rtlensfun.h
View File

@ -91,13 +91,13 @@ public:
std::vector<LFLens> getLenses() const; std::vector<LFLens> getLenses() const;
LFCamera findCamera(const Glib::ustring &make, const Glib::ustring &model) const; LFCamera findCamera(const Glib::ustring &make, const Glib::ustring &model) const;
LFLens findLens(const LFCamera &camera, const Glib::ustring &name) const; LFLens findLens(const LFCamera &camera, const Glib::ustring &name) const;
LFModifier *getModifier(const LFCamera &camera, const LFLens &lens,
float focalLen, float aperture, float focusDist,
int width, int height, bool swap_xy) const;
static LFModifier *findModifier(const LensProfParams &lensProf, const ImageMetaData *idata, int width, int height, const CoarseTransformParams &coarse, int rawRotationDeg); static LFModifier *findModifier(const LensProfParams &lensProf, const ImageMetaData *idata, int width, int height, const CoarseTransformParams &coarse, int rawRotationDeg);
private: private:
LFModifier *getModifier(const LFCamera &camera, const LFLens &lens,
float focalLen, float aperture, float focusDist,
int width, int height, bool swap_xy) const;
LFDatabase(); LFDatabase();
LFDatabase(const LFDatabase &); LFDatabase(const LFDatabase &);
LFDatabase &operator=(const LFDatabase &); LFDatabase &operator=(const LFDatabase &);