Mercurial > hg > orthanc

annotate OrthancFramework/Resources/Patches/dcmtk-3.6.8-visual-studio.patch @ 5754:f75596b224e0 find-refactoring-clean tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged find-refactoring -> find-refactoring-clean (integration tests ok)
author Alain Mazy <am@orthanc.team>
date Wed, 04 Sep 2024 10:54:00 +0200
parents 5bd262ce16b3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5488
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jccoefct.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jccoefct.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jccoefct.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jccoefct.c 2024-01-09 17:48:28.974677157 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -343,7 +343,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 METHODDEF(boolean)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 - (void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 + //(void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 JDIMENSION MCU_col_num; /* index of current MCU within row */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jcdiffct.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jcdiffct.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jcdiffct.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jcdiffct.c 2024-01-09 17:48:36.414609533 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 @@ -302,7 +302,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 METHODDEF(boolean)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 - (void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 + //(void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 /* JDIMENSION MCU_col_num; */ /* index of current MCU within row */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jcpred.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jcpred.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jcpred.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jcpred.c 2024-01-09 17:48:49.766488124 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 @@ -213,7 +213,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 const JSAMPROW input_buf, JSAMPROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 JDIFFROW diff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 - (void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 + //(void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 DIFFERENCE_1D(INITIAL_PREDICTORx);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 /*
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jctrans.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jctrans.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jctrans.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jctrans.c 2024-01-09 17:49:00.070394388 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 @@ -267,7 +267,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 METHODDEF(boolean)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 - (void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 + //(void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 JDIMENSION MCU_col_num; /* index of current MCU within row */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jdmerge.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jdmerge.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jdmerge.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jdmerge.c 2024-01-09 17:49:11.910286634 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 @@ -148,7 +148,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 /* 2:1 vertical sampling case: may need a spare row. */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 - (void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 + //(void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 JSAMPROW work_ptrs[2];
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 JDIMENSION num_rows; /* number of rows returned to caller */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 @@ -198,8 +198,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 /* 1:1 vertical sampling case: much easier, never need a spare row. */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 - (void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 - (void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 + //(void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 + //(void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 /* Just do the upsampling. */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jdpostct.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jdpostct.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jdpostct.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jdpostct.c 2024-01-09 17:49:24.910168268 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 @@ -161,8 +161,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 - (void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 - (void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 + //(void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 + //(void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 my_post_ptr post = (my_post_ptr) cinfo->post;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 JDIMENSION old_next_row, num_rows;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 @@ -207,9 +207,9 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 - (void) input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 - (void) in_row_group_ctr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 - (void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 + //(void) input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 + //(void) in_row_group_ctr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 + //(void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 my_post_ptr post = (my_post_ptr) cinfo->post;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 JDIMENSION num_rows, max_rows;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jdpred.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jdpred.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jdpred.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jdpred.c 2024-01-09 17:50:00.513843814 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 @@ -101,8 +101,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 UNDIFFERENCE_1D(INITIAL_PREDICTOR2);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 @@ -111,8 +111,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 UNDIFFERENCE_2D(PREDICTOR2);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 JPEG_UNUSED(Rb);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 @@ -123,8 +123,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 UNDIFFERENCE_2D(PREDICTOR3);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 JPEG_UNUSED(Rb);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 @@ -135,8 +135,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 UNDIFFERENCE_2D(PREDICTOR4);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 JPEG_UNUSED(Rb);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 @@ -147,8 +147,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 UNDIFFERENCE_2D(PREDICTOR5);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 @@ -160,8 +160,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 UNDIFFERENCE_2D(PREDICTOR6);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 @@ -173,8 +173,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 UNDIFFERENCE_2D(PREDICTOR7);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 @@ -195,7 +195,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 - (void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 + //(void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 UNDIFFERENCE_1D(INITIAL_PREDICTORx);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jdsample.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jdsample.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jdsample.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jdsample.c 2024-01-09 17:50:36.545515066 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 @@ -92,7 +92,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 - (void)in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 + //(void)in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 int ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 jpeg_component_info * compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 @@ -158,8 +158,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 fullsize_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 *output_data_ptr = input_data;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 @@ -173,9 +173,9 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212 noop_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
216 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217 - (void)input_data;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220 + //(void)input_data;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221 *output_data_ptr = NULL; /* safety check */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 @@ -239,7 +239,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 JSAMPARRAY output_data = *output_data_ptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231 register JSAMPROW inptr, outptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232 register JSAMPLE invalue;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 @@ -268,7 +268,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
236 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
237 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
239 JSAMPARRAY output_data = *output_data_ptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240 register JSAMPROW inptr, outptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 register JSAMPLE invalue;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jdscale.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jdscale.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
243 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jdscale.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
244 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jdscale.c 2024-01-09 17:50:42.833457657 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
245 @@ -67,7 +67,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
246 const JDIFFROW diff_buf, JSAMPROW output_buf,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
247 JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
248 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
250 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251 unsigned int xindex;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 for (xindex = 0; xindex < width; xindex++)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
254 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jquant1.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jquant1.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
255 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jquant1.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
256 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jquant1.c 2024-01-09 17:51:03.049273013 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 @@ -251,8 +251,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258 * (Forcing the upper and lower values to the limits ensures that
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 * dithering can't produce a color outside the selected gamut.)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262 - (void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
263 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
264 + //(void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265 return (int) (((IJG_INT32) j * MAXJSAMPLE + maxj/2) / maxj);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
266 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
267
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
268 @@ -262,8 +262,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
269 /* Return largest input value that should map to j'th output value */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270 /* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
272 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
273 - (void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
274 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
275 + //(void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
276 /* Breakpoints are halfway between values returned by output_value */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
277 return (int) (((IJG_INT32) (2*j + 1) * MAXJSAMPLE + maxj) / (2*maxj));
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
278 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
279 @@ -744,7 +744,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
280 METHODDEF(void)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
281 start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
282 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
283 - (void) is_pre_scan;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
284 + //(void) is_pre_scan;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
286 size_t arraysize;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
287 int i;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
288 @@ -802,7 +802,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
289 METHODDEF(void)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
290 finish_pass_1_quant (j_decompress_ptr cinfo)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
291 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
292 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
293 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294 /* no work in 1-pass case */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
297 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jquant2.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jquant2.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
298 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg12/jquant2.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
299 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg12/jquant2.c 2024-01-09 17:51:16.685148405 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
300 @@ -224,7 +224,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301 prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 JSAMPARRAY output_buf, int num_rows)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
303 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
304 - (void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
305 + //(void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
306 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307 register JSAMPROW ptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
308 register histptr histp;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
309 @@ -1156,7 +1156,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
310 METHODDEF(void)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
311 finish_pass2 (j_decompress_ptr cinfo)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
312 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
313 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
314 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
315 /* no work */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
316 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
317
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
318 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jccoefct.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jccoefct.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
319 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jccoefct.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
320 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jccoefct.c 2024-01-09 17:51:24.997072424 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
321 @@ -343,7 +343,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
322 METHODDEF(boolean)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
323 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
324 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
325 - (void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
326 + //(void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
327 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
328 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
329 JDIMENSION MCU_col_num; /* index of current MCU within row */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
330 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jcdiffct.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jcdiffct.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
331 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jcdiffct.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
332 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jcdiffct.c 2024-01-09 17:51:31.549012520 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
333 @@ -302,7 +302,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
334 METHODDEF(boolean)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
335 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
336 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
337 - (void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
338 + //(void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
339 j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
340 c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
341 /* JDIMENSION MCU_col_num; */ /* index of current MCU within row */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
342 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jcpred.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jcpred.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
343 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jcpred.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
344 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jcpred.c 2024-01-09 17:51:40.740928459 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
345 @@ -213,7 +213,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
346 const JSAMPROW input_buf, JSAMPROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
347 JDIFFROW diff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
348 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
349 - (void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
350 + //(void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
351 DIFFERENCE_1D(INITIAL_PREDICTORx);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
352
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
353 /*
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
354 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jctrans.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jctrans.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
355 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jctrans.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
356 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jctrans.c 2024-01-09 17:51:49.244850672 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
357 @@ -267,7 +267,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
358 METHODDEF(boolean)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
359 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
360 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
361 - (void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
362 + //(void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
363 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
364 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
365 JDIMENSION MCU_col_num; /* index of current MCU within row */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
366 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jdmerge.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jdmerge.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
367 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jdmerge.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
368 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jdmerge.c 2024-01-09 17:51:59.852753613 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
369 @@ -171,7 +171,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
370 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
371 /* 2:1 vertical sampling case: may need a spare row. */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
372 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
373 - (void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
374 + //(void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
375 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
376 JSAMPROW work_ptrs[2];
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
377 JDIMENSION num_rows; /* number of rows returned to caller */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
378 @@ -221,8 +221,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
379 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
380 /* 1:1 vertical sampling case: much easier, never need a spare row. */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
381 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
382 - (void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
383 - (void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
384 + //(void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
385 + //(void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
386 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
387
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
388 /* Just do the upsampling. */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
389 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jdpostct.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jdpostct.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
390 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jdpostct.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
391 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jdpostct.c 2024-01-09 17:52:12.796635145 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
392 @@ -161,8 +161,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
393 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
394 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
395 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
396 - (void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
397 - (void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
398 + //(void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
399 + //(void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
400 my_post_ptr post = (my_post_ptr) cinfo->post;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
401 JDIMENSION old_next_row, num_rows;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
402
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
403 @@ -207,9 +207,9 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
404 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
405 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
406 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
407 - (void) input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
408 - (void) in_row_group_ctr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
409 - (void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
410 + //(void) input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
411 + //(void) in_row_group_ctr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
412 + //(void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
413 my_post_ptr post = (my_post_ptr) cinfo->post;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
414 JDIMENSION num_rows, max_rows;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
415
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
416 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jdpred.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jdpred.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
417 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jdpred.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
418 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jdpred.c 2024-01-09 17:53:08.884121363 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
419 @@ -101,8 +101,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
420 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
421 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
422 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
423 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
424 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
425 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
426 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
427 UNDIFFERENCE_1D(INITIAL_PREDICTOR2);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
428 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
429
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
430 @@ -111,8 +111,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
431 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
432 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
433 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
434 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
435 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
436 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
437 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
438 UNDIFFERENCE_2D(PREDICTOR2);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
439 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
440 JPEG_UNUSED(Rb);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
441 @@ -123,8 +123,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
442 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
443 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
444 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
445 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
446 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
447 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
448 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
449 UNDIFFERENCE_2D(PREDICTOR3);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
450 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
451 JPEG_UNUSED(Rb);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
452 @@ -135,8 +135,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
453 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
454 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
455 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
456 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
457 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
458 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
459 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
460 UNDIFFERENCE_2D(PREDICTOR4A);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
461 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
462 JPEG_UNUSED(Rb);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
463 @@ -147,8 +147,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
464 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
465 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
466 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
467 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
468 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
469 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
470 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
471 UNDIFFERENCE_2D(PREDICTOR4);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
472 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
473 JPEG_UNUSED(Rb);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
474 @@ -159,8 +159,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
475 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
476 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
477 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
478 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
479 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
480 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
481 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
482 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
483 UNDIFFERENCE_2D(PREDICTOR5);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
484 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
485 @@ -172,8 +172,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
486 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
487 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
488 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
489 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
490 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
491 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
492 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
493 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
494 UNDIFFERENCE_2D(PREDICTOR5A);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
495 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
496 @@ -185,8 +185,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
497 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
498 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
499 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
500 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
501 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
502 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
503 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
504 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
505 UNDIFFERENCE_2D(PREDICTOR6);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
506 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
507 @@ -198,8 +198,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
508 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
509 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
510 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
511 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
512 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
513 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
514 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
515 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
516 UNDIFFERENCE_2D(PREDICTOR6A);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
517 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
518 @@ -211,8 +211,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
519 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
520 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
521 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
522 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
523 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
524 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
525 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
526 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
527 UNDIFFERENCE_2D(PREDICTOR7);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
528 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
529 @@ -224,8 +224,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
530 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
531 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
532 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
533 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
534 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
535 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
536 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
537 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
538 UNDIFFERENCE_2D(PREDICTOR7A);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
539 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
540 @@ -245,7 +245,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
541 const JDIFFROW diff_buf, JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
542 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
543 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
544 - (void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
545 + //(void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
546 j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
547
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
548 UNDIFFERENCE_1D(INITIAL_PREDICTORx);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
549 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jdsample.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jdsample.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
550 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jdsample.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
551 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jdsample.c 2024-01-09 17:53:28.779938946 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
552 @@ -92,7 +92,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
553 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
554 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
555 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
556 - (void)in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
557 + //(void)in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
558 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
559 int ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
560 jpeg_component_info * compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
561 @@ -158,8 +158,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
562 fullsize_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
563 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
564 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
565 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
566 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
567 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
568 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
569 *output_data_ptr = input_data;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
570 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
571
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
572 @@ -173,9 +173,9 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
573 noop_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
574 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
575 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
576 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
577 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
578 - (void)input_data;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
579 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
580 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
581 + //(void)input_data;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
582 *output_data_ptr = NULL; /* safety check */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
583 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
584
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
585 @@ -239,7 +239,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
586 h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
587 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
588 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
589 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
590 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
591 JSAMPARRAY output_data = *output_data_ptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
592 register JSAMPROW inptr, outptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
593 register JSAMPLE invalue;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
594 @@ -268,7 +268,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
595 h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
596 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
597 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
598 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
599 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
600 JSAMPARRAY output_data = *output_data_ptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
601 register JSAMPROW inptr, outptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
602 register JSAMPLE invalue;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
603 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jdscale.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jdscale.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
604 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jdscale.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
605 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jdscale.c 2024-01-09 17:53:34.795883773 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
606 @@ -67,7 +67,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
607 const JDIFFROW diff_buf, JSAMPROW output_buf,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
608 JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
609 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
610 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
611 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
612 unsigned int xindex;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
613
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
614 for (xindex = 0; xindex < width; xindex++)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
615 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jquant1.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jquant1.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
616 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jquant1.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
617 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jquant1.c 2024-01-09 17:53:53.891708593 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
618 @@ -251,8 +251,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
619 * (Forcing the upper and lower values to the limits ensures that
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
620 * dithering can't produce a color outside the selected gamut.)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
621 */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
622 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
623 - (void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
624 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
625 + //(void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
626 return (int) (((IJG_INT32) j * MAXJSAMPLE + maxj/2) / maxj);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
627 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
628
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
629 @@ -262,8 +262,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
630 /* Return largest input value that should map to j'th output value */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
631 /* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
632 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
633 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
634 - (void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
635 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
636 + //(void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
637 /* Breakpoints are halfway between values returned by output_value */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
638 return (int) (((IJG_INT32) (2*j + 1) * MAXJSAMPLE + maxj) / (2*maxj));
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
639 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
640 @@ -744,7 +744,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
641 METHODDEF(void)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
642 start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
643 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
644 - (void) is_pre_scan;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
645 + //(void) is_pre_scan;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
646 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
647 size_t arraysize;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
648 int i;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
649 @@ -802,7 +802,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
650 METHODDEF(void)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
651 finish_pass_1_quant (j_decompress_ptr cinfo)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
652 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
653 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
654 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
655 /* no work in 1-pass case */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
656 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
657
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
658 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jquant2.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jquant2.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
659 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg16/jquant2.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
660 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg16/jquant2.c 2024-01-09 17:54:05.051606183 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
661 @@ -224,7 +224,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
662 prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
663 JSAMPARRAY output_buf, int num_rows)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
664 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
665 - (void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
666 + //(void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
667 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
668 register JSAMPROW ptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
669 register histptr histp;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
670 @@ -1156,7 +1156,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
671 METHODDEF(void)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
672 finish_pass2 (j_decompress_ptr cinfo)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
673 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
674 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
675 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
676 /* no work */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
677 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
678
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
679 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jccoefct.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jccoefct.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
680 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jccoefct.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
681 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jccoefct.c 2024-01-09 17:54:11.635545753 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
682 @@ -343,7 +343,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
683 METHODDEF(boolean)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
684 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
685 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
686 - (void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
687 + //(void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
688 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
689 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
690 JDIMENSION MCU_col_num; /* index of current MCU within row */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
691 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jcdiffct.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jcdiffct.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
692 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jcdiffct.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
693 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jcdiffct.c 2024-01-09 17:54:16.815498204 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
694 @@ -302,7 +302,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
695 METHODDEF(boolean)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
696 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
697 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
698 - (void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
699 + //(void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
700 j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
701 c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
702 /* JDIMENSION MCU_col_num; */ /* index of current MCU within row */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
703 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jcpred.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jcpred.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
704 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jcpred.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
705 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jcpred.c 2024-01-09 17:54:25.827415468 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
706 @@ -213,7 +213,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
707 const JSAMPROW input_buf, JSAMPROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
708 JDIFFROW diff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
709 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
710 - (void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
711 + //(void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
712 DIFFERENCE_1D(INITIAL_PREDICTORx);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
713
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
714 /*
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
715 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jctrans.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jctrans.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
716 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jctrans.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
717 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jctrans.c 2024-01-09 17:54:33.939340981 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
718 @@ -267,7 +267,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
719 METHODDEF(boolean)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
720 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
721 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
722 - (void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
723 + //(void)input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
724 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
725 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
726 JDIMENSION MCU_col_num; /* index of current MCU within row */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
727 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jdmerge.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jdmerge.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
728 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jdmerge.c 2024-01-09 17:13:10.345673450 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
729 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jdmerge.c 2024-01-09 17:54:41.019275962 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
730 @@ -148,7 +148,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
731 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
732 /* 2:1 vertical sampling case: may need a spare row. */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
733 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
734 - (void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
735 + //(void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
736 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
737 JSAMPROW work_ptrs[2];
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
738 JDIMENSION num_rows; /* number of rows returned to caller */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
739 @@ -198,8 +198,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
740 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
741 /* 1:1 vertical sampling case: much easier, never need a spare row. */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
742 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
743 - (void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
744 - (void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
745 + //(void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
746 + //(void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
747 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
748
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
749 /* Just do the upsampling. */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
750 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jdpostct.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jdpostct.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
751 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jdpostct.c 2024-01-09 17:13:10.349673411 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
752 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jdpostct.c 2024-01-09 17:54:48.891203659 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
753 @@ -161,8 +161,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
754 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
755 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
756 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
757 - (void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
758 - (void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
759 + //(void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
760 + //(void) out_rows_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
761 my_post_ptr post = (my_post_ptr) cinfo->post;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
762 JDIMENSION old_next_row, num_rows;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
763
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
764 @@ -207,9 +207,9 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
765 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
766 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
767 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
768 - (void) input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
769 - (void) in_row_group_ctr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
770 - (void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
771 + //(void) input_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
772 + //(void) in_row_group_ctr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
773 + //(void) in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
774 my_post_ptr post = (my_post_ptr) cinfo->post;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
775 JDIMENSION num_rows, max_rows;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
776
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
777 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jdpred.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jdpred.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
778 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jdpred.c 2024-01-09 17:13:10.349673411 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
779 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jdpred.c 2024-01-09 17:55:02.179081586 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
780 @@ -101,8 +101,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
781 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
782 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
783 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
784 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
785 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
786 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
787 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
788 UNDIFFERENCE_1D(INITIAL_PREDICTOR2);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
789 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
790
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
791 @@ -111,8 +111,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
792 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
793 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
794 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
795 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
796 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
797 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
798 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
799 UNDIFFERENCE_2D(PREDICTOR2);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
800 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
801 JPEG_UNUSED(Rb);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
802 @@ -123,8 +123,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
803 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
804 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
805 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
806 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
807 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
808 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
809 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
810 UNDIFFERENCE_2D(PREDICTOR3);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
811 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
812 JPEG_UNUSED(Rb);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
813 @@ -135,8 +135,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
814 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
815 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
816 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
817 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
818 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
819 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
820 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
821 UNDIFFERENCE_2D(PREDICTOR4);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
822 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
823 JPEG_UNUSED(Rb);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
824 @@ -147,8 +147,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
825 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
826 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
827 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
828 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
829 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
830 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
831 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
832 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
833 UNDIFFERENCE_2D(PREDICTOR5);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
834 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
835 @@ -160,8 +160,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
836 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
837 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
838 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
839 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
840 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
841 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
842 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
843 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
844 UNDIFFERENCE_2D(PREDICTOR6);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
845 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
846 @@ -173,8 +173,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
847 const JDIFFROW diff_buf, const JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
848 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
849 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
850 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
851 - (void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
852 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
853 + //(void)comp_index;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
854 SHIFT_TEMPS
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
855 UNDIFFERENCE_2D(PREDICTOR7);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
856 JPEG_UNUSED(Rc);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
857 @@ -194,7 +194,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
858 const JDIFFROW diff_buf, JDIFFROW prev_row,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
859 JDIFFROW undiff_buf, JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
860 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
861 - (void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
862 + //(void)prev_row;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
863 j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
864
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
865 UNDIFFERENCE_1D(INITIAL_PREDICTORx);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
866 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jdsample.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jdsample.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
867 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jdsample.c 2024-01-09 17:13:10.349673411 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
868 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jdsample.c 2024-01-09 17:55:13.234979994 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
869 @@ -92,7 +92,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
870 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
871 JDIMENSION out_rows_avail)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
872 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
873 - (void)in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
874 + //(void)in_row_groups_avail;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
875 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
876 int ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
877 jpeg_component_info * compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
878 @@ -158,8 +158,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
879 fullsize_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
880 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
881 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
882 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
883 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
884 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
885 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
886 *output_data_ptr = input_data;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
887 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
888
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
889 @@ -173,9 +173,9 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
890 noop_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
891 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
892 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
893 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
894 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
895 - (void)input_data;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
896 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
897 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
898 + //(void)input_data;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
899 *output_data_ptr = NULL; /* safety check */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
900 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
901
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
902 @@ -239,7 +239,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
903 h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
904 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
905 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
906 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
907 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
908 JSAMPARRAY output_data = *output_data_ptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
909 register JSAMPROW inptr, outptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
910 register JSAMPLE invalue;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
911 @@ -268,7 +268,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
912 h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
913 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
914 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
915 - (void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
916 + //(void)compptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
917 JSAMPARRAY output_data = *output_data_ptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
918 register JSAMPROW inptr, outptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
919 register JSAMPLE invalue;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
920 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jdscale.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jdscale.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
921 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jdscale.c 2024-01-09 17:13:10.349673411 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
922 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jdscale.c 2024-01-09 17:55:21.722901985 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
923 @@ -67,7 +67,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
924 const JDIFFROW diff_buf, JSAMPROW output_buf,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
925 JDIMENSION width)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
926 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
927 - (void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
928 + //(void)cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
929 unsigned int xindex;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
930
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
931 for (xindex = 0; xindex < width; xindex++)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
932 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jquant1.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jquant1.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
933 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jquant1.c 2024-01-09 17:13:10.349673411 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
934 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jquant1.c 2024-01-09 17:48:22.270738074 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
935 @@ -251,8 +251,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
936 * (Forcing the upper and lower values to the limits ensures that
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
937 * dithering can't produce a color outside the selected gamut.)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
938 */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
939 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
940 - (void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
941 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
942 + //(void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
943 return (int) (((IJG_INT32) j * MAXJSAMPLE + maxj/2) / maxj);
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
944 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
945
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
946 @@ -262,8 +262,8 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
947 /* Return largest input value that should map to j'th output value */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
948 /* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
949 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
950 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
951 - (void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
952 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
953 + //(void) ci;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
954 /* Breakpoints are halfway between values returned by output_value */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
955 return (int) (((IJG_INT32) (2*j + 1) * MAXJSAMPLE + maxj) / (2*maxj));
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
956 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
957 @@ -744,7 +744,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
958 METHODDEF(void)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
959 start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
960 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
961 - (void) is_pre_scan;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
962 + //(void) is_pre_scan;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
963 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
964 size_t arraysize;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
965 int i;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
966 @@ -802,7 +802,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
967 METHODDEF(void)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
968 finish_pass_1_quant (j_decompress_ptr cinfo)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
969 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
970 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
971 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
972 /* no work in 1-pass case */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
973 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
974
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
975 diff -urEb dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jquant2.c dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jquant2.c
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
976 --- dcmtk-DCMTK-3.6.8.orig/dcmjpeg/libijg8/jquant2.c 2024-01-09 17:13:10.349673411 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
977 +++ dcmtk-DCMTK-3.6.8/dcmjpeg/libijg8/jquant2.c 2024-01-09 17:47:42.343100533 +0100
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
978 @@ -224,7 +224,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
979 prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
980 JSAMPARRAY output_buf, int num_rows)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
981 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
982 - (void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
983 + //(void) output_buf;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
984 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
985 register JSAMPROW ptr;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
986 register histptr histp;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
987 @@ -1156,7 +1156,7 @@
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
988 METHODDEF(void)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
989 finish_pass2 (j_decompress_ptr cinfo)
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
990 {
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
991 - (void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
992 + //(void) cinfo;
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
993 /* no work */
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
994 }
5bd262ce16b3 fix dcmtk 3.6.8 patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
995