From 96b3e2ee5cd582c67847f23de527f3e567baad55 Mon Sep 17 00:00:00 2001
From: valerio <valerio@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Thu, 26 Aug 2010 09:58:21 +0000
Subject: [PATCH] Implemented copy of Absolute Origin in the CloneState
function
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2673 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/img/base/src/image_handle.cc | 3 ---
modules/img/base/src/image_state/image_state_impl.cc | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/modules/img/base/src/image_handle.cc b/modules/img/base/src/image_handle.cc
index de4e5c5df..712868a31 100644
--- a/modules/img/base/src/image_handle.cc
+++ b/modules/img/base/src/image_handle.cc
@@ -90,9 +90,6 @@ ImageHandle ImageHandle::Copy(bool cc) const
copy constructor,with the cloned ImageStateBasePtr as a parameter.
This new ptr on the heap is then in turn used to initialize the StatePtrPtr.
*/
-
- ImageHandle copy_img = ImageHandle(StatePtrPtr(new ImageStateBasePtr(ImageStatePtr()->Clone(cc))));
- copy_img.SetAbsoluteOrigin(ImageStatePtr()->GetAbsoluteOrigin());
return ImageHandle(StatePtrPtr(new ImageStateBasePtr(ImageStatePtr()->Clone(cc))));
}
diff --git a/modules/img/base/src/image_state/image_state_impl.cc b/modules/img/base/src/image_state/image_state_impl.cc
index 020d21651..ca8834fe8 100644
--- a/modules/img/base/src/image_state/image_state_impl.cc
+++ b/modules/img/base/src/image_state/image_state_impl.cc
@@ -105,7 +105,7 @@ boost::shared_ptr<ImageStateImpl<T,D> > ImageStateImpl<T,D>::CloneState(bool cc)
if(cc) {
return SharedPtrType(new ImageStateImpl<T,D>(*this));
} else {
- return SharedPtrType(new ImageStateImpl<T,D>(domain_.GetLogicalExtent(),sampling_));
+ return SharedPtrType(new ImageStateImpl<T,D>(domain_.GetLogicalExtent(),sampling_,this->absolute_origin_));
}
}
--
GitLab