comparison OrthancFramework/Resources/Patches/dcmtk-3.6.8-visual-studio.patch @ 5488:5bd262ce16b3

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