GDCM: modified compilation scheme

- renamed source files
- guard the contents - always include

modules/imgcodecs/src/grfmt_gdcm.cpp

@@ -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

modules/imgcodecs/src/grfmt_gdcm.hpp

@@ -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_*/

modules/imgcodecs/src/grfmts.hpp

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

modules/imgcodecs/src/loadsave.cpp

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