extra/racket/jpeg-version.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621

From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 16 Feb 2011 14:30:34 +0000 (-0700)
Subject: fix jpeg structs to better adapt to jpeglib versions and platforms
X-Git-Url: http://git.racket-lang.org/plt/commitdiff_plain/e59b96e26c7f1edb193a42f16c97d30a085a182c

fix jpeg structs to better adapt to jpeglib versions and platforms
 --- specifically fixing jpeglib version 8 on x86_64
---

diff --git a/collects/racket/draw/unsafe/jpeg.rkt b/collects/racket/draw/unsafe/jpeg.rkt
index 9399aec..77606d8 100644
--- a/collects/racket/draw/unsafe/jpeg.rkt
+++ b/collects/racket/draw/unsafe/jpeg.rkt
@@ -100,20 +100,24 @@
 (unless (member JPEG_LIB_VERSION '(62 64 70 80))
   (error 'jpeg "unsupported library version: ~e" JPEG_LIB_VERSION))
 
-(define _scaled_size
-  (case JPEG_LIB_VERSION
-    [(62 64) _int]
-    [else (make-cstruct-type (list _int _int))]))
-
-(define _prog_scan_size
-  (case JPEG_LIB_VERSION
-    [(62 64 70) (make-cstruct-type (list _int _int _int _int))]
-    [else (make-cstruct-type (list _int _int _int _int _int _pointer _int))]))
-
-(define _comp_info_size
-  (case JPEG_LIB_VERSION
-    [(62 64 70) _pointer]
-    [else (make-cstruct-type (list _pointer _jbool))]))
+(define-syntax-rule (cstruct-type/version elem ...)
+  (make-cstruct-type (flatten-type (list (cstruct-type/version-elem elem) ...))))
+
+(define-syntax cstruct-type/version-elem
+  (syntax-rules (unquote)
+    [(_ (unquote ([vers (elem ...)] ...)))
+     (case JPEG_LIB_VERSION
+       [vers (list (cstruct-type/version-elem elem) ...)]
+       ...)]
+    [(_ [name type]) type]))
+
+(define (flatten-type l)
+  (cond
+   [(null? l) null]
+   [(list? (car l))
+    (append (flatten-type (car l)) (flatten-type (cdr l)))]
+   [else
+    (cons (car l) (flatten-type (cdr l)))]))
 
 (define-cstruct _jpeg_decompress_struct ([err _jpeg_error_mgr-pointer]
                                          [mem _jpeg_memory_mgr-pointer]
@@ -150,7 +154,7 @@
                                          [enable_2pass_quant _jbool]
 
                                          [output_width _JDIMENSION]
-                                         [output_height _JDIMENSION]
+                                         [output_height _JDIMENSION] ; <-
                                          [out_color_components _int]
                                          [output_components _int]
                                          [rec_outbuf_height _int]
@@ -158,21 +162,230 @@
                                          [actual_number_of_colors _int]
                                          [colormap _pointer]
 
-                                         [output_scanline _JDIMENSION]
+                                         ;; We don't need to refer to any of the remaining
+                                         ;; fields, and the specific set of fields depends
+                                         ;; on the version
+                                         [rest
+                                          (cstruct-type/version
+                                           [output_scanline _JDIMENSION]
+
+                                           [input_scan_number _int]
+                                           [input_iMCU_row _JDIMENSION]
+
+                                           [output_scan_number _int]
+                                           [output_iMCU_row _JDIMENSION]
+                                           
+                                           [coef_bits _pointer]
+                                           
+                                           [quant_tbl_ptrs_1 _pointer]
+                                           [quant_tbl_ptrs_2 _pointer]
+                                           [quant_tbl_ptrs_3 _pointer]
+                                           [quant_tbl_ptrs_4 _pointer]
+                                           
+                                           [dc_huff_tbl_ptrs_1 _pointer]
+                                           [dc_huff_tbl_ptrs_2 _pointer]
+                                           [dc_huff_tbl_ptrs_3 _pointer]
+                                           [dc_huff_tbl_ptrs_4 _pointer]
+                                           [ac_huff_tbl_ptrs_1 _pointer]
+                                           [ac_huff_tbl_ptrs_2 _pointer]
+                                           [ac_huff_tbl_ptrs_3 _pointer]
+                                           [ac_huff_tbl_ptrs_4 _pointer]
+
+                                           [data_precision _int]
+
+                                           [comp_info _pointer]
+
+                                           ,([(62 64 70) ()]
+                                             [else ([is_baseline _jbool])])
+                                           [progressive_mode _jbool]
+                                           [arith_code _jbool]
+
+                                           [arith_dc_L_1 _uint8]
+                                           [arith_dc_L_2 _uint8]
+                                           [arith_dc_L_3 _uint8]
+                                           [arith_dc_L_4 _uint8]
+                                           [arith_dc_L_5 _uint8]
+                                           [arith_dc_L_6 _uint8]
+                                           [arith_dc_L_7 _uint8]
+                                           [arith_dc_L_8 _uint8]
+                                           [arith_dc_L_9 _uint8]
+                                           [arith_dc_L_10 _uint8]
+                                           [arith_dc_L_11 _uint8]
+                                           [arith_dc_L_12 _uint8]
+                                           [arith_dc_L_13 _uint8]
+                                           [arith_dc_L_14 _uint8]
+                                           [arith_dc_L_15 _uint8]
+                                           [arith_dc_L_16 _uint8]
+
+                                           [arith_dc_U_1 _uint8]
+                                           [arith_dc_U_2 _uint8]
+                                           [arith_dc_U_3 _uint8]
+                                           [arith_dc_U_4 _uint8]
+                                           [arith_dc_U_5 _uint8]
+                                           [arith_dc_U_6 _uint8]
+                                           [arith_dc_U_7 _uint8]
+                                           [arith_dc_U_8 _uint8]
+                                           [arith_dc_U_9 _uint8]
+                                           [arith_dc_U_10 _uint8]
+                                           [arith_dc_U_11 _uint8]
+                                           [arith_dc_U_12 _uint8]
+                                           [arith_dc_U_13 _uint8]
+                                           [arith_dc_U_14 _uint8]
+                                           [arith_dc_U_15 _uint8]
+                                           [arith_dc_U_16 _uint8]
+
+                                           [arith_dc_K_1 _uint8]
+                                           [arith_dc_K_2 _uint8]
+                                           [arith_dc_K_3 _uint8]
+                                           [arith_dc_K_4 _uint8]
+                                           [arith_dc_K_5 _uint8]
+                                           [arith_dc_K_6 _uint8]
+                                           [arith_dc_K_7 _uint8]
+                                           [arith_dc_K_8 _uint8]
+                                           [arith_dc_K_9 _uint8]
+                                           [arith_dc_K_10 _uint8]
+                                           [arith_dc_K_11 _uint8]
+                                           [arith_dc_K_12 _uint8]
+                                           [arith_dc_K_13 _uint8]
+                                           [arith_dc_K_14 _uint8]
+                                           [arith_dc_K_15 _uint8]
+                                           [arith_dc_K_16 _uint8]
+
+                                           [restart_interval _uint]
+
+                                           [saw_JFIF_marker _jbool]
+                                           [JFIF_major_version _uint8]
+                                           [JFIF_minor_version _uint8]
+                                           [density_unit _uint8]
+                                           [X_density _uint16]
+                                           [Y_density _uint16]
+                                           [saw_Adobe_marker _jbool]
+                                           [Adobe_transform _uint8]
+
+                                           [CCIR601_sampling _jbool]
+
+                                           [marker_list _pointer]
+
+                                           [max_h_samp_factor _int]
+                                           [max_v_samp_factor _int]
+
+                                           ,([(62 64) ([min_DCT_scaled_size _int])]
+                                             [else ([min_DCT_h_scaled_size _int]
+                                                    [min_DCT_v_scaled_size _int])])
+
+                                           [total_iMCU_rows _JDIMENSION]
+                                           [sample_range_limit _pointer]
+
+                                           [comps_in_scan _int]
+
+                                           [cur_comp_info_1 _pointer]
+                                           [cur_comp_info_2 _pointer]
+                                           [cur_comp_info_3 _pointer]
+                                           [cur_comp_info_4 _pointer]
+
+                                           [MCUs_per_row _JDIMENSION]
+                                           [MCU_rows_in_scan _JDIMENSION]
+
+                                           [blocks_in_MCU _int]
+                                           
+                                           [MCU_membership_1 _int]
+                                           [MCU_membership_2 _int]
+                                           [MCU_membership_3 _int]
+                                           [MCU_membership_4 _int]
+                                           [MCU_membership_5 _int]
+                                           [MCU_membership_6 _int]
+                                           [MCU_membership_7 _int]
+                                           [MCU_membership_8 _int]
+                                           [MCU_membership_9 _int]
+                                           [MCU_membership_10 _int]
+
+                                           [Ss _int]
+                                           [Se _int]
+                                           [Ah _int]
+                                           [Al _int]
+                                           
+                                           ,([(62 64 70) ()]
+                                             [else
+                                              ([block_size _int]
+                                               [natural_order _pointer]
+                                               [lim_Se _int])])
+
+                                           [unread_marker _int]
+
+                                           [master _pointer]
+                                           [main _pointer]
+                                           [coef _pointer]
+                                           [post _pointer]
+                                           [inputctl _pointer]
+                                           [marker _pointer]
+                                           [entropy _pointer]
+                                           [idct _pointer]
+                                           [upsample _pointer]
+                                           [cconvert _pointer]
+                                           [cquantize _pointer])]))
 
-                                         [input_scan_number _int]
-                                         [input_iMCU_row _JDIMENSION]
+(define _j_decompress_ptr _jpeg_decompress_struct-pointer)
 
-                                         [output_scan_number _int]
-                                         [output_iMCU_row _JDIMENSION]
+(define-cstruct _jpeg_source_mgr ([next_input_byte _pointer] ;; /* => next byte to read from buffer */
+                                  [bytes_in_buffer _size_t]  ;; /* # of bytes remaining in buffer */
+                                  [init_source (_fun _j_decompress_ptr -> _void)]
+                                  [fill_input_buffer (_fun _j_decompress_ptr -> _jbool)]
+                                  [skip_input_data (_fun _j_decompress_ptr _long -> _void)]
+                                  [resync_to_restart (_fun _j_decompress_ptr _int -> _jbool)]
+                                  [term_source (_fun _j_decompress_ptr -> _void)]
+                                  ;; extra fields specific to this binding:
+                                  [buffer _pointer]))
 
-                                         [coef_bits _pointer]
+(define (jpeg_decompress_struct-src m)
+  (ptr-cast (jpeg_decompress_struct-src* m) _jpeg_source_mgr-pointer))
+
+(define-cstruct _jpeg_compress_struct ([err _jpeg_error_mgr-pointer]
+                                       [mem _jpeg_memory_mgr-pointer]
+                                       [progress _pointer] ; _jpeg_progress_mgr_pointer
+                                       [client_data _pointer]
+                                       [is_decompressor _jbool]
+                                       [global_state _int]
+
+                                       [dest* _pointer] ; actually jpeg_destination_mgr-pointer
+
+                                       [image_width _JDIMENSION]
+                                       [image_height _JDIMENSION]
+                                       [input_components _int]
+                                       [in_color_space _J_COLOR_SPACE] ; <-
+  
+                                       [input_gamma _double]
+
+                                       ;; We don't need to refer to any of the remaining
+                                       ;; fields, and the specific set of fields depends
+                                       ;; on the version
+                                       [rest
+                                        (cstruct-type/version
+                                         ,([(62 64) ()]
+                                           [else
+                                            ([scale_num _uint]
+                                             [scale_denom _uint]
+                                             [jpeg_width _JDIMENSION]
+                                             [jpeg_height _JDIMENSION])])
+                                         
+                                         [data_precission _int]
+
+                                         [num_components _int]
+                                         [jpeg_color_space _J_COLOR_SPACE]
+
+                                         [comp_info _pointer]
 
                                          [quant_tbl_ptrs_1 _pointer]
                                          [quant_tbl_ptrs_2 _pointer]
                                          [quant_tbl_ptrs_3 _pointer]
                                          [quant_tbl_ptrs_4 _pointer]
                                          
+                                         ,([(62 64) ()]
+                                           [else
+                                            ([q_scale_factor_1 _int]
+                                             [q_scale_factor_2 _int]
+                                             [q_scale_factor_3 _int]
+                                             [q_scale_factor_4 _int])])
+                                       
                                          [dc_huff_tbl_ptrs_1 _pointer]
                                          [dc_huff_tbl_ptrs_2 _pointer]
                                          [dc_huff_tbl_ptrs_3 _pointer]
@@ -182,13 +395,6 @@
                                          [ac_huff_tbl_ptrs_3 _pointer]
                                          [ac_huff_tbl_ptrs_4 _pointer]
 
-                                         [data_precision _int]
-
-                                         [comp_info&is_baseline _comp_info_size]
-
-                                         [progressive_mode _jbool]
-                                         [arith_code _jbool]
-
                                          [arith_dc_L_1 _uint8]
                                          [arith_dc_L_2 _uint8]
                                          [arith_dc_L_3 _uint8]
@@ -239,40 +445,54 @@
                                          [arith_dc_K_14 _uint8]
                                          [arith_dc_K_15 _uint8]
                                          [arith_dc_K_16 _uint8]
+                                         
+                                         [num_scans _int]
+                                         [scan_info _pointer]
 
-                                         [restart_interval _uint]
+                                         [raw_data_in _jbool]
+                                         [arith_code _jbool]
+                                         [optimize_coding _jbool]
+                                         [CCIR601_sampling _jbool]
+                                         ,([(62 64) ()]
+                                           [else
+                                            ([do_fancy_downsampling _jbool])])
 
-                                         [saw_JFIF_marker _jbool]
+                                         [smoothing_factor _int]
+                                         [dct_method _J_DCT_METHOD]
+
+                                         [restart_interval _uint]
+                                         [restart_in_rows _int]
+                                         
+                                         [write_JFIF_header _jbool]
                                          [JFIF_major_version _uint8]
                                          [JFIF_minor_version _uint8]
                                          [density_unit _uint8]
                                          [X_density _uint16]
                                          [Y_density _uint16]
-                                         [saw_Adobe_marker _jbool]
-                                         [Adobe_transform _uint8]
-
-                                         [CCIR601_sampling _jbool]
-
-                                         [marker_list _pointer]
-
+                                         [write_Adobe_marker _jbool]
+                                         
+                                         [next_scanline _JDIMENSION]
+                                         
+                                         [progressive_mode _jbool]
+                                         
                                          [max_h_samp_factor _int]
                                          [max_v_samp_factor _int]
 
-                                         [min_DCT_scaled_size _scaled_size]
+                                         ,([(62 64) ()]
+                                           [else ([min_DCT_h_scaled_size _int]
+                                                  [min_DCT_v_scaled_size _int])])
 
                                          [total_iMCU_rows _JDIMENSION]
-                                         [sample_range_limit _pointer]
 
                                          [comps_in_scan _int]
-
                                          [cur_comp_info_1 _pointer]
                                          [cur_comp_info_2 _pointer]
                                          [cur_comp_info_3 _pointer]
                                          [cur_comp_info_4 _pointer]
-
+                                       
                                          [MCUs_per_row _JDIMENSION]
                                          [MCU_rows_in_scan _JDIMENSION]
-
+                                         
                                          [blocks_in_MCU _int]
                                          
                                          [MCU_membership_1 _int]
@@ -286,223 +506,28 @@
                                          [MCU_membership_9 _int]
                                          [MCU_membership_10 _int]
 
-                                         [prog_scan _prog_scan_size] ; Ss, Se, Ah, Al
-
-                                         [unread_marker _int]
+                                         [Ss _int]
+                                         [Se _int]
+                                         [Ah _int]
+                                         [Al _int]
+                                         
+                                         ,([(62 64 70) ()]
+                                           [else
+                                            ([block_size _int]
+                                             [natural_order _pointer]
+                                             [lim_Se _int])])
 
                                          [master _pointer]
                                          [main _pointer]
+                                         [prep _pointer]
                                          [coef _pointer]
-                                         [post _pointer]
-                                         [inputctl _pointer]
                                          [marker _pointer]
-                                         [entropy _pointer]
-                                         [idct _pointer]
-                                         [upsample _pointer]
                                          [cconvert _pointer]
-                                         [cquantize _pointer]))
-
-(define _j_decompress_ptr _jpeg_decompress_struct-pointer)
-
-(define-cstruct _jpeg_source_mgr ([next_input_byte _pointer] ;; /* => next byte to read from buffer */
-                                  [bytes_in_buffer _size_t]  ;; /* # of bytes remaining in buffer */
-                                  [init_source (_fun _j_decompress_ptr -> _void)]
-                                  [fill_input_buffer (_fun _j_decompress_ptr -> _jbool)]
-                                  [skip_input_data (_fun _j_decompress_ptr _long -> _void)]
-                                  [resync_to_restart (_fun _j_decompress_ptr _int -> _jbool)]
-                                  [term_source (_fun _j_decompress_ptr -> _void)]
-                                  ;; extra fields specific to this binding:
-                                  [buffer _pointer]))
-
-(define (jpeg_decompress_struct-src m)
-  (ptr-cast (jpeg_decompress_struct-src* m) _jpeg_source_mgr-pointer))
-
-(define-cstruct _jpeg7_compression_params ([scale_num _uint]
-					   [scale_denom _uint]
-					   [jpeg_width _JDIMENSION]
-					   [jpeg_height _JDIMENSION]
-					   [data_precision _int]))
-(define _compression_params_t
-  (case JPEG_LIB_VERSION
-    [(62 64) _int] ; just data_precission
-    [else _jpeg7_compression_params]))
-
-(define-cstruct _quant_tbl_62_t ([quant_tbl_ptrs_1 _pointer]
-				 [quant_tbl_ptrs_2 _pointer]
-				 [quant_tbl_ptrs_3 _pointer]
-				 [quant_tbl_ptrs_4 _pointer]))
-(define-cstruct (_quant_tbl_70_t _quant_tbl_62_t) ([q_scale_factor_1 _int]
-						   [q_scale_factor_2 _int]
-						   [q_scale_factor_3 _int]
-						   [q_scale_factor_4 _int]))
-
-(define _quant_tbl_t
-  (case JPEG_LIB_VERSION
-    [(62 64) _quant_tbl_62_t]
-    [else _quant_tbl_70_t]))
-
-(define _sampling_t
-  (case JPEG_LIB_VERSION
-    [(62 64) _jbool] ; just CCIR601_sampling
-    [else (make-cstruct-type (list _jbool _jbool))])) ; CCIR601_sampling and do_fancy_downsampling
-
-(define-cstruct _factors_62_t ([max_h_samp_factor _int]
-			      [max_v_samp_factor _int]))
-(define-cstruct (_factors_70_t _factors_62_t) ([scaled _scaled_size]))
-(define _factors_t
-  (case JPEG_LIB_VERSION
-    [(62 64) _factors_62_t]
-    [else _factors_70_t]))
-
-
-(define-cstruct _jpeg_compress_struct ([err _jpeg_error_mgr-pointer]
-                                       [mem _jpeg_memory_mgr-pointer]
-                                       [progress _pointer] ; _jpeg_progress_mgr_pointer
-                                       [client_data _pointer]
-                                       [is_decompressor _jbool]
-                                       [global_state _int]
-
-                                       [dest* _pointer] ; actually jpeg_destination_mgr-pointer
-
-                                       [image_width _JDIMENSION]
-                                       [image_height _JDIMENSION]
-                                       [input_components _int]
-                                       [in_color_space _J_COLOR_SPACE]
-  
-                                       [input_gamma _double]
-
-				       [compression_params _compression_params_t]
-
-                                       [num_components _int]
-                                       [jpeg_color_space _J_COLOR_SPACE]
-
-                                       [comp_info _pointer]
-				       
-				       [quant_tbl _quant_tbl_t]
-                                       
-                                       [dc_huff_tbl_ptrs_1 _pointer]
-                                       [dc_huff_tbl_ptrs_2 _pointer]
-                                       [dc_huff_tbl_ptrs_3 _pointer]
-                                       [dc_huff_tbl_ptrs_4 _pointer]
-                                       [ac_huff_tbl_ptrs_1 _pointer]
-                                       [ac_huff_tbl_ptrs_2 _pointer]
-                                       [ac_huff_tbl_ptrs_3 _pointer]
-                                       [ac_huff_tbl_ptrs_4 _pointer]
-
-                                       [arith_dc_L_1 _uint8]
-                                       [arith_dc_L_2 _uint8]
-                                       [arith_dc_L_3 _uint8]
-                                       [arith_dc_L_4 _uint8]
-                                       [arith_dc_L_5 _uint8]
-                                       [arith_dc_L_6 _uint8]
-                                       [arith_dc_L_7 _uint8]
-                                       [arith_dc_L_8 _uint8]
-                                       [arith_dc_L_9 _uint8]
-                                       [arith_dc_L_10 _uint8]
-                                       [arith_dc_L_11 _uint8]
-                                       [arith_dc_L_12 _uint8]
-                                       [arith_dc_L_13 _uint8]
-                                       [arith_dc_L_14 _uint8]
-                                       [arith_dc_L_15 _uint8]
-                                       [arith_dc_L_16 _uint8]
-
-                                       [arith_dc_U_1 _uint8]
-                                       [arith_dc_U_2 _uint8]
-                                       [arith_dc_U_3 _uint8]
-                                       [arith_dc_U_4 _uint8]
-                                       [arith_dc_U_5 _uint8]
-                                       [arith_dc_U_6 _uint8]
-                                       [arith_dc_U_7 _uint8]
-                                       [arith_dc_U_8 _uint8]
-                                       [arith_dc_U_9 _uint8]
-                                       [arith_dc_U_10 _uint8]
-                                       [arith_dc_U_11 _uint8]
-                                       [arith_dc_U_12 _uint8]
-                                       [arith_dc_U_13 _uint8]
-                                       [arith_dc_U_14 _uint8]
-                                       [arith_dc_U_15 _uint8]
-                                       [arith_dc_U_16 _uint8]
-
-                                       [arith_dc_K_1 _uint8]
-                                       [arith_dc_K_2 _uint8]
-                                       [arith_dc_K_3 _uint8]
-                                       [arith_dc_K_4 _uint8]
-                                       [arith_dc_K_5 _uint8]
-                                       [arith_dc_K_6 _uint8]
-                                       [arith_dc_K_7 _uint8]
-                                       [arith_dc_K_8 _uint8]
-                                       [arith_dc_K_9 _uint8]
-                                       [arith_dc_K_10 _uint8]
-                                       [arith_dc_K_11 _uint8]
-                                       [arith_dc_K_12 _uint8]
-                                       [arith_dc_K_13 _uint8]
-                                       [arith_dc_K_14 _uint8]
-                                       [arith_dc_K_15 _uint8]
-                                       [arith_dc_K_16 _uint8]
-                                       
-                                       [num_scans _int]
-                                       [scan_info _pointer]
-
-                                       [raw_data_in _jbool]
-                                       [arith_code _jbool]
-                                       [optimize_coding _jbool]
-				       [sampling _sampling_t]
-                                       [smoothing_factor _int]
-                                       [dct_method _J_DCT_METHOD]
-
-                                       [restart_interval _uint]
-                                       [restart_in_rows _int]
-                                       
-                                       [write_JFIF_header _jbool]
-                                       [JFIF_major_version _uint8]
-                                       [JFIF_minor_version _uint8]
-                                       [density_unit _uint8]
-                                       [X_density _uint16]
-                                       [Y_density _uint16]
-                                       [write_Adobe_marker _jbool]
-
-                                       [next_scanline _JDIMENSION]
-
-                                       [progressive_mode _jbool]
-				       [factors _factors_t]
-
-                                       [total_iMCU_rows _JDIMENSION]
-
-                                       [comps_in_scan _int]
-                                       [cur_comp_info_1 _pointer]
-                                       [cur_comp_info_2 _pointer]
-                                       [cur_comp_info_3 _pointer]
-                                       [cur_comp_info_4 _pointer]
-                                       
-                                       [MCUs_per_row _JDIMENSION]
-                                       [MCU_rows_in_scan _JDIMENSION]
-
-                                       [blocks_in_MCU _int]
-                                       
-                                       [MCU_membership_1 _int]
-                                       [MCU_membership_2 _int]
-                                       [MCU_membership_3 _int]
-                                       [MCU_membership_4 _int]
-                                       [MCU_membership_5 _int]
-                                       [MCU_membership_6 _int]
-                                       [MCU_membership_7 _int]
-                                       [MCU_membership_8 _int]
-                                       [MCU_membership_9 _int]
-                                       [MCU_membership_10 _int]
-
-                                       [prog_scan _prog_scan_size] ; Ss, Se, Ah, Al
-
-                                       [master _pointer]
-                                       [main _pointer]
-                                       [prep _pointer]
-                                       [coef _pointer]
-                                       [marker _pointer]
-                                       [cconvert _pointer]
-                                       [downsample _pointer]
-                                       [fdct _pointer]
-                                       [entropy _pointer]
-                                       [script_space _pointer]
-                                       [script_space_size _int]))
+                                         [downsample _pointer]
+                                         [fdct _pointer]
+                                         [entropy _pointer]
+                                         [script_space _pointer]
+                                         [script_space_size _int])]))
 
 (define _j_compress_ptr _jpeg_compress_struct-pointer)