Attachment 1452742 Details for Bug 1592564 – Patch 27 that helps with dcmtk

[patch] Patch 27 that helps with dcmtk

0027-dcmdata_dir.patch (text/plain), 1.50 KB, created by Mark Harfouche on 2018-06-18 23:00:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Harfouche

Created: 2018-06-18 23:00:33 UTC

Size: 1.50 KB

patch

obsolete

>diff --git a/core/vil/file_formats/vil_dicom.cxx b/core/vil/file_formats/vil_dicom.cxx
>index dc710e2c82..d55fd5a58f 100644
>--- a/core/vil/file_formats/vil_dicom.cxx
>+++ b/core/vil/file_formats/vil_dicom.cxx
>@@ -28,13 +28,13 @@
> #include <vil/vil_pixel_format.h>
> #include <vil/vil_exception.h>
> 
>-#include <dcfilefo.h>
>-#include <dcmetinf.h>
>-#include <dcdatset.h>
>-#include <dctagkey.h>
>-#include <dcdeftag.h>
>-#include <dcstack.h>
>-#include <diinpxt.h>
>+#include <dcmtk/dcmdata/dcfilefo.h>
>+#include <dcmtk/dcmdata/dcmetinf.h>
>+#include <dcmtk/dcmdata/dcdatset.h>
>+#include <dcmtk/dcmdata/dctagkey.h>
>+#include <dcmtk/dcmdata/dcdeftag.h>
>+#include <dcmtk/dcmdata/dcstack.h>
>+#include <dcmtk/dcmimgle/diinpxt.h>
> 
> #include "vil_dicom_stream.h"
> //
>diff --git a/core/vil/file_formats/vil_dicom_stream.cxx b/core/vil/file_formats/vil_dicom_stream.cxx
>index e3a56825c5..716b32d1ab 100644
>--- a/core/vil/file_formats/vil_dicom_stream.cxx
>+++ b/core/vil/file_formats/vil_dicom_stream.cxx
>@@ -4,7 +4,7 @@
> 
> #include "vil_dicom_stream.h"
> #include <vil/vil_stream.h>
>-#include <dcerror.h>
>+#include <dcmtk/dcmdata/dcerror.h>
> 
> #include <vcl_cassert.h>
> #include <vcl_compiler.h>
>diff --git a/core/vil/file_formats/vil_dicom_stream.h b/core/vil/file_formats/vil_dicom_stream.h
>index 79a639639a..14a765b6f6 100644
>--- a/core/vil/file_formats/vil_dicom_stream.h
>+++ b/core/vil/file_formats/vil_dicom_stream.h
>@@ -4,7 +4,7 @@
> // \file
> // \author Amitha Perera
> 
>-#include <dcistrma.h>
>+#include <dcmtk/dcmdata/dcistrma.h>
> 
> class vil_stream;
>

Actions: View | Diff

Attachments on bug 1592564: 1452741 | 1452742 | 1452761 | 1452762