[Hugin-cvs] /hgroot/hugin/hugin: Fixes compilation with gcc [1158000]

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

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/95841e15019e
changeset:  6230:95841e15019e
user:       tmodes
date:       Thu Mar 21 17:41:44 2013 +0100
description:

Fixes compilation with gcc [1158000]

diffstat:

 src/hugin_base/nona/Stitcher.h |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 5e8792f4414b -r 95841e15019e src/hugin_base/nona/Stitcher.h
--- a/src/hugin_base/nona/Stitcher.h	Wed Mar 20 21:14:55 2013 +0100
+++ b/src/hugin_base/nona/Stitcher.h	Thu Mar 21 17:41:44 2013 +0100
@@ -277,8 +277,9 @@
             if (! opts.tiff_saveROI) {
                 alpha.resize(opts.getROI().size());
                 vigra::Rect2D newOutRect = remapped.boundingBox() & opts.getROI();
+                vigra::Rect2D newOutArea(newOutRect);
                 newOutRect.moveBy(-opts.getROI().upperLeft());
-                vigra::copyImage(vigra_ext::applyRect(remapped.boundingBox() & opts.getROI(),
+                vigra::copyImage(vigra_ext::applyRect(newOutArea,
                                  vigra_ext::srcMaskRange(remapped)),
                                  vigra_ext::applyRect(newOutRect,
                                  destImage(alpha)));
@@ -308,13 +309,14 @@
             complete.resize(opts.getROI().size());
             alpha.resize(opts.getROI().size());
             vigra::Rect2D newOutRect = remapped.boundingBox() & opts.getROI();
+            vigra::Rect2D newOutArea(newOutRect);
             newOutRect.moveBy(-opts.getROI().upperLeft());
-            vigra::copyImage(vigra_ext::applyRect(remapped.boundingBox() & opts.getROI(),
+            vigra::copyImage(vigra_ext::applyRect(newOutArea,
                                  vigra_ext::srcImageRange(remapped)),
                              vigra_ext::applyRect(newOutRect,
                                  destImage(complete)));
 
-            vigra::copyImage(vigra_ext::applyRect(remapped.boundingBox() & opts.getROI(),
+            vigra::copyImage(vigra_ext::applyRect(newOutArea,
                                  vigra_ext::srcMaskRange(remapped)),
                              vigra_ext::applyRect(newOutRect,
                                  destImage(alpha)));