From: Diego Caceres Date: Thu, 13 Oct 2011 07:40:21 +0000 (+0000) Subject: DFCH: Changes in CMakeList (CreaImageIO dependences removed) X-Git-Tag: v1.0.4~55 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=dfc9348c40926b0c402e8b285749a24de5e567ce;p=creaMaracasVisu.git DFCH: Changes in CMakeList (CreaImageIO dependences removed) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d6b3f0..41e961e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,12 +30,6 @@ IF (crea_FOUND) INCLUDE(${crea_USE_FILE}) ENDIF(crea_FOUND) -#================================== -FIND_PACKAGE(creaImageIO REQUIRED) -IF (creaImageIO_FOUND) - INCLUDE(${creaImageIO_USE_FILE}) -ENDIF(creaImageIO_FOUND) -#================================== CREA_PREVENT_IN_SOURCE_BUILD() diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/image3DDequeUR.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/image3DDequeUR.cxx index 3159740..0021d54 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/image3DDequeUR.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/image3DDequeUR.cxx @@ -47,10 +47,7 @@ void Image3DDequeUR::AddImageToRedoContainer(ImageType* img, } //virtual void Image3DDequeUR::LoadUndoImageToPMemory(const unsigned int& index) { - creaImageIO::ImageReader reader; - std::string fullPath = this->m_globalPath - + this->m_ImgUndoDeque[index].GetImageName(); - this->m_ImgUndoDeque[index].SetImage(reader.ReadImage(fullPath)); + } //virtual void Image3DDequeUR::RemoveUndoImageFromPMemory(const unsigned int& index) { @@ -58,10 +55,7 @@ void Image3DDequeUR::RemoveUndoImageFromPMemory(const unsigned int& index) { } //virtual void Image3DDequeUR::LoadRedoImageToPMemory(const unsigned int& index) { - creaImageIO::ImageReader reader; - std::string fullPath = this->m_globalPath - + this->m_ImgRedoDeque[index].GetImageName(); - this->m_ImgRedoDeque[index].SetImage(reader.ReadImage(fullPath)); + } //virtual void Image3DDequeUR::RemoveRedoImageFromPMemory(const unsigned int& index) { diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/image3DDequeUR.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/image3DDequeUR.h index ef0ca63..36dee83 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/image3DDequeUR.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/image3DDequeUR.h @@ -11,7 +11,6 @@ #include "imageDequeUR.h" #include #include "vtkMetaImageWriter.h" -#include "creaImageIOImageReader.h" class Image3DDequeUR: public ImageDequeUR { private: