1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
Description: use debian packaged djdecode.h.
Author: Étienne Mollier <emollier@debian.org>
Forwarded: not-needed
Last-Update: 2022-07-08
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- amide.orig/amide-current/src/dcmtk_interface.cc
+++ amide/amide-current/src/dcmtk_interface.cc
@@ -48,7 +48,7 @@
#include <dcmtk/dcmdata/dcddirif.h> /* for class DicomDirInterface */
#include <dcmtk/dcmdata/dctk.h>
#include <dcmtk/dcmdata/dcrledrg.h> /* for RLE decoders */
-#include "dcmtk/dcmjpeg/djdecode.h" /* for dcmjpeg decoders */
+#include <dcmtk/dcmjpeg/djdecode.h> /* for dcmjpeg decoders */
#ifdef AMIDE_LIBOPENJP2_SUPPORT
#include <dcmtk/config/osconfig.h> /* JPG2000 make sure OS specific configuration is included first */
--- amide.orig/amide-current/configure.ac
+++ amide/amide-current/configure.ac
@@ -109,8 +109,7 @@
dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
dnl autoconf doesn't have a nice macro for checking for c++ libraries, therefore the below:
AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
-AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ltiff -lpng -ldcmimage -ldcmimgle -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
-AMIDE_LIBDCMDATA_LIBS="-ldcmdata -lofstd -loflog -lavcodec -lavutil -lz $THREAD_LIBS"
+AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ltiff -lpng -ldcmimage -ldcmimgle -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmdata -loflog -lofstd -lavcodec -lavutil -lz $THREAD_LIBS"
AMIDE_LIBDCMDATA_CFLAGS="-I/usr/include/dcmtk/dcmdata"
saved_libs="${LIBS}"
LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}"
|
