From: <hug...@li...> - 2010-09-14 18:04:38
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/9c05c6b53890 changeset: 4355:9c05c6b53890 user: tmodes date: Tue Sep 14 20:01:11 2010 +0200 description: Unified line breaks diffstat: src/libpanomatic/panomatic/PanoDetectorLogic.cpp | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diffs (50 lines): diff -r bf8c12f7977d -r 9c05c6b53890 src/libpanomatic/panomatic/PanoDetectorLogic.cpp --- a/src/libpanomatic/panomatic/PanoDetectorLogic.cpp Tue Sep 14 19:14:57 2010 +0200 +++ b/src/libpanomatic/panomatic/PanoDetectorLogic.cpp Tue Sep 14 20:01:11 2010 +0200 @@ -192,7 +192,7 @@ if(iPanoDetector._panoramaInfoCopy.getImage(ioImgInfo._number).hasActiveMasks()) { //copy mask from pto file into alpha layer - vigra_ext::applyMask(vigra::destImageRange(mask), iPanoDetector._panoramaInfoCopy.getImage(ioImgInfo._number).getActiveMasks()); + vigra_ext::applyMask(vigra::destImageRange(mask), iPanoDetector._panoramaInfoCopy.getImage(ioImgInfo._number).getActiveMasks()); }; if (iPanoDetector._downscale) @@ -208,9 +208,9 @@ //downscale mask if(mask.width()>0 && mask.height()>0) { - final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight); - vigra::resizeImageNoInterpolation(srcImageRange(mask),destImageRange(final_mask)); - }; + final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight); + vigra::resizeImageNoInterpolation(srcImageRange(mask),destImageRange(final_mask)); + }; } else { @@ -219,7 +219,7 @@ final_img.upperLeft(), vigra::DImage::Accessor()); if(mask.width()>0 && mask.height()>0) { - final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight); + final_mask.resize(ioImgInfo._detectWidth, ioImgInfo._detectHeight); vigra::copyImage(srcImageRange(mask),destImage(final_mask)); }; } @@ -234,11 +234,11 @@ { 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)); - ioImgInfo._distancemap.resize(final_mask.width(),final_mask.height(),0); + vigra::transformImage(srcImageRange(final_mask), destImage(final_mask), + vigra::Threshold<vigra::BImage::PixelType, vigra::BImage::PixelType>(1, 255, 255, 0)); + ioImgInfo._distancemap.resize(final_mask.width(),final_mask.height(),0); vigra::distanceTransform(srcImageRange(final_mask), destImage(ioImgInfo._distancemap), 0, 2); - }; + }; #if 0 // DEBUG: export remapped image |