Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20354
Modified Files:
ufraw_lensfun.cc
Log Message:
Only choose lens automatically if the camera model is known. Fix problem with
bogus lens choice for some compact cameras not included in the lensfun database.
Index: ufraw_lensfun.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_lensfun.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ufraw_lensfun.cc 30 Mar 2010 23:12:24 -0000 1.15
+++ ufraw_lensfun.cc 31 Mar 2010 17:15:09 -0000 1.16
@@ -627,7 +627,7 @@
if (strlen(uf->conf->lensText) > 0) {
const lfLens **lenses = LensDB()->FindLenses(&Camera,
NULL, uf->conf->lensText, LF_SEARCH_LOOSE);
- if (lenses != NULL) {
+ if (!CameraModel.IsEqual("") && lenses != NULL) {
SetLensModel(*lenses[0]);
LensfunAuto.Set("yes");
lf_free(lenses);
@@ -637,7 +637,7 @@
// Try using the "standard" lens of compact cameras.
const lfLens **lenses = LensDB()->FindLenses(&Camera,
NULL, "Standard", LF_SEARCH_LOOSE);
- if (lenses != NULL) {
+ if (!CameraModel.IsEqual("") && lenses != NULL) {
SetLensModel(*lenses[0]);
LensfunAuto.Set("yes");
lf_free(lenses);
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
