|
5075
|
1 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jccoefct.c dcmtk-3.6.7/dcmjpeg/libijg12/jccoefct.c
|
|
|
2 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jccoefct.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
3 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jccoefct.c 2022-08-16 12:21:34.000000000 +0200
|
|
|
4 @@ -343,7 +343,7 @@
|
|
|
5 METHODDEF(boolean)
|
|
|
6 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
|
|
|
7 {
|
|
|
8 - (void)input_buf;
|
|
|
9 + //(void)input_buf;
|
|
|
10 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
|
|
|
11 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
|
|
|
12 JDIMENSION MCU_col_num; /* index of current MCU within row */
|
|
|
13 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jcdiffct.c dcmtk-3.6.7/dcmjpeg/libijg12/jcdiffct.c
|
|
|
14 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jcdiffct.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
15 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jcdiffct.c 2022-08-16 12:21:20.000000000 +0200
|
|
|
16 @@ -302,7 +302,7 @@
|
|
|
17 METHODDEF(boolean)
|
|
|
18 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
|
|
|
19 {
|
|
|
20 - (void)input_buf;
|
|
|
21 + //(void)input_buf;
|
|
|
22 j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
|
|
|
23 c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
|
|
|
24 /* JDIMENSION MCU_col_num; */ /* index of current MCU within row */
|
|
|
25 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jcpred.c dcmtk-3.6.7/dcmjpeg/libijg12/jcpred.c
|
|
|
26 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jcpred.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
27 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jcpred.c 2022-08-16 12:21:04.000000000 +0200
|
|
|
28 @@ -213,7 +213,7 @@
|
|
|
29 const JSAMPROW input_buf, JSAMPROW prev_row,
|
|
|
30 JDIFFROW diff_buf, JDIMENSION width)
|
|
|
31 {
|
|
|
32 - (void)prev_row;
|
|
|
33 + //(void)prev_row;
|
|
|
34 DIFFERENCE_1D(INITIAL_PREDICTORx);
|
|
|
35
|
|
|
36 /*
|
|
|
37 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jctrans.c dcmtk-3.6.7/dcmjpeg/libijg12/jctrans.c
|
|
|
38 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jctrans.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
39 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jctrans.c 2022-08-16 12:20:36.000000000 +0200
|
|
|
40 @@ -267,7 +267,7 @@
|
|
|
41 METHODDEF(boolean)
|
|
|
42 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
|
|
|
43 {
|
|
|
44 - (void)input_buf;
|
|
|
45 + //(void)input_buf;
|
|
|
46 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
|
|
|
47 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
|
|
|
48 JDIMENSION MCU_col_num; /* index of current MCU within row */
|
|
|
49 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jdmerge.c dcmtk-3.6.7/dcmjpeg/libijg12/jdmerge.c
|
|
|
50 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jdmerge.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
51 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jdmerge.c 2022-08-16 12:20:14.000000000 +0200
|
|
|
52 @@ -148,7 +148,7 @@
|
|
|
53 JDIMENSION out_rows_avail)
|
|
|
54 /* 2:1 vertical sampling case: may need a spare row. */
|
|
|
55 {
|
|
|
56 - (void) in_row_groups_avail;
|
|
|
57 + //(void) in_row_groups_avail;
|
|
|
58 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
|
|
59 JSAMPROW work_ptrs[2];
|
|
|
60 JDIMENSION num_rows; /* number of rows returned to caller */
|
|
|
61 @@ -198,8 +198,8 @@
|
|
|
62 JDIMENSION out_rows_avail)
|
|
|
63 /* 1:1 vertical sampling case: much easier, never need a spare row. */
|
|
|
64 {
|
|
|
65 - (void) in_row_groups_avail;
|
|
|
66 - (void) out_rows_avail;
|
|
|
67 + //(void) in_row_groups_avail;
|
|
|
68 + //(void) out_rows_avail;
|
|
|
69 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
|
|
70
|
|
|
71 /* Just do the upsampling. */
|
|
|
72 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jdpostct.c dcmtk-3.6.7/dcmjpeg/libijg12/jdpostct.c
|
|
|
73 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jdpostct.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
74 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jdpostct.c 2022-08-16 12:19:54.000000000 +0200
|
|
|
75 @@ -161,8 +161,8 @@
|
|
|
76 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
|
|
|
77 JDIMENSION out_rows_avail)
|
|
|
78 {
|
|
|
79 - (void) output_buf;
|
|
|
80 - (void) out_rows_avail;
|
|
|
81 + //(void) output_buf;
|
|
|
82 + //(void) out_rows_avail;
|
|
|
83 my_post_ptr post = (my_post_ptr) cinfo->post;
|
|
|
84 JDIMENSION old_next_row, num_rows;
|
|
|
85
|
|
|
86 @@ -207,9 +207,9 @@
|
|
|
87 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
|
|
|
88 JDIMENSION out_rows_avail)
|
|
|
89 {
|
|
|
90 - (void) input_buf;
|
|
|
91 - (void) in_row_group_ctr;
|
|
|
92 - (void) in_row_groups_avail;
|
|
|
93 + //(void) input_buf;
|
|
|
94 + //(void) in_row_group_ctr;
|
|
|
95 + //(void) in_row_groups_avail;
|
|
|
96
|
|
|
97 my_post_ptr post = (my_post_ptr) cinfo->post;
|
|
|
98 JDIMENSION num_rows, max_rows;
|
|
|
99 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jdpred.c dcmtk-3.6.7/dcmjpeg/libijg12/jdpred.c
|
|
|
100 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jdpred.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
101 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jdpred.c 2022-08-16 12:19:22.000000000 +0200
|
|
|
102 @@ -101,8 +101,8 @@
|
|
|
103 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
104 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
105 {
|
|
|
106 - (void)cinfo;
|
|
|
107 - (void)comp_index;
|
|
|
108 + //(void)cinfo;
|
|
|
109 + //(void)comp_index;
|
|
|
110 UNDIFFERENCE_1D(INITIAL_PREDICTOR2);
|
|
|
111 }
|
|
|
112
|
|
|
113 @@ -111,8 +111,8 @@
|
|
|
114 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
115 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
116 {
|
|
|
117 - (void)cinfo;
|
|
|
118 - (void)comp_index;
|
|
|
119 + //(void)cinfo;
|
|
|
120 + //(void)comp_index;
|
|
|
121 UNDIFFERENCE_2D(PREDICTOR2);
|
|
|
122 JPEG_UNUSED(Rc);
|
|
|
123 JPEG_UNUSED(Rb);
|
|
|
124 @@ -123,8 +123,8 @@
|
|
|
125 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
126 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
127 {
|
|
|
128 - (void)cinfo;
|
|
|
129 - (void)comp_index;
|
|
|
130 + //(void)cinfo;
|
|
|
131 + //(void)comp_index;
|
|
|
132 UNDIFFERENCE_2D(PREDICTOR3);
|
|
|
133 JPEG_UNUSED(Rc);
|
|
|
134 JPEG_UNUSED(Rb);
|
|
|
135 @@ -135,8 +135,8 @@
|
|
|
136 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
137 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
138 {
|
|
|
139 - (void)cinfo;
|
|
|
140 - (void)comp_index;
|
|
|
141 + //(void)cinfo;
|
|
|
142 + //(void)comp_index;
|
|
|
143 UNDIFFERENCE_2D(PREDICTOR4);
|
|
|
144 JPEG_UNUSED(Rc);
|
|
|
145 JPEG_UNUSED(Rb);
|
|
|
146 @@ -147,8 +147,8 @@
|
|
|
147 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
148 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
149 {
|
|
|
150 - (void)cinfo;
|
|
|
151 - (void)comp_index;
|
|
|
152 + //(void)cinfo;
|
|
|
153 + //(void)comp_index;
|
|
|
154 SHIFT_TEMPS
|
|
|
155 UNDIFFERENCE_2D(PREDICTOR5);
|
|
|
156 JPEG_UNUSED(Rc);
|
|
|
157 @@ -160,8 +160,8 @@
|
|
|
158 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
159 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
160 {
|
|
|
161 - (void)cinfo;
|
|
|
162 - (void)comp_index;
|
|
|
163 + //(void)cinfo;
|
|
|
164 + //(void)comp_index;
|
|
|
165 SHIFT_TEMPS
|
|
|
166 UNDIFFERENCE_2D(PREDICTOR6);
|
|
|
167 JPEG_UNUSED(Rc);
|
|
|
168 @@ -173,8 +173,8 @@
|
|
|
169 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
170 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
171 {
|
|
|
172 - (void)cinfo;
|
|
|
173 - (void)comp_index;
|
|
|
174 + //(void)cinfo;
|
|
|
175 + //(void)comp_index;
|
|
|
176 SHIFT_TEMPS
|
|
|
177 UNDIFFERENCE_2D(PREDICTOR7);
|
|
|
178 JPEG_UNUSED(Rc);
|
|
|
179 @@ -195,7 +195,7 @@
|
|
|
180 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
181 {
|
|
|
182
|
|
|
183 - (void)prev_row;
|
|
|
184 + //(void)prev_row;
|
|
|
185 j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
|
|
|
186
|
|
|
187 UNDIFFERENCE_1D(INITIAL_PREDICTORx);
|
|
|
188 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jdsample.c dcmtk-3.6.7/dcmjpeg/libijg12/jdsample.c
|
|
|
189 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jdsample.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
190 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jdsample.c 2022-08-16 12:18:32.000000000 +0200
|
|
|
191 @@ -92,7 +92,7 @@
|
|
|
192 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
|
|
|
193 JDIMENSION out_rows_avail)
|
|
|
194 {
|
|
|
195 - (void)in_row_groups_avail;
|
|
|
196 + //(void)in_row_groups_avail;
|
|
|
197 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
|
|
198 int ci;
|
|
|
199 jpeg_component_info * compptr;
|
|
|
200 @@ -239,7 +239,7 @@
|
|
|
201 h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
|
|
|
202 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
|
|
|
203 {
|
|
|
204 - (void)compptr;
|
|
|
205 + //(void)compptr;
|
|
|
206 JSAMPARRAY output_data = *output_data_ptr;
|
|
|
207 register JSAMPROW inptr, outptr;
|
|
|
208 register JSAMPLE invalue;
|
|
|
209 @@ -268,7 +268,7 @@
|
|
|
210 h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
|
|
|
211 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
|
|
|
212 {
|
|
|
213 - (void)compptr;
|
|
|
214 + //(void)compptr;
|
|
|
215 JSAMPARRAY output_data = *output_data_ptr;
|
|
|
216 register JSAMPROW inptr, outptr;
|
|
|
217 register JSAMPLE invalue;
|
|
|
218 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jdscale.c dcmtk-3.6.7/dcmjpeg/libijg12/jdscale.c
|
|
|
219 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jdscale.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
220 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jdscale.c 2022-08-16 12:18:02.000000000 +0200
|
|
|
221 @@ -67,7 +67,7 @@
|
|
|
222 const JDIFFROW diff_buf, JSAMPROW output_buf,
|
|
|
223 JDIMENSION width)
|
|
|
224 {
|
|
|
225 - (void)cinfo;
|
|
|
226 + //(void)cinfo;
|
|
|
227 unsigned int xindex;
|
|
|
228
|
|
|
229 for (xindex = 0; xindex < width; xindex++)
|
|
|
230 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jquant1.c dcmtk-3.6.7/dcmjpeg/libijg12/jquant1.c
|
|
|
231 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jquant1.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
232 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jquant1.c 2022-08-16 12:17:44.000000000 +0200
|
|
|
233 @@ -744,7 +744,7 @@
|
|
|
234 METHODDEF(void)
|
|
|
235 start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
|
|
|
236 {
|
|
|
237 - (void) is_pre_scan;
|
|
|
238 + //(void) is_pre_scan;
|
|
|
239 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
|
|
|
240 size_t arraysize;
|
|
|
241 int i;
|
|
|
242 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg12/jquant2.c dcmtk-3.6.7/dcmjpeg/libijg12/jquant2.c
|
|
|
243 --- dcmtk-3.6.7.orig/dcmjpeg/libijg12/jquant2.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
244 +++ dcmtk-3.6.7/dcmjpeg/libijg12/jquant2.c 2022-08-16 12:17:30.000000000 +0200
|
|
|
245 @@ -224,7 +224,7 @@
|
|
|
246 prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
|
|
|
247 JSAMPARRAY output_buf, int num_rows)
|
|
|
248 {
|
|
|
249 - (void) output_buf;
|
|
|
250 + //(void) output_buf;
|
|
|
251 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
|
|
|
252 register JSAMPROW ptr;
|
|
|
253 register histptr histp;
|
|
|
254 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jccoefct.c dcmtk-3.6.7/dcmjpeg/libijg16/jccoefct.c
|
|
|
255 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jccoefct.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
256 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jccoefct.c 2022-08-16 12:17:02.000000000 +0200
|
|
|
257 @@ -343,7 +343,7 @@
|
|
|
258 METHODDEF(boolean)
|
|
|
259 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
|
|
|
260 {
|
|
|
261 - (void)input_buf;
|
|
|
262 + //(void)input_buf;
|
|
|
263 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
|
|
|
264 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
|
|
|
265 JDIMENSION MCU_col_num; /* index of current MCU within row */
|
|
|
266 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jcdiffct.c dcmtk-3.6.7/dcmjpeg/libijg16/jcdiffct.c
|
|
|
267 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jcdiffct.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
268 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jcdiffct.c 2022-08-16 12:14:16.000000000 +0200
|
|
|
269 @@ -302,7 +302,7 @@
|
|
|
270 METHODDEF(boolean)
|
|
|
271 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
|
|
|
272 {
|
|
|
273 - (void)input_buf;
|
|
|
274 + //(void)input_buf;
|
|
|
275 j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
|
|
|
276 c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
|
|
|
277 /* JDIMENSION MCU_col_num; */ /* index of current MCU within row */
|
|
|
278 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jcpred.c dcmtk-3.6.7/dcmjpeg/libijg16/jcpred.c
|
|
|
279 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jcpred.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
280 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jcpred.c 2022-08-16 12:14:00.000000000 +0200
|
|
|
281 @@ -213,7 +213,7 @@
|
|
|
282 const JSAMPROW input_buf, JSAMPROW prev_row,
|
|
|
283 JDIFFROW diff_buf, JDIMENSION width)
|
|
|
284 {
|
|
|
285 - (void)prev_row;
|
|
|
286 + //(void)prev_row;
|
|
|
287 DIFFERENCE_1D(INITIAL_PREDICTORx);
|
|
|
288
|
|
|
289 /*
|
|
|
290 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jctrans.c dcmtk-3.6.7/dcmjpeg/libijg16/jctrans.c
|
|
|
291 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jctrans.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
292 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jctrans.c 2022-08-16 12:13:42.000000000 +0200
|
|
|
293 @@ -267,7 +267,7 @@
|
|
|
294 METHODDEF(boolean)
|
|
|
295 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
|
|
|
296 {
|
|
|
297 - (void)input_buf;
|
|
|
298 + //(void)input_buf;
|
|
|
299 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
|
|
|
300 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
|
|
|
301 JDIMENSION MCU_col_num; /* index of current MCU within row */
|
|
|
302 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jdmerge.c dcmtk-3.6.7/dcmjpeg/libijg16/jdmerge.c
|
|
|
303 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jdmerge.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
304 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jdmerge.c 2022-08-16 12:13:18.000000000 +0200
|
|
|
305 @@ -171,7 +171,7 @@
|
|
|
306 JDIMENSION out_rows_avail)
|
|
|
307 /* 2:1 vertical sampling case: may need a spare row. */
|
|
|
308 {
|
|
|
309 - (void) in_row_groups_avail;
|
|
|
310 + //(void) in_row_groups_avail;
|
|
|
311 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
|
|
312 JSAMPROW work_ptrs[2];
|
|
|
313 JDIMENSION num_rows; /* number of rows returned to caller */
|
|
|
314 @@ -221,8 +221,8 @@
|
|
|
315 JDIMENSION out_rows_avail)
|
|
|
316 /* 1:1 vertical sampling case: much easier, never need a spare row. */
|
|
|
317 {
|
|
|
318 - (void) in_row_groups_avail;
|
|
|
319 - (void) out_rows_avail;
|
|
|
320 + //(void) in_row_groups_avail;
|
|
|
321 + //(void) out_rows_avail;
|
|
|
322 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
|
|
323
|
|
|
324 /* Just do the upsampling. */
|
|
|
325 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jdpostct.c dcmtk-3.6.7/dcmjpeg/libijg16/jdpostct.c
|
|
|
326 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jdpostct.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
327 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jdpostct.c 2022-08-16 12:12:54.000000000 +0200
|
|
|
328 @@ -161,8 +161,8 @@
|
|
|
329 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
|
|
|
330 JDIMENSION out_rows_avail)
|
|
|
331 {
|
|
|
332 - (void) output_buf;
|
|
|
333 - (void) out_rows_avail;
|
|
|
334 + //(void) output_buf;
|
|
|
335 + //(void) out_rows_avail;
|
|
|
336 my_post_ptr post = (my_post_ptr) cinfo->post;
|
|
|
337 JDIMENSION old_next_row, num_rows;
|
|
|
338
|
|
|
339 @@ -207,9 +207,9 @@
|
|
|
340 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
|
|
|
341 JDIMENSION out_rows_avail)
|
|
|
342 {
|
|
|
343 - (void) input_buf;
|
|
|
344 - (void) in_row_group_ctr;
|
|
|
345 - (void) in_row_groups_avail;
|
|
|
346 + //(void) input_buf;
|
|
|
347 + //(void) in_row_group_ctr;
|
|
|
348 + //(void) in_row_groups_avail;
|
|
|
349 my_post_ptr post = (my_post_ptr) cinfo->post;
|
|
|
350 JDIMENSION num_rows, max_rows;
|
|
|
351
|
|
|
352 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jdpred.c dcmtk-3.6.7/dcmjpeg/libijg16/jdpred.c
|
|
|
353 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jdpred.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
354 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jdpred.c 2022-08-16 12:12:26.000000000 +0200
|
|
|
355 @@ -101,8 +101,8 @@
|
|
|
356 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
357 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
358 {
|
|
|
359 - (void)cinfo;
|
|
|
360 - (void)comp_index;
|
|
|
361 + //(void)cinfo;
|
|
|
362 + //(void)comp_index;
|
|
|
363 UNDIFFERENCE_1D(INITIAL_PREDICTOR2);
|
|
|
364 }
|
|
|
365
|
|
|
366 @@ -111,8 +111,8 @@
|
|
|
367 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
368 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
369 {
|
|
|
370 - (void)cinfo;
|
|
|
371 - (void)comp_index;
|
|
|
372 + //(void)cinfo;
|
|
|
373 + //(void)comp_index;
|
|
|
374 UNDIFFERENCE_2D(PREDICTOR2);
|
|
|
375 JPEG_UNUSED(Rc);
|
|
|
376 JPEG_UNUSED(Rb);
|
|
|
377 @@ -123,8 +123,8 @@
|
|
|
378 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
379 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
380 {
|
|
|
381 - (void)cinfo;
|
|
|
382 - (void)comp_index;
|
|
|
383 + //(void)cinfo;
|
|
|
384 + //(void)comp_index;
|
|
|
385 UNDIFFERENCE_2D(PREDICTOR3);
|
|
|
386 JPEG_UNUSED(Rc);
|
|
|
387 JPEG_UNUSED(Rb);
|
|
|
388 @@ -135,8 +135,8 @@
|
|
|
389 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
390 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
391 {
|
|
|
392 - (void)cinfo;
|
|
|
393 - (void)comp_index;
|
|
|
394 + //(void)cinfo;
|
|
|
395 + //(void)comp_index;
|
|
|
396 UNDIFFERENCE_2D(PREDICTOR4A);
|
|
|
397 JPEG_UNUSED(Rc);
|
|
|
398 JPEG_UNUSED(Rb);
|
|
|
399 @@ -147,8 +147,8 @@
|
|
|
400 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
401 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
402 {
|
|
|
403 - (void)cinfo;
|
|
|
404 - (void)comp_index;
|
|
|
405 + //(void)cinfo;
|
|
|
406 + //(void)comp_index;
|
|
|
407 UNDIFFERENCE_2D(PREDICTOR4);
|
|
|
408 JPEG_UNUSED(Rc);
|
|
|
409 JPEG_UNUSED(Rb);
|
|
|
410 @@ -159,8 +159,8 @@
|
|
|
411 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
412 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
413 {
|
|
|
414 - (void)cinfo;
|
|
|
415 - (void)comp_index;
|
|
|
416 + //(void)cinfo;
|
|
|
417 + //(void)comp_index;
|
|
|
418 SHIFT_TEMPS
|
|
|
419 UNDIFFERENCE_2D(PREDICTOR5);
|
|
|
420 JPEG_UNUSED(Rc);
|
|
|
421 @@ -172,8 +172,8 @@
|
|
|
422 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
423 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
424 {
|
|
|
425 - (void)cinfo;
|
|
|
426 - (void)comp_index;
|
|
|
427 + //(void)cinfo;
|
|
|
428 + //(void)comp_index;
|
|
|
429 SHIFT_TEMPS
|
|
|
430 UNDIFFERENCE_2D(PREDICTOR5A);
|
|
|
431 JPEG_UNUSED(Rc);
|
|
|
432 @@ -185,8 +185,8 @@
|
|
|
433 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
434 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
435 {
|
|
|
436 - (void)cinfo;
|
|
|
437 - (void)comp_index;
|
|
|
438 + //(void)cinfo;
|
|
|
439 + //(void)comp_index;
|
|
|
440 SHIFT_TEMPS
|
|
|
441 UNDIFFERENCE_2D(PREDICTOR6);
|
|
|
442 JPEG_UNUSED(Rc);
|
|
|
443 @@ -198,8 +198,8 @@
|
|
|
444 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
445 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
446 {
|
|
|
447 - (void)cinfo;
|
|
|
448 - (void)comp_index;
|
|
|
449 + //(void)cinfo;
|
|
|
450 + //(void)comp_index;
|
|
|
451 SHIFT_TEMPS
|
|
|
452 UNDIFFERENCE_2D(PREDICTOR6A);
|
|
|
453 JPEG_UNUSED(Rc);
|
|
|
454 @@ -211,8 +211,8 @@
|
|
|
455 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
456 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
457 {
|
|
|
458 - (void)cinfo;
|
|
|
459 - (void)comp_index;
|
|
|
460 + //(void)cinfo;
|
|
|
461 + //(void)comp_index;
|
|
|
462 SHIFT_TEMPS
|
|
|
463 UNDIFFERENCE_2D(PREDICTOR7);
|
|
|
464 JPEG_UNUSED(Rc);
|
|
|
465 @@ -224,8 +224,8 @@
|
|
|
466 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
467 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
468 {
|
|
|
469 - (void)cinfo;
|
|
|
470 - (void)comp_index;
|
|
|
471 + //(void)cinfo;
|
|
|
472 + //(void)comp_index;
|
|
|
473 SHIFT_TEMPS
|
|
|
474 UNDIFFERENCE_2D(PREDICTOR7A);
|
|
|
475 JPEG_UNUSED(Rc);
|
|
|
476 @@ -245,7 +245,7 @@
|
|
|
477 const JDIFFROW diff_buf, JDIFFROW prev_row,
|
|
|
478 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
479 {
|
|
|
480 - (void)prev_row;
|
|
|
481 + //(void)prev_row;
|
|
|
482 j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
|
|
|
483
|
|
|
484 UNDIFFERENCE_1D(INITIAL_PREDICTORx);
|
|
|
485 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jdsample.c dcmtk-3.6.7/dcmjpeg/libijg16/jdsample.c
|
|
|
486 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jdsample.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
487 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jdsample.c 2022-08-16 12:10:32.000000000 +0200
|
|
|
488 @@ -92,7 +92,7 @@
|
|
|
489 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
|
|
|
490 JDIMENSION out_rows_avail)
|
|
|
491 {
|
|
|
492 - (void)in_row_groups_avail;
|
|
|
493 + //(void)in_row_groups_avail;
|
|
|
494 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
|
|
495 int ci;
|
|
|
496 jpeg_component_info * compptr;
|
|
|
497 @@ -239,7 +239,7 @@
|
|
|
498 h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
|
|
|
499 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
|
|
|
500 {
|
|
|
501 - (void)compptr;
|
|
|
502 + //(void)compptr;
|
|
|
503 JSAMPARRAY output_data = *output_data_ptr;
|
|
|
504 register JSAMPROW inptr, outptr;
|
|
|
505 register JSAMPLE invalue;
|
|
|
506 @@ -268,7 +268,7 @@
|
|
|
507 h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
|
|
|
508 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
|
|
|
509 {
|
|
|
510 - (void)compptr;
|
|
|
511 + //(void)compptr;
|
|
|
512 JSAMPARRAY output_data = *output_data_ptr;
|
|
|
513 register JSAMPROW inptr, outptr;
|
|
|
514 register JSAMPLE invalue;
|
|
|
515 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jdscale.c dcmtk-3.6.7/dcmjpeg/libijg16/jdscale.c
|
|
|
516 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jdscale.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
517 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jdscale.c 2022-08-16 12:04:18.000000000 +0200
|
|
|
518 @@ -67,8 +67,8 @@
|
|
|
519 const JDIFFROW diff_buf, JSAMPROW output_buf,
|
|
|
520 JDIMENSION width)
|
|
|
521 {
|
|
|
522 - (void)cinfo;
|
|
|
523 unsigned int xindex;
|
|
|
524 + (void)cinfo;
|
|
|
525
|
|
|
526 for (xindex = 0; xindex < width; xindex++)
|
|
|
527 output_buf[xindex] = (JSAMPLE) diff_buf[xindex];
|
|
|
528 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jquant1.c dcmtk-3.6.7/dcmjpeg/libijg16/jquant1.c
|
|
|
529 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jquant1.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
530 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jquant1.c 2022-08-16 12:03:56.000000000 +0200
|
|
|
531 @@ -744,10 +744,10 @@
|
|
|
532 METHODDEF(void)
|
|
|
533 start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
|
|
|
534 {
|
|
|
535 - (void) is_pre_scan;
|
|
|
536 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
|
|
|
537 size_t arraysize;
|
|
|
538 int i;
|
|
|
539 + (void) is_pre_scan;
|
|
|
540
|
|
|
541 /* Install my colormap. */
|
|
|
542 cinfo->colormap = cquantize->sv_colormap;
|
|
|
543 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg16/jquant2.c dcmtk-3.6.7/dcmjpeg/libijg16/jquant2.c
|
|
|
544 --- dcmtk-3.6.7.orig/dcmjpeg/libijg16/jquant2.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
545 +++ dcmtk-3.6.7/dcmjpeg/libijg16/jquant2.c 2022-08-16 12:03:14.000000000 +0200
|
|
|
546 @@ -224,7 +224,6 @@
|
|
|
547 prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
|
|
|
548 JSAMPARRAY output_buf, int num_rows)
|
|
|
549 {
|
|
|
550 - (void) output_buf;
|
|
|
551 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
|
|
|
552 register JSAMPROW ptr;
|
|
|
553 register histptr histp;
|
|
|
554 @@ -232,6 +231,7 @@
|
|
|
555 int row;
|
|
|
556 JDIMENSION col;
|
|
|
557 JDIMENSION width = cinfo->output_width;
|
|
|
558 + (void) output_buf;
|
|
|
559
|
|
|
560 for (row = 0; row < num_rows; row++) {
|
|
|
561 ptr = input_buf[row];
|
|
|
562 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jccoefct.c dcmtk-3.6.7/dcmjpeg/libijg8/jccoefct.c
|
|
|
563 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jccoefct.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
564 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jccoefct.c 2022-08-16 12:27:04.000000000 +0200
|
|
|
565 @@ -343,7 +343,7 @@
|
|
|
566 METHODDEF(boolean)
|
|
|
567 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
|
|
|
568 {
|
|
|
569 - (void)input_buf;
|
|
|
570 + //(void)input_buf;
|
|
|
571 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
|
|
|
572 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
|
|
|
573 JDIMENSION MCU_col_num; /* index of current MCU within row */
|
|
|
574 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jcdiffct.c dcmtk-3.6.7/dcmjpeg/libijg8/jcdiffct.c
|
|
|
575 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jcdiffct.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
576 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jcdiffct.c 2022-08-16 12:26:48.000000000 +0200
|
|
|
577 @@ -302,7 +302,7 @@
|
|
|
578 METHODDEF(boolean)
|
|
|
579 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
|
|
|
580 {
|
|
|
581 - (void)input_buf;
|
|
|
582 + //(void)input_buf;
|
|
|
583 j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
|
|
|
584 c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
|
|
|
585 /* JDIMENSION MCU_col_num; */ /* index of current MCU within row */
|
|
|
586 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jcpred.c dcmtk-3.6.7/dcmjpeg/libijg8/jcpred.c
|
|
|
587 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jcpred.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
588 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jcpred.c 2022-08-16 12:26:32.000000000 +0200
|
|
|
589 @@ -213,7 +213,7 @@
|
|
|
590 const JSAMPROW input_buf, JSAMPROW prev_row,
|
|
|
591 JDIFFROW diff_buf, JDIMENSION width)
|
|
|
592 {
|
|
|
593 - (void)prev_row;
|
|
|
594 + //(void)prev_row;
|
|
|
595 DIFFERENCE_1D(INITIAL_PREDICTORx);
|
|
|
596
|
|
|
597 /*
|
|
|
598 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jctrans.c dcmtk-3.6.7/dcmjpeg/libijg8/jctrans.c
|
|
|
599 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jctrans.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
600 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jctrans.c 2022-08-16 12:25:56.000000000 +0200
|
|
|
601 @@ -267,7 +267,7 @@
|
|
|
602 METHODDEF(boolean)
|
|
|
603 compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
|
|
|
604 {
|
|
|
605 - (void)input_buf;
|
|
|
606 + //(void)input_buf;
|
|
|
607 j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
|
|
|
608 c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
|
|
|
609 JDIMENSION MCU_col_num; /* index of current MCU within row */
|
|
|
610 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jdmerge.c dcmtk-3.6.7/dcmjpeg/libijg8/jdmerge.c
|
|
|
611 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jdmerge.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
612 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jdmerge.c 2022-08-16 12:25:36.000000000 +0200
|
|
|
613 @@ -148,7 +148,7 @@
|
|
|
614 JDIMENSION out_rows_avail)
|
|
|
615 /* 2:1 vertical sampling case: may need a spare row. */
|
|
|
616 {
|
|
|
617 - (void) in_row_groups_avail;
|
|
|
618 + //(void) in_row_groups_avail;
|
|
|
619 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
|
|
620 JSAMPROW work_ptrs[2];
|
|
|
621 JDIMENSION num_rows; /* number of rows returned to caller */
|
|
|
622 @@ -198,8 +198,8 @@
|
|
|
623 JDIMENSION out_rows_avail)
|
|
|
624 /* 1:1 vertical sampling case: much easier, never need a spare row. */
|
|
|
625 {
|
|
|
626 - (void) in_row_groups_avail;
|
|
|
627 - (void) out_rows_avail;
|
|
|
628 + //(void) in_row_groups_avail;
|
|
|
629 + //(void) out_rows_avail;
|
|
|
630 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
|
|
631
|
|
|
632 /* Just do the upsampling. */
|
|
|
633 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jdpostct.c dcmtk-3.6.7/dcmjpeg/libijg8/jdpostct.c
|
|
|
634 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jdpostct.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
635 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jdpostct.c 2022-08-16 12:25:12.000000000 +0200
|
|
|
636 @@ -161,8 +161,8 @@
|
|
|
637 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
|
|
|
638 JDIMENSION out_rows_avail)
|
|
|
639 {
|
|
|
640 - (void) output_buf;
|
|
|
641 - (void) out_rows_avail;
|
|
|
642 + //(void) output_buf;
|
|
|
643 + //(void) out_rows_avail;
|
|
|
644 my_post_ptr post = (my_post_ptr) cinfo->post;
|
|
|
645 JDIMENSION old_next_row, num_rows;
|
|
|
646
|
|
|
647 @@ -207,9 +207,9 @@
|
|
|
648 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
|
|
|
649 JDIMENSION out_rows_avail)
|
|
|
650 {
|
|
|
651 - (void) input_buf;
|
|
|
652 - (void) in_row_group_ctr;
|
|
|
653 - (void) in_row_groups_avail;
|
|
|
654 + //(void) input_buf;
|
|
|
655 + //(void) in_row_group_ctr;
|
|
|
656 + //(void) in_row_groups_avail;
|
|
|
657 my_post_ptr post = (my_post_ptr) cinfo->post;
|
|
|
658 JDIMENSION num_rows, max_rows;
|
|
|
659
|
|
|
660 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jdpred.c dcmtk-3.6.7/dcmjpeg/libijg8/jdpred.c
|
|
|
661 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jdpred.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
662 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jdpred.c 2022-08-16 12:23:34.000000000 +0200
|
|
|
663 @@ -101,8 +101,8 @@
|
|
|
664 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
665 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
666 {
|
|
|
667 - (void)cinfo;
|
|
|
668 - (void)comp_index;
|
|
|
669 + //(void)cinfo;
|
|
|
670 + //(void)comp_index;
|
|
|
671 UNDIFFERENCE_1D(INITIAL_PREDICTOR2);
|
|
|
672 }
|
|
|
673
|
|
|
674 @@ -111,8 +111,8 @@
|
|
|
675 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
676 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
677 {
|
|
|
678 - (void)cinfo;
|
|
|
679 - (void)comp_index;
|
|
|
680 + //(void)cinfo;
|
|
|
681 + //(void)comp_index;
|
|
|
682 UNDIFFERENCE_2D(PREDICTOR2);
|
|
|
683 JPEG_UNUSED(Rc);
|
|
|
684 JPEG_UNUSED(Rb);
|
|
|
685 @@ -123,8 +123,8 @@
|
|
|
686 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
687 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
688 {
|
|
|
689 - (void)cinfo;
|
|
|
690 - (void)comp_index;
|
|
|
691 + //(void)cinfo;
|
|
|
692 + //(void)comp_index;
|
|
|
693 UNDIFFERENCE_2D(PREDICTOR3);
|
|
|
694 JPEG_UNUSED(Rc);
|
|
|
695 JPEG_UNUSED(Rb);
|
|
|
696 @@ -135,8 +135,8 @@
|
|
|
697 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
698 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
699 {
|
|
|
700 - (void)cinfo;
|
|
|
701 - (void)comp_index;
|
|
|
702 + //(void)cinfo;
|
|
|
703 + //(void)comp_index;
|
|
|
704 UNDIFFERENCE_2D(PREDICTOR4);
|
|
|
705 JPEG_UNUSED(Rc);
|
|
|
706 JPEG_UNUSED(Rb);
|
|
|
707 @@ -147,8 +147,8 @@
|
|
|
708 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
709 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
710 {
|
|
|
711 - (void)cinfo;
|
|
|
712 - (void)comp_index;
|
|
|
713 + //(void)cinfo;
|
|
|
714 + //(void)comp_index;
|
|
|
715 SHIFT_TEMPS
|
|
|
716 UNDIFFERENCE_2D(PREDICTOR5);
|
|
|
717 JPEG_UNUSED(Rc);
|
|
|
718 @@ -160,8 +160,8 @@
|
|
|
719 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
720 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
721 {
|
|
|
722 - (void)cinfo;
|
|
|
723 - (void)comp_index;
|
|
|
724 + //(void)cinfo;
|
|
|
725 + //(void)comp_index;
|
|
|
726 SHIFT_TEMPS
|
|
|
727 UNDIFFERENCE_2D(PREDICTOR6);
|
|
|
728 JPEG_UNUSED(Rc);
|
|
|
729 @@ -173,8 +173,8 @@
|
|
|
730 const JDIFFROW diff_buf, const JDIFFROW prev_row,
|
|
|
731 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
732 {
|
|
|
733 - (void)cinfo;
|
|
|
734 - (void)comp_index;
|
|
|
735 + //(void)cinfo;
|
|
|
736 + //(void)comp_index;
|
|
|
737 SHIFT_TEMPS
|
|
|
738 UNDIFFERENCE_2D(PREDICTOR7);
|
|
|
739 JPEG_UNUSED(Rc);
|
|
|
740 @@ -194,7 +194,7 @@
|
|
|
741 const JDIFFROW diff_buf, JDIFFROW prev_row,
|
|
|
742 JDIFFROW undiff_buf, JDIMENSION width)
|
|
|
743 {
|
|
|
744 - (void)prev_row;
|
|
|
745 + //(void)prev_row;
|
|
|
746 j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
|
|
|
747
|
|
|
748 UNDIFFERENCE_1D(INITIAL_PREDICTORx);
|
|
|
749 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jdsample.c dcmtk-3.6.7/dcmjpeg/libijg8/jdsample.c
|
|
|
750 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jdsample.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
751 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jdsample.c 2022-08-16 12:22:36.000000000 +0200
|
|
|
752 @@ -92,7 +92,7 @@
|
|
|
753 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
|
|
|
754 JDIMENSION out_rows_avail)
|
|
|
755 {
|
|
|
756 - (void)in_row_groups_avail;
|
|
|
757 + //(void)in_row_groups_avail;
|
|
|
758 my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
|
|
759 int ci;
|
|
|
760 jpeg_component_info * compptr;
|
|
|
761 @@ -239,7 +239,7 @@
|
|
|
762 h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
|
|
|
763 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
|
|
|
764 {
|
|
|
765 - (void)compptr;
|
|
|
766 + //(void)compptr;
|
|
|
767 JSAMPARRAY output_data = *output_data_ptr;
|
|
|
768 register JSAMPROW inptr, outptr;
|
|
|
769 register JSAMPLE invalue;
|
|
|
770 @@ -268,7 +268,7 @@
|
|
|
771 h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
|
|
|
772 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
|
|
|
773 {
|
|
|
774 - (void)compptr;
|
|
|
775 + //(void)compptr;
|
|
|
776 JSAMPARRAY output_data = *output_data_ptr;
|
|
|
777 register JSAMPROW inptr, outptr;
|
|
|
778 register JSAMPLE invalue;
|
|
|
779 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jdscale.c dcmtk-3.6.7/dcmjpeg/libijg8/jdscale.c
|
|
|
780 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jdscale.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
781 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jdscale.c 2022-08-16 12:22:06.000000000 +0200
|
|
|
782 @@ -67,7 +67,7 @@
|
|
|
783 const JDIFFROW diff_buf, JSAMPROW output_buf,
|
|
|
784 JDIMENSION width)
|
|
|
785 {
|
|
|
786 - (void)cinfo;
|
|
|
787 + //(void)cinfo;
|
|
|
788 unsigned int xindex;
|
|
|
789
|
|
|
790 for (xindex = 0; xindex < width; xindex++)
|
|
|
791 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jquant1.c dcmtk-3.6.7/dcmjpeg/libijg8/jquant1.c
|
|
|
792 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jquant1.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
793 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jquant1.c 2022-08-16 12:21:50.000000000 +0200
|
|
|
794 @@ -744,7 +744,7 @@
|
|
|
795 METHODDEF(void)
|
|
|
796 start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
|
|
|
797 {
|
|
|
798 - (void) is_pre_scan;
|
|
|
799 + //(void) is_pre_scan;
|
|
|
800 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
|
|
|
801 size_t arraysize;
|
|
|
802 int i;
|
|
|
803 diff -urEb dcmtk-3.6.7.orig/dcmjpeg/libijg8/jquant2.c dcmtk-3.6.7/dcmjpeg/libijg8/jquant2.c
|
|
|
804 --- dcmtk-3.6.7.orig/dcmjpeg/libijg8/jquant2.c 2022-04-28 15:47:25.000000000 +0200
|
|
|
805 +++ dcmtk-3.6.7/dcmjpeg/libijg8/jquant2.c 2022-08-16 12:03:36.000000000 +0200
|
|
|
806 @@ -224,7 +224,6 @@
|
|
|
807 prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
|
|
|
808 JSAMPARRAY output_buf, int num_rows)
|
|
|
809 {
|
|
|
810 - (void) output_buf;
|
|
|
811 my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
|
|
|
812 register JSAMPROW ptr;
|
|
|
813 register histptr histp;
|
|
|
814 @@ -232,6 +231,7 @@
|
|
|
815 int row;
|
|
|
816 JDIMENSION col;
|
|
|
817 JDIMENSION width = cinfo->output_width;
|
|
|
818 + (void) output_buf;
|
|
|
819
|
|
|
820 for (row = 0; row < num_rows; row++) {
|
|
|
821 ptr = input_buf[row];
|
