|
 |
5b66253 |
From 7b20ec2b206ac325bb8b18aaad2ef704959abb7e Mon Sep 17 00:00:00 2001
|
|
|
5b66253 |
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
|
|
|
5b66253 |
Date: Sun, 28 Jul 2019 19:43:48 +0100
|
|
|
5b66253 |
Subject: [PATCH 12/16] 3.6.4 Correct extra include for CharLS
|
|
|
5b66253 |
|
|
|
5b66253 |
---
|
|
|
5b66253 |
dcmjpls/libsrc/djcodecd.cc | 2 +-
|
|
|
5b66253 |
dcmjpls/libsrc/djcodece.cc | 2 +-
|
|
|
5b66253 |
dcmjpls/libsrc/djerror.h | 1 +
|
|
|
5b66253 |
3 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
5b66253 |
|
|
|
5b66253 |
diff --git a/dcmjpls/libsrc/djcodecd.cc b/dcmjpls/libsrc/djcodecd.cc
|
|
|
5b66253 |
index 2e36680cd..b2ad93d60 100644
|
|
|
5b66253 |
--- a/dcmjpls/libsrc/djcodecd.cc
|
|
|
5b66253 |
+++ b/dcmjpls/libsrc/djcodecd.cc
|
|
|
5b66253 |
@@ -38,7 +38,7 @@
|
|
|
5b66253 |
|
|
|
5b66253 |
// JPEG-LS library (CharLS) includes
|
|
|
5b66253 |
#include "CharLS/charls.h"
|
|
|
5b66253 |
-#include "CharLS/public_types.h"
|
|
|
5b66253 |
+#include "CharLS/publictypes.h"
|
|
|
5b66253 |
|
|
|
5b66253 |
E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
|
|
|
5b66253 |
{
|
|
|
5b66253 |
diff --git a/dcmjpls/libsrc/djcodece.cc b/dcmjpls/libsrc/djcodece.cc
|
|
|
5b66253 |
index 9e06d842a..d91965c25 100644
|
|
|
5b66253 |
--- a/dcmjpls/libsrc/djcodece.cc
|
|
|
5b66253 |
+++ b/dcmjpls/libsrc/djcodece.cc
|
|
|
5b66253 |
@@ -56,7 +56,7 @@
|
|
|
5b66253 |
|
|
|
5b66253 |
// JPEG-LS library (CharLS) includes
|
|
|
5b66253 |
#include "CharLS/charls.h"
|
|
|
5b66253 |
-#include "CharLS/public_types.h"
|
|
|
5b66253 |
+#include "CharLS/publictypes.h"
|
|
|
5b66253 |
|
|
|
5b66253 |
BEGIN_EXTERN_C
|
|
|
5b66253 |
#ifdef HAVE_FCNTL_H
|
|
|
5b66253 |
diff --git a/dcmjpls/libsrc/djerror.h b/dcmjpls/libsrc/djerror.h
|
|
|
5b66253 |
index a701dbada..e0a4a3022 100644
|
|
|
5b66253 |
--- a/dcmjpls/libsrc/djerror.h
|
|
|
5b66253 |
+++ b/dcmjpls/libsrc/djerror.h
|
|
|
5b66253 |
@@ -25,6 +25,7 @@
|
|
|
5b66253 |
#include "dcmtk/config/osconfig.h"
|
|
|
5b66253 |
#include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */
|
|
|
5b66253 |
#include "CharLS/charls.h" /* CharLS include */
|
|
|
5b66253 |
+#include "CharLS/publictypes.h" /* CharLS include */
|
|
|
5b66253 |
|
|
|
5b66253 |
/** Helper class for converting between dcmjpls and CharLS error codes
|
|
|
5b66253 |
*/
|
|
|
5b66253 |
--
|
|
|
5b66253 |
2.21.0
|
|
|
5b66253 |
|