From: <hug...@li...> - 2010-09-14 21:45:29
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/99a11129c55c changeset: 4357:99a11129c55c user: tmodes date: Tue Sep 14 23:07:46 2010 +0200 description: Improved calculation of distance map diffstat: src/libpanomatic/panomatic/PanoDetectorLogic.cpp | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (31 lines): diff -r 3b7072116310 -r 99a11129c55c src/libpanomatic/panomatic/PanoDetectorLogic.cpp --- a/src/libpanomatic/panomatic/PanoDetectorLogic.cpp Tue Sep 14 20:03:54 2010 +0200 +++ b/src/libpanomatic/panomatic/PanoDetectorLogic.cpp Tue Sep 14 23:07:46 2010 +0200 @@ -210,6 +210,7 @@ { final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight); vigra::resizeImageNoInterpolation(srcImageRange(mask),destImageRange(final_mask)); + mask.resize(0,0); }; } else @@ -221,6 +222,7 @@ { final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight); vigra::copyImage(srcImageRange(mask),destImage(final_mask)); + mask.resize(0,0); }; } } @@ -235,9 +237,9 @@ TRACE_IMG("Building distance map..."); //apply threshold, in case loaded mask contains other values than 0 and 255 vigra::transformImage(srcImageRange(final_mask), destImage(final_mask), - vigra::Threshold<vigra::BImage::PixelType, vigra::BImage::PixelType>(1, 255, 255, 0)); + vigra::Threshold<vigra::BImage::PixelType, vigra::BImage::PixelType>(1, 255, 0, 255)); ioImgInfo._distancemap.resize(final_mask.width(),final_mask.height(),0); - vigra::distanceTransform(srcImageRange(final_mask), destImage(ioImgInfo._distancemap), 0, 2); + vigra::distanceTransform(srcImageRange(final_mask), destImage(ioImgInfo._distancemap), 255, 2); }; #if 0 |