X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FimageUndoRedo%2FimageUndoRedo.cxx;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FimageUndoRedo.cxx;h=6a57d07819d49a2167242be2046565dc8bdd5f1b;hb=8185e042f64574ca43bba733ec2158a2aa994220;hp=94344ab763ff1b224c6b3bc660a6bc6a0c4779e6;hpb=dfc9348c40926b0c402e8b285749a24de5e567ce;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/imageUndoRedo.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
old mode 100644
new mode 100755
similarity index 88%
rename from lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/imageUndoRedo.cxx
rename to lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
index 94344ab..6a57d07
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/imageUndoRedo.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/imageUndoRedo/imageUndoRedo.cxx
@@ -24,10 +24,8 @@ void ImageUndoRedo::Undo() {
 void ImageUndoRedo::Redo() {
 	ImageInfoUR imageInfo = this->m_ImagesDeque->Redo();
 	this->DrawUR(imageInfo);
-	imageInfo.RemoveImageFromMemory();
 }
-void ImageUndoRedo::SetImage(vtkImageData *image)
-{
+void ImageUndoRedo::SetImage(vtkImageData *image) {
 	this->m_CurrentImage = image;
 	this->m_CurrentImage->Update();
 	this->m_OriginalImage = ImageType::New();
@@ -35,8 +33,8 @@ void ImageUndoRedo::SetImage(vtkImageData *image)
 }
 //virtual
 void ImageUndoRedo::SetUndoImage(const RegionSType& region) {
-	vtkExtractVOI* extract;
-	extract->New();
+	vtkSmartPointer<vtkExtractVOI> extract =
+			vtkSmartPointer<vtkExtractVOI>::New();
 	extract->SetVOI(region.minX, region.maxX, region.minY, region.maxY,
 			region.minZ, region.maxZ);
 	extract->SetSampleRate(1, 1, 1);
@@ -46,8 +44,8 @@ void ImageUndoRedo::SetUndoImage(const RegionSType& region) {
 }
 //virtual
 void ImageUndoRedo::SetRedoImage(const RegionSType& region) {
-	vtkExtractVOI* extract;
-	extract->New();
+	vtkSmartPointer<vtkExtractVOI> extract =
+			vtkSmartPointer<vtkExtractVOI>::New();
 	extract->SetVOI(region.minX, region.maxX, region.minY, region.maxY,
 			region.minZ, region.maxZ);
 	extract->SetSampleRate(1, 1, 1);