GDCM: modified compilation scheme

- renamed source files
- guard the contents - always include
pull/6813/head
Maksim Shabunin 9 years ago
parent 6f22f49c02
commit 0fd0acf2e3
  1. 5
      modules/imgcodecs/CMakeLists.txt
  2. 6
      modules/imgcodecs/src/grfmt_gdcm.cpp
  3. 6
      modules/imgcodecs/src/grfmt_gdcm.hpp
  4. 1
      modules/imgcodecs/src/grfmts.hpp
  5. 3
      modules/imgcodecs/src/loadsave.cpp

@ -63,11 +63,6 @@ endif()
file(GLOB grfmt_hdrs ${CMAKE_CURRENT_LIST_DIR}/src/grfmt*.hpp)
file(GLOB grfmt_srcs ${CMAKE_CURRENT_LIST_DIR}/src/grfmt*.cpp)
if(HAVE_GDCM)
list(APPEND grfmt_hdrs ${CMAKE_CURRENT_LIST_DIR}/src/gdcm_dicom.hpp)
list(APPEND grfmt_srcs ${CMAKE_CURRENT_LIST_DIR}/src/gdcm_dicom.cpp)
endif()
list(APPEND grfmt_hdrs ${CMAKE_CURRENT_LIST_DIR}/src/bitstrm.hpp)
list(APPEND grfmt_srcs ${CMAKE_CURRENT_LIST_DIR}/src/bitstrm.cpp)
list(APPEND grfmt_hdrs ${CMAKE_CURRENT_LIST_DIR}/src/rgbe.hpp)

@ -41,7 +41,9 @@
//M*/
#include "precomp.hpp"
#include "gdcm_dicom.hpp"
#include "grfmt_gdcm.hpp"
#ifdef HAVE_GDCM
#include <gdcmImageReader.h>
@ -214,3 +216,5 @@ bool DICOMDecoder::readData( Mat& csImage )
return(bOK);
}
}
#endif

@ -43,6 +43,10 @@
#ifndef _GDCM_DICOM_H_
#define _GDCM_DICOM_H_
#include "cvconfig.h"
#ifdef HAVE_GDCM
#include "grfmt_base.hpp"
namespace cv
@ -68,4 +72,6 @@ protected:
}
#endif
#endif/*_GDCM_DICOM_H_*/

@ -54,5 +54,6 @@
#include "grfmt_webp.hpp"
#include "grfmt_hdr.hpp"
#include "grfmt_gdal.hpp"
#include "grfmt_gdcm.hpp"
#endif/*_GRFMTS_H_*/

@ -45,9 +45,6 @@
#include "precomp.hpp"
#include "grfmts.hpp"
#ifdef HAVE_GDCM
#include "gdcm_dicom.hpp"
#endif
#undef min
#undef max
#include <iostream>

Loading…
Cancel
Save