- renamed source files
- guard the contents - always include
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)
//M*/
#include "precomp.hpp"
-#include "gdcm_dicom.hpp"
+#include "grfmt_gdcm.hpp"
+
+#ifdef HAVE_GDCM
#include <gdcmImageReader.h>
return(bOK);
}
}
+
+#endif
\ No newline at end of file
#ifndef _GDCM_DICOM_H_
#define _GDCM_DICOM_H_
+#include "cvconfig.h"
+
+#ifdef HAVE_GDCM
+
#include "grfmt_base.hpp"
namespace cv
}
+#endif
+
#endif/*_GDCM_DICOM_H_*/
#include "grfmt_webp.hpp"
#include "grfmt_hdr.hpp"
#include "grfmt_gdal.hpp"
+#include "grfmt_gdcm.hpp"
#endif/*_GRFMTS_H_*/
#include "precomp.hpp"
#include "grfmts.hpp"
-#ifdef HAVE_GDCM
-#include "gdcm_dicom.hpp"
-#endif
#undef min
#undef max
#include <iostream>