[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Fixes inverted mask size for celeste [...

[<hug...@li...>]

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a40372434d03
changeset: 4515:a40372434d03
user:      tmodes
date:       Sat Oct 23 11:18:32 2010 +0200
description:
Fixes inverted mask size for celeste [3092899]
Hugin is interpreting Celeste/Filter=1 as large,
but in celeste_standalone the parameter -r 1 is small filter size.
This behaviour is inconsistant,
but changing it would break mix existing configuration or
would be a major change to commandline parameters of celeste_standalone.

diffstat:

 src/hugin1/hugin/AssistantPanel.cpp |  2 +-
 src/hugin1/hugin/CPEditorPanel.cpp  |  2 +-
 src/hugin1/hugin/ImagesPanel.cpp    |  2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 71ff850ca4cc -r a40372434d03 src/hugin1/hugin/AssistantPanel.cpp
--- a/src/hugin1/hugin/AssistantPanel.cpp	Fri Oct 22 21:10:32 2010 +0200
+++ b/src/hugin1/hugin/AssistantPanel.cpp	Sat Oct 23 11:18:32 2010 +0200
@@ -371,7 +371,7 @@
     bool runCeleste=config->Read(wxT("/Celeste/Auto"), HUGIN_CELESTE_AUTO)!=0;
     double celesteThreshold;
     config->Read(wxT("/Celeste/Threshold"), &celesteThreshold, HUGIN_CELESTE_THRESHOLD);
-    bool celesteSmall=config->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER)!=0;
+    bool celesteSmall=config->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER)==0;
     bool runCPClean=config->Read(wxT("/Assistant/AutoCPClean"), HUGIN_ASS_AUTO_CPCLEAN)!=0;
     double scale;
     config->Read(wxT("/Assistant/panoDownsizeFactor"), &scale, HUGIN_ASS_PANO_DOWNSIZE_FACTOR);
diff -r 71ff850ca4cc -r a40372434d03 src/hugin1/hugin/CPEditorPanel.cpp
--- a/src/hugin1/hugin/CPEditorPanel.cpp	Fri Oct 22 21:10:32 2010 +0200
+++ b/src/hugin1/hugin/CPEditorPanel.cpp	Sat Oct 23 11:18:32 2010 +0200
@@ -2194,7 +2194,7 @@
         cfg->Read(wxT("/Celeste/Threshold"), &threshold, HUGIN_CELESTE_THRESHOLD);
 
         // Mask resolution - 1 sets it to fine
-        bool t = (cfg->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER) != 0);
+        bool t = (cfg->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER) == 0);
         int radius=(t)?10:20;
         DEBUG_TRACE("Running Celeste");
 
diff -r 71ff850ca4cc -r a40372434d03 src/hugin1/hugin/ImagesPanel.cpp
--- a/src/hugin1/hugin/ImagesPanel.cpp	Fri Oct 22 21:10:32 2010 +0200
+++ b/src/hugin1/hugin/ImagesPanel.cpp	Sat Oct 23 11:18:32 2010 +0200
@@ -1025,7 +1025,7 @@
         cfg->Read(wxT("/Celeste/Threshold"), &threshold, HUGIN_CELESTE_THRESHOLD);
 
         // Mask resolution - 1 sets it to fine
-        bool t = (cfg->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER) != 0);
+        bool t = (cfg->Read(wxT("/Celeste/Filter"), HUGIN_CELESTE_FILTER) == 0);
         int radius=(t)?10:20;
         DEBUG_TRACE("Running Celeste");