[med-svn] [dcmtk] 10/11: Update CharLS patch to account for deviation in the system provided version

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository dcmtk.

commit 984c84e9eb724f16c819f06990271175bf267904
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sat Nov 12 20:24:10 2016 +0100

    Update CharLS patch to account for deviation in the system provided version
---
 debian/patches/02_system_charls.patch | 46 ++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/debian/patches/02_system_charls.patch b/debian/patches/02_system_charls.patch
index 6f13cbb..3480bbf 100644
--- a/debian/patches/02_system_charls.patch
+++ b/debian/patches/02_system_charls.patch
@@ -5,8 +5,8 @@ Forwarded: no
 
 Index: b/dcmjpls/CMakeLists.txt
 ===================================================================
---- a/dcmjpls/CMakeLists.txt	2016-11-07 12:34:04.935034792 +0100
-+++ b/dcmjpls/CMakeLists.txt	2016-11-07 12:34:04.919034990 +0100
+--- a/dcmjpls/CMakeLists.txt	2016-11-07 12:41:34.000000000 +0100
++++ b/dcmjpls/CMakeLists.txt	2016-11-12 19:01:40.000000000 +0100
 @@ -2,6 +2,6 @@
  PROJECT(dcmjpls)
  
@@ -17,8 +17,8 @@ Index: b/dcmjpls/CMakeLists.txt
  ENDFOREACH(SUBDIR)
 Index: b/dcmjpls/libsrc/CMakeLists.txt
 ===================================================================
---- a/dcmjpls/libsrc/CMakeLists.txt	2016-11-07 12:34:04.935034792 +0100
-+++ b/dcmjpls/libsrc/CMakeLists.txt	2016-11-07 12:34:04.927034891 +0100
+--- a/dcmjpls/libsrc/CMakeLists.txt	2016-11-07 12:41:34.000000000 +0100
++++ b/dcmjpls/libsrc/CMakeLists.txt	2016-11-12 19:01:40.000000000 +0100
 @@ -1,7 +1,7 @@
  # declare additional include directories
 -INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR})
@@ -31,8 +31,8 @@ Index: b/dcmjpls/libsrc/CMakeLists.txt
 +DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS)
 Index: b/dcmjpls/libsrc/djerror.h
 ===================================================================
---- a/dcmjpls/libsrc/djerror.h	2016-11-07 12:34:04.935034792 +0100
-+++ b/dcmjpls/libsrc/djerror.h	2016-11-07 12:34:04.931034841 +0100
+--- a/dcmjpls/libsrc/djerror.h	2016-11-07 12:41:34.000000000 +0100
++++ b/dcmjpls/libsrc/djerror.h	2016-11-12 19:01:40.000000000 +0100
 @@ -24,7 +24,7 @@
  
  #include "dcmtk/config/osconfig.h"
@@ -44,8 +44,8 @@ Index: b/dcmjpls/libsrc/djerror.h
   */
 Index: b/dcmjpls/libsrc/djcodecd.cc
 ===================================================================
---- a/dcmjpls/libsrc/djcodecd.cc	2016-11-07 12:34:04.935034792 +0100
-+++ b/dcmjpls/libsrc/djcodecd.cc	2016-11-07 12:34:04.931034841 +0100
+--- a/dcmjpls/libsrc/djcodecd.cc	2016-11-07 12:41:34.000000000 +0100
++++ b/dcmjpls/libsrc/djcodecd.cc	2016-11-12 19:01:40.000000000 +0100
 @@ -37,7 +37,7 @@
  #include "djerror.h"                 /* for private class DJLSError */
  
@@ -57,8 +57,8 @@ Index: b/dcmjpls/libsrc/djcodecd.cc
  {
 Index: b/dcmjpls/libsrc/djcodece.cc
 ===================================================================
---- a/dcmjpls/libsrc/djcodece.cc	2016-11-07 12:34:04.935034792 +0100
-+++ b/dcmjpls/libsrc/djcodece.cc	2016-11-07 12:34:04.931034841 +0100
+--- a/dcmjpls/libsrc/djcodece.cc	2016-11-07 12:41:34.000000000 +0100
++++ b/dcmjpls/libsrc/djcodece.cc	2016-11-12 19:54:33.530316529 +0100
 @@ -55,7 +55,7 @@
  #include "dcmtk/dcmimgle/dcmimage.h"  /* for class DicomImage */
  
@@ -68,10 +68,28 @@ Index: b/dcmjpls/libsrc/djcodece.cc
  
  BEGIN_EXTERN_C
  #ifdef HAVE_FCNTL_H
+@@ -664,7 +664,7 @@
+ 
+     size_t bytesWritten = 0;
+ 
+-    JLS_ERROR err = JpegLsEncode(&buffer, &size, &bytesWritten, framePointer, frameSize, &jls_params);
++    JLS_ERROR err = JpegLsEncode(&buffer, size, &bytesWritten, framePointer, frameSize, &jls_params);
+     result = DJLSError::convert(err);
+ 
+     if (result.good())
+@@ -1054,7 +1054,7 @@
+ 
+   size_t bytesWritten = 0;
+ 
+-  JLS_ERROR err = JpegLsEncode(&compressed_buffer, &compressed_buffer_size, &bytesWritten, framePointer, buffer_size, &jls_params);
++  JLS_ERROR err = JpegLsEncode(&compressed_buffer, compressed_buffer_size, &bytesWritten, framePointer, buffer_size, &jls_params);
+   result = DJLSError::convert(err);
+ 
+   if (result.good())
 Index: b/dcmjpls/apps/CMakeLists.txt
 ===================================================================
---- a/dcmjpls/apps/CMakeLists.txt	2016-11-07 12:34:04.935034792 +0100
-+++ b/dcmjpls/apps/CMakeLists.txt	2016-11-07 12:34:04.931034841 +0100
+--- a/dcmjpls/apps/CMakeLists.txt	2016-11-07 12:41:34.000000000 +0100
++++ b/dcmjpls/apps/CMakeLists.txt	2016-11-12 19:01:40.000000000 +0100
 @@ -8,5 +8,5 @@
  
  # make sure executables are linked to the corresponding libraries
@@ -81,8 +99,8 @@ Index: b/dcmjpls/apps/CMakeLists.txt
  ENDFOREACH(PROGRAM)
 Index: b/dcmjpls/libcharls/CMakeLists.txt
 ===================================================================
---- a/dcmjpls/libcharls/CMakeLists.txt	2016-11-07 12:34:04.935034792 +0100
-+++ b/dcmjpls/libcharls/CMakeLists.txt	2016-11-07 12:34:04.935034792 +0100
+--- a/dcmjpls/libcharls/CMakeLists.txt	2016-11-07 12:41:34.000000000 +0100
++++ b/dcmjpls/libcharls/CMakeLists.txt	2016-11-12 19:01:40.000000000 +0100
 @@ -1,5 +1,5 @@
  # declare additional include directories
 -INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/libcharls ${ofstd_SOURCE_DIR}/include)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtk.git