-
Notifications
You must be signed in to change notification settings - Fork 4
/
ljpeg-6b.patch
12790 lines (12285 loc) · 443 KB
/
ljpeg-6b.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
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -cN ../jpeg-6b/README ./README
*** ../jpeg-6b/README Fri Mar 27 18:34:59 1998
--- ./README Tue Apr 27 14:58:14 1999
***************
*** 74,85 ****
low-quality image. For more details, see the references, or just experiment
with various compression settings.
! This software implements JPEG baseline, extended-sequential, and progressive
! compression processes. Provision is made for supporting all variants of these
! processes, although some uncommon parameter settings aren't implemented yet.
! For legal reasons, we are not distributing code for the arithmetic-coding
! variants of JPEG; see LEGAL ISSUES. We have made no provision for supporting
! the hierarchical or lossless processes defined in the standard.
We provide a set of library routines for reading and writing JPEG image files,
plus two sample applications "cjpeg" and "djpeg", which use the library to
--- 74,85 ----
low-quality image. For more details, see the references, or just experiment
with various compression settings.
! This software implements JPEG baseline, extended-sequential, progressive
! and lossless compression processes. Provision is made for supporting all
! variants of these processes, although some uncommon parameter settings aren't
! implemented yet. For legal reasons, we are not distributing code for the
! arithmetic-coding variants of JPEG; see LEGAL ISSUES. We have made no
! provision for supporting the hierarchical processes defined in the standard.
We provide a set of library routines for reading and writing JPEG image files,
plus two sample applications "cjpeg" and "djpeg", which use the library to
diff -cN ../jpeg-6b/TODO ./TODO
*** ../jpeg-6b/TODO
--- ./TODO Tue Apr 27 14:58:15 1999
***************
*** 0 ****
--- 1,13 ----
+ List of things to complete for lossless codec:
+
+ * How to deal with data_precision vs. BITS_PER_JSAMPLE for compression codec.
+
+ * Re-visit use of insufficient_data - see jdhuff.c and jdlhuff.c.
+
+ * How to check BITS_PER_JSAMPLE for lossy mode (ie, 16-bit data)? -
+ see jdinput.c.
+
+ * Check comment blocks for errors/changes.
+
+ * Review new filenames. Try to avoid filename conflicts with possible JPEG-LS
+ codec.
diff -cN ../jpeg-6b/cjpeg.1 ./cjpeg.1
*** ../jpeg-6b/cjpeg.1 Fri Mar 20 20:29:01 1998
--- ./cjpeg.1 Tue Apr 27 14:58:15 1999
***************
*** 62,67 ****
--- 62,74 ----
.B \-progressive
Create progressive JPEG file (see below).
.TP
+ .BI \-lossless " psv[,Pt]"
+ Create a lossless JPEG file using the specified predictor selection value (1-7)
+ and optional point transform.
+ .B Caution:
+ lossless JPEG is not widely implemented, so many decoders will be
+ unable to view a lossless JPEG file at all.
+ .TP
.B \-targa
Input file is Targa format. Targa files that contain an "identification"
field will not be automatically recognized by
diff -cN ../jpeg-6b/cjpeg.c ./cjpeg.c
*** ../jpeg-6b/cjpeg.c Fri Mar 20 20:21:49 1998
--- ./cjpeg.c Tue Apr 27 14:58:15 1999
***************
*** 157,162 ****
--- 157,165 ----
#ifdef C_PROGRESSIVE_SUPPORTED
fprintf(stderr, " -progressive Create progressive JPEG file\n");
#endif
+ #ifdef C_LOSSLESS_SUPPORTED
+ fprintf(stderr, " -lossless psv[,Pt] Create lossless JPEG file\n");
+ #endif
#ifdef TARGA_SUPPORTED
fprintf(stderr, " -targa Input file is Targa format (usually not needed)\n");
#endif
***************
*** 217,222 ****
--- 220,226 ----
char * qslotsarg = NULL; /* saves -qslots parm if any */
char * samplearg = NULL; /* saves -sample parm if any */
char * scansarg = NULL; /* saves -scans parm if any */
+ char * losslsarg = NULL; /* saves -lossless parm if any */
/* Set up default JPEG parameters. */
/* Note that default -quality level need not, and does not,
***************
*** 287,292 ****
--- 291,309 ----
/* Force a monochrome JPEG file to be generated. */
jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);
+ } else if (keymatch(arg, "lossless", 1)) {
+ /* Select simple lossless mode. */
+ #ifdef C_LOSSLESS_SUPPORTED
+ if (++argn >= argc) /* advance to next argument */
+ usage();
+ losslsarg = argv[argn];
+ /* We must postpone execution until num_components is known. */
+ #else
+ fprintf(stderr, "%s: sorry, lossless output was not compiled\n",
+ progname);
+ exit(EXIT_FAILURE);
+ #endif
+
} else if (keymatch(arg, "maxmemory", 3)) {
/* Maximum memory in Kb (or Mb with 'm'). */
long lval;
***************
*** 440,445 ****
--- 457,468 ----
#ifdef C_PROGRESSIVE_SUPPORTED
if (simple_progressive) /* process -progressive; -scans can override */
jpeg_simple_progression(cinfo);
+ #endif
+
+ #ifdef C_LOSSLESS_SUPPORTED
+ if (losslsarg != NULL) /* process -lossless if it was present */
+ if (! set_simple_lossless(cinfo, losslsarg))
+ usage();
#endif
#ifdef C_MULTISCAN_FILES_SUPPORTED
diff -cN ../jpeg-6b/filelist.doc ./filelist.doc
*** ../jpeg-6b/filelist.doc Sun Mar 15 13:57:38 1998
--- ./filelist.doc Tue Apr 27 14:58:15 1999
***************
*** 1,6 ****
IJG JPEG LIBRARY: FILE LIST
! Copyright (C) 1994-1998, Thomas G. Lane.
This file is part of the Independent JPEG Group's software.
For conditions of distribution and use, see the accompanying README file.
--- 1,6 ----
IJG JPEG LIBRARY: FILE LIST
! Copyright (C) 1994-1997, Thomas G. Lane.
This file is part of the Independent JPEG Group's software.
For conditions of distribution and use, see the accompanying README file.
***************
*** 28,33 ****
--- 28,35 ----
jinclude.h Central include file used by all IJG .c files to reference
system include files.
jpegint.h JPEG library's internal data structures.
+ jlossls.h JPEG library's lossless codec data structures.
+ jlossy.h JPEG library's lossy codec structures.
jchuff.h Private declarations for Huffman encoder modules.
jdhuff.h Private declarations for Huffman decoder modules.
jdct.h Private declarations for forward & reverse DCT subsystems.
***************
*** 64,97 ****
jcinit.c Initialization: determines which other modules to use.
jcmaster.c Master control: setup and inter-pass sequencing logic.
jcmainct.c Main buffer controller (preprocessor => JPEG compressor).
jcprepct.c Preprocessor buffer controller.
- jccoefct.c Buffer controller for DCT coefficient buffer.
jccolor.c Color space conversion.
jcsample.c Downsampling.
jcdctmgr.c DCT manager (DCT implementation selection & control).
jfdctint.c Forward DCT using slow-but-accurate integer method.
jfdctfst.c Forward DCT using faster, less accurate integer method.
jfdctflt.c Forward DCT using floating-point arithmetic.
! jchuff.c Huffman entropy coding for sequential JPEG.
jcphuff.c Huffman entropy coding for progressive JPEG.
! jcmarker.c JPEG marker writing.
! jdatadst.c Data destination manager for stdio output.
Decompression side of the library:
jdmaster.c Master control: determines which other modules to use.
jdinput.c Input controller: controls input processing modules.
jdmainct.c Main buffer controller (JPEG decompressor => postprocessor).
! jdcoefct.c Buffer controller for DCT coefficient buffer.
jdpostct.c Postprocessor buffer controller.
jdmarker.c JPEG marker reading.
- jdhuff.c Huffman entropy decoding for sequential JPEG.
- jdphuff.c Huffman entropy decoding for progressive JPEG.
- jddctmgr.c IDCT manager (IDCT implementation selection & control).
- jidctint.c Inverse DCT using slow-but-accurate integer method.
- jidctfst.c Inverse DCT using faster, less accurate integer method.
- jidctflt.c Inverse DCT using floating-point arithmetic.
- jidctred.c Inverse DCTs with reduced-size outputs.
jdsample.c Upsampling.
jdcolor.c Color space conversion.
jdmerge.c Merged upsampling/color conversion (faster, lower quality).
--- 66,105 ----
jcinit.c Initialization: determines which other modules to use.
jcmaster.c Master control: setup and inter-pass sequencing logic.
jcmainct.c Main buffer controller (preprocessor => JPEG compressor).
+ jchuff.c Codec-independent Huffman entropy encoding routines.
jcprepct.c Preprocessor buffer controller.
jccolor.c Color space conversion.
jcsample.c Downsampling.
+ jcmarker.c JPEG marker writing.
+ jdatadst.c Data destination manager for stdio output.
+
+ Lossy (DCT) codec:
+
+ jlossy.c Lossy compressor proper.
+ jccoefct.c Buffer controller for DCT coefficient buffer.
jcdctmgr.c DCT manager (DCT implementation selection & control).
jfdctint.c Forward DCT using slow-but-accurate integer method.
jfdctfst.c Forward DCT using faster, less accurate integer method.
jfdctflt.c Forward DCT using floating-point arithmetic.
! jcshuff.c Huffman entropy coding for sequential JPEG.
jcphuff.c Huffman entropy coding for progressive JPEG.
!
! Lossless (spatial) codec:
+ jclossls.c Lossless compressor proper.
+ jcdiffct.c Buffer controller for difference buffer.
+ jcscale.c Point transformation.
+ jcpred.c Sample predictor and differencer.
+ jclhuff.c Huffman entropy encoding for lossless JPEG.
+
Decompression side of the library:
jdmaster.c Master control: determines which other modules to use.
jdinput.c Input controller: controls input processing modules.
jdmainct.c Main buffer controller (JPEG decompressor => postprocessor).
! jdhuff.c Codec-independent Huffman entropy decoding routines.
jdpostct.c Postprocessor buffer controller.
jdmarker.c JPEG marker reading.
jdsample.c Upsampling.
jdcolor.c Color space conversion.
jdmerge.c Merged upsampling/color conversion (faster, lower quality).
***************
*** 100,109 ****
--- 108,138 ----
Also handles one-pass quantization to an externally given map.
jdatasrc.c Data source manager for stdio input.
+ Lossy (DCT) codec:
+
+ jdlossy.c Lossy decompressor proper.
+ jdcoefct.c Buffer controller for DCT coefficient buffer.
+ jdshuff.c Huffman entropy decoding for sequential JPEG.
+ jdphuff.c Huffman entropy decoding for progressive JPEG.
+ jddctmgr.c IDCT manager (IDCT implementation selection & control).
+ jidctint.c Inverse DCT using slow-but-accurate integer method.
+ jidctfst.c Inverse DCT using faster, less accurate integer method.
+ jidctflt.c Inverse DCT using floating-point arithmetic.
+ jidctred.c Inverse DCTs with reduced-size outputs.
+
+ Lossless (spatial) codec:
+
+ jdlossls.c Lossless decompressor proper.
+ jddiffct.c Buffer controller for difference buffers.
+ jdlhuff.c Huffman entropy decoding for lossless JPEG.
+ jdpred.c Sample predictor and undifferencer.
+ jdscale.c Point transformation, sample size scaling.
+
Support files for both compression and decompression:
jerror.c Standard error handling routines (application replaceable).
jmemmgr.c System-independent (more or less) memory management code.
+ jcodec.c Codec-independent utility routines.
jutils.c Miscellaneous utility routines.
jmemmgr.c relies on a system-dependent memory management module. The IJG
diff -cN ../jpeg-6b/jcapimin.c ./jcapimin.c
*** ../jpeg-6b/jcapimin.c Sat Jan 24 16:21:30 1998
--- ./jcapimin.c Tue Apr 27 14:58:16 1999
***************
*** 168,174 ****
/* We bypass the main controller and invoke coef controller directly;
* all work is being done from the coefficient buffer.
*/
! if (! (*cinfo->coef->compress_data) (cinfo, (JSAMPIMAGE) NULL))
ERREXIT(cinfo, JERR_CANT_SUSPEND);
}
(*cinfo->master->finish_pass) (cinfo);
--- 168,174 ----
/* We bypass the main controller and invoke coef controller directly;
* all work is being done from the coefficient buffer.
*/
! if (! (*cinfo->codec->compress_data) (cinfo, (JSAMPIMAGE) NULL))
ERREXIT(cinfo, JERR_CANT_SUSPEND);
}
(*cinfo->master->finish_pass) (cinfo);
diff -cN ../jpeg-6b/jcapistd.c ./jcapistd.c
*** ../jpeg-6b/jcapistd.c Sat Jan 6 18:24:10 1996
--- ./jcapistd.c Tue Apr 27 14:58:16 1999
***************
*** 145,156 ****
(*cinfo->master->pass_startup) (cinfo);
/* Verify that at least one iMCU row has been passed. */
! lines_per_iMCU_row = cinfo->max_v_samp_factor * DCTSIZE;
if (num_lines < lines_per_iMCU_row)
ERREXIT(cinfo, JERR_BUFFER_SIZE);
/* Directly compress the row. */
! if (! (*cinfo->coef->compress_data) (cinfo, data)) {
/* If compressor did not consume the whole row, suspend processing. */
return 0;
}
--- 145,156 ----
(*cinfo->master->pass_startup) (cinfo);
/* Verify that at least one iMCU row has been passed. */
! lines_per_iMCU_row = cinfo->max_v_samp_factor * cinfo->data_unit;
if (num_lines < lines_per_iMCU_row)
ERREXIT(cinfo, JERR_BUFFER_SIZE);
/* Directly compress the row. */
! if (! (*cinfo->codec->compress_data) (cinfo, data)) {
/* If compressor did not consume the whole row, suspend processing. */
return 0;
}
diff -cN ../jpeg-6b/jccoefct.c ./jccoefct.c
*** ../jpeg-6b/jccoefct.c Sat Nov 15 21:25:09 1997
--- ./jccoefct.c Tue Apr 27 14:58:16 1999
***************
*** 1,7 ****
/*
* jccoefct.c
*
! * Copyright (C) 1994-1997, Thomas G. Lane.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
--- 1,7 ----
/*
* jccoefct.c
*
! * Copyright (C) 1994-1998, Thomas G. Lane.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
***************
*** 13,18 ****
--- 13,19 ----
#define JPEG_INTERNALS
#include "jinclude.h"
#include "jpeglib.h"
+ #include "jlossy.h" /* Private declarations for lossy codec */
/* We use a full-image coefficient buffer when doing Huffman optimization,
***************
*** 32,39 ****
/* Private buffer controller object */
typedef struct {
- struct jpeg_c_coef_controller pub; /* public fields */
-
JDIMENSION iMCU_row_num; /* iMCU row # within image */
JDIMENSION mcu_ctr; /* counts MCUs processed in current row */
int MCU_vert_offset; /* counts MCU rows within iMCU row */
--- 33,38 ----
***************
*** 41,60 ****
/* For single-pass compression, it's sufficient to buffer just one MCU
* (although this may prove a bit slow in practice). We allocate a
! * workspace of C_MAX_BLOCKS_IN_MCU coefficient blocks, and reuse it for each
! * MCU constructed and sent. (On 80x86, the workspace is FAR even though
! * it's not really very big; this is to keep the module interfaces unchanged
! * when a large coefficient buffer is necessary.)
* In multi-pass modes, this array points to the current MCU's blocks
* within the virtual arrays.
*/
! JBLOCKROW MCU_buffer[C_MAX_BLOCKS_IN_MCU];
/* In multi-pass modes, we need a virtual block array for each component. */
jvirt_barray_ptr whole_image[MAX_COMPONENTS];
! } my_coef_controller;
! typedef my_coef_controller * my_coef_ptr;
/* Forward declarations */
--- 40,59 ----
/* For single-pass compression, it's sufficient to buffer just one MCU
* (although this may prove a bit slow in practice). We allocate a
! * workspace of C_MAX_DATA_UNITS_IN_MCU coefficient blocks, and reuse it for
! * each MCU constructed and sent. (On 80x86, the workspace is FAR even
! * though it's not really very big; this is to keep the module interfaces
! * unchanged when a large coefficient buffer is necessary.)
* In multi-pass modes, this array points to the current MCU's blocks
* within the virtual arrays.
*/
! JBLOCKROW MCU_buffer[C_MAX_DATA_UNITS_IN_MCU];
/* In multi-pass modes, we need a virtual block array for each component. */
jvirt_barray_ptr whole_image[MAX_COMPONENTS];
! } c_coef_controller;
! typedef c_coef_controller * c_coef_ptr;
/* Forward declarations */
***************
*** 72,78 ****
start_iMCU_row (j_compress_ptr cinfo)
/* Reset within-iMCU-row counters for a new row */
{
! my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
/* In an interleaved scan, an MCU row is the same as an iMCU row.
* In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
--- 71,78 ----
start_iMCU_row (j_compress_ptr cinfo)
/* Reset within-iMCU-row counters for a new row */
{
! j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
! c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
/* In an interleaved scan, an MCU row is the same as an iMCU row.
* In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
***************
*** 99,105 ****
METHODDEF(void)
start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
{
! my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
coef->iMCU_row_num = 0;
start_iMCU_row(cinfo);
--- 99,106 ----
METHODDEF(void)
start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
{
! j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
! c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
coef->iMCU_row_num = 0;
start_iMCU_row(cinfo);
***************
*** 108,125 ****
case JBUF_PASS_THRU:
if (coef->whole_image[0] != NULL)
ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
! coef->pub.compress_data = compress_data;
break;
#ifdef FULL_COEF_BUFFER_SUPPORTED
case JBUF_SAVE_AND_PASS:
if (coef->whole_image[0] == NULL)
ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
! coef->pub.compress_data = compress_first_pass;
break;
case JBUF_CRANK_DEST:
if (coef->whole_image[0] == NULL)
ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
! coef->pub.compress_data = compress_output;
break;
#endif
default:
--- 109,126 ----
case JBUF_PASS_THRU:
if (coef->whole_image[0] != NULL)
ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
! lossyc->pub.compress_data = compress_data;
break;
#ifdef FULL_COEF_BUFFER_SUPPORTED
case JBUF_SAVE_AND_PASS:
if (coef->whole_image[0] == NULL)
ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
! lossyc->pub.compress_data = compress_first_pass;
break;
case JBUF_CRANK_DEST:
if (coef->whole_image[0] == NULL)
ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
! lossyc->pub.compress_data = compress_output;
break;
#endif
default:
***************
*** 142,148 ****
METHODDEF(boolean)
compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
{
! my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
JDIMENSION MCU_col_num; /* index of current MCU within row */
JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
--- 143,150 ----
METHODDEF(boolean)
compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
{
! j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
! c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
JDIMENSION MCU_col_num; /* index of current MCU within row */
JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
***************
*** 174,183 ****
for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
if (coef->iMCU_row_num < last_iMCU_row ||
yoffset+yindex < compptr->last_row_height) {
! (*cinfo->fdct->forward_DCT) (cinfo, compptr,
! input_buf[compptr->component_index],
! coef->MCU_buffer[blkn],
! ypos, xpos, (JDIMENSION) blockcnt);
if (blockcnt < compptr->MCU_width) {
/* Create some dummy blocks at the right edge of the image. */
jzero_far((void FAR *) coef->MCU_buffer[blkn + blockcnt],
--- 176,185 ----
for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
if (coef->iMCU_row_num < last_iMCU_row ||
yoffset+yindex < compptr->last_row_height) {
! (*lossyc->fdct_forward_DCT) (cinfo, compptr,
! input_buf[compptr->component_index],
! coef->MCU_buffer[blkn],
! ypos, xpos, (JDIMENSION) blockcnt);
if (blockcnt < compptr->MCU_width) {
/* Create some dummy blocks at the right edge of the image. */
jzero_far((void FAR *) coef->MCU_buffer[blkn + blockcnt],
***************
*** 201,207 ****
/* Try to write the MCU. In event of a suspension failure, we will
* re-DCT the MCU on restart (a bit inefficient, could be fixed...)
*/
! if (! (*cinfo->entropy->encode_mcu) (cinfo, coef->MCU_buffer)) {
/* Suspension forced; update state counters and exit */
coef->MCU_vert_offset = yoffset;
coef->mcu_ctr = MCU_col_num;
--- 203,209 ----
/* Try to write the MCU. In event of a suspension failure, we will
* re-DCT the MCU on restart (a bit inefficient, could be fixed...)
*/
! if (! (*lossyc->entropy_encode_mcu) (cinfo, coef->MCU_buffer)) {
/* Suspension forced; update state counters and exit */
coef->MCU_vert_offset = yoffset;
coef->mcu_ctr = MCU_col_num;
***************
*** 244,250 ****
METHODDEF(boolean)
compress_first_pass (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
{
! my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
JDIMENSION blocks_across, MCUs_across, MCUindex;
int bi, ci, h_samp_factor, block_row, block_rows, ndummy;
--- 246,253 ----
METHODDEF(boolean)
compress_first_pass (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
{
! j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
! c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
JDIMENSION blocks_across, MCUs_across, MCUindex;
int bi, ci, h_samp_factor, block_row, block_rows, ndummy;
***************
*** 265,274 ****
block_rows = compptr->v_samp_factor;
else {
/* NB: can't use last_row_height here, since may not be set! */
! block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
if (block_rows == 0) block_rows = compptr->v_samp_factor;
}
! blocks_across = compptr->width_in_blocks;
h_samp_factor = compptr->h_samp_factor;
/* Count number of dummy blocks to be added at the right margin. */
ndummy = (int) (blocks_across % h_samp_factor);
--- 268,277 ----
block_rows = compptr->v_samp_factor;
else {
/* NB: can't use last_row_height here, since may not be set! */
! block_rows = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
if (block_rows == 0) block_rows = compptr->v_samp_factor;
}
! blocks_across = compptr->width_in_data_units;
h_samp_factor = compptr->h_samp_factor;
/* Count number of dummy blocks to be added at the right margin. */
ndummy = (int) (blocks_across % h_samp_factor);
***************
*** 279,285 ****
*/
for (block_row = 0; block_row < block_rows; block_row++) {
thisblockrow = buffer[block_row];
! (*cinfo->fdct->forward_DCT) (cinfo, compptr,
input_buf[ci], thisblockrow,
(JDIMENSION) (block_row * DCTSIZE),
(JDIMENSION) 0, blocks_across);
--- 282,288 ----
*/
for (block_row = 0; block_row < block_rows; block_row++) {
thisblockrow = buffer[block_row];
! (*lossyc->fdct_forward_DCT) (cinfo, compptr,
input_buf[ci], thisblockrow,
(JDIMENSION) (block_row * DCTSIZE),
(JDIMENSION) 0, blocks_across);
***************
*** 340,346 ****
METHODDEF(boolean)
compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
{
! my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
JDIMENSION MCU_col_num; /* index of current MCU within row */
int blkn, ci, xindex, yindex, yoffset;
JDIMENSION start_col;
--- 343,350 ----
METHODDEF(boolean)
compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
{
! j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
! c_coef_ptr coef = (c_coef_ptr) lossyc->coef_private;
JDIMENSION MCU_col_num; /* index of current MCU within row */
int blkn, ci, xindex, yindex, yoffset;
JDIMENSION start_col;
***************
*** 378,384 ****
}
}
/* Try to write the MCU. */
! if (! (*cinfo->entropy->encode_mcu) (cinfo, coef->MCU_buffer)) {
/* Suspension forced; update state counters and exit */
coef->MCU_vert_offset = yoffset;
coef->mcu_ctr = MCU_col_num;
--- 382,388 ----
}
}
/* Try to write the MCU. */
! if (! (*lossyc->entropy_encode_mcu) (cinfo, coef->MCU_buffer)) {
/* Suspension forced; update state counters and exit */
coef->MCU_vert_offset = yoffset;
coef->mcu_ctr = MCU_col_num;
***************
*** 404,416 ****
GLOBAL(void)
jinit_c_coef_controller (j_compress_ptr cinfo, boolean need_full_buffer)
{
! my_coef_ptr coef;
! coef = (my_coef_ptr)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
! SIZEOF(my_coef_controller));
! cinfo->coef = (struct jpeg_c_coef_controller *) coef;
! coef->pub.start_pass = start_pass_coef;
/* Create the coefficient buffer. */
if (need_full_buffer) {
--- 408,421 ----
GLOBAL(void)
jinit_c_coef_controller (j_compress_ptr cinfo, boolean need_full_buffer)
{
! j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
! c_coef_ptr coef;
! coef = (c_coef_ptr)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
! SIZEOF(c_coef_controller));
! lossyc->coef_private = (struct jpeg_c_coef_controller *) coef;
! lossyc->coef_start_pass = start_pass_coef;
/* Create the coefficient buffer. */
if (need_full_buffer) {
***************
*** 424,432 ****
ci++, compptr++) {
coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
! (JDIMENSION) jround_up((long) compptr->width_in_blocks,
(long) compptr->h_samp_factor),
! (JDIMENSION) jround_up((long) compptr->height_in_blocks,
(long) compptr->v_samp_factor),
(JDIMENSION) compptr->v_samp_factor);
}
--- 429,437 ----
ci++, compptr++) {
coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
! (JDIMENSION) jround_up((long) compptr->width_in_data_units,
(long) compptr->h_samp_factor),
! (JDIMENSION) jround_up((long) compptr->height_in_data_units,
(long) compptr->v_samp_factor),
(JDIMENSION) compptr->v_samp_factor);
}
***************
*** 440,447 ****
buffer = (JBLOCKROW)
(*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
! C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
! for (i = 0; i < C_MAX_BLOCKS_IN_MCU; i++) {
coef->MCU_buffer[i] = buffer + i;
}
coef->whole_image[0] = NULL; /* flag for no virtual arrays */
--- 445,452 ----
buffer = (JBLOCKROW)
(*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
! C_MAX_DATA_UNITS_IN_MCU * SIZEOF(JBLOCK));
! for (i = 0; i < C_MAX_DATA_UNITS_IN_MCU; i++) {
coef->MCU_buffer[i] = buffer + i;
}
coef->whole_image[0] = NULL; /* flag for no virtual arrays */
diff -cN ../jpeg-6b/jcdctmgr.c ./jcdctmgr.c
*** ../jpeg-6b/jcdctmgr.c Sat Jan 13 14:15:12 1996
--- ./jcdctmgr.c Tue Apr 27 14:58:16 1999
***************
*** 1,7 ****
/*
* jcdctmgr.c
*
! * Copyright (C) 1994-1996, Thomas G. Lane.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
--- 1,7 ----
/*
* jcdctmgr.c
*
! * Copyright (C) 1994-1998, Thomas G. Lane.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
***************
*** 14,19 ****
--- 14,20 ----
#define JPEG_INTERNALS
#include "jinclude.h"
#include "jpeglib.h"
+ #include "jlossy.h" /* Private declarations for lossy codec */
#include "jdct.h" /* Private declarations for DCT subsystem */
***************
*** 20,27 ****
/* Private subobject for this module */
typedef struct {
- struct jpeg_forward_dct pub; /* public fields */
-
/* Pointer to the DCT routine actually in use */
forward_DCT_method_ptr do_dct;
--- 21,26 ----
***************
*** 36,44 ****
float_DCT_method_ptr do_float_dct;
FAST_FLOAT * float_divisors[NUM_QUANT_TBLS];
#endif
! } my_fdct_controller;
! typedef my_fdct_controller * my_fdct_ptr;
/*
--- 35,43 ----
float_DCT_method_ptr do_float_dct;
FAST_FLOAT * float_divisors[NUM_QUANT_TBLS];
#endif
! } fdct_controller;
! typedef fdct_controller * fdct_ptr;
/*
***************
*** 53,59 ****
METHODDEF(void)
start_pass_fdctmgr (j_compress_ptr cinfo)
{
! my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
int ci, qtblno, i;
jpeg_component_info *compptr;
JQUANT_TBL * qtbl;
--- 52,59 ----
METHODDEF(void)
start_pass_fdctmgr (j_compress_ptr cinfo)
{
! j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
! fdct_ptr fdct = (fdct_ptr) lossyc->fdct_private;
int ci, qtblno, i;
jpeg_component_info *compptr;
JQUANT_TBL * qtbl;
***************
*** 184,190 ****
/* This version is used for integer DCT implementations. */
{
/* This routine is heavily used, so it's worth coding it tightly. */
! my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
forward_DCT_method_ptr do_dct = fdct->do_dct;
DCTELEM * divisors = fdct->divisors[compptr->quant_tbl_no];
DCTELEM workspace[DCTSIZE2]; /* work area for FDCT subroutine */
--- 184,191 ----
/* This version is used for integer DCT implementations. */
{
/* This routine is heavily used, so it's worth coding it tightly. */
! j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
! fdct_ptr fdct = (fdct_ptr) lossyc->fdct_private;
forward_DCT_method_ptr do_dct = fdct->do_dct;
DCTELEM * divisors = fdct->divisors[compptr->quant_tbl_no];
DCTELEM workspace[DCTSIZE2]; /* work area for FDCT subroutine */
***************
*** 274,280 ****
/* This version is used for floating-point DCT implementations. */
{
/* This routine is heavily used, so it's worth coding it tightly. */
! my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
float_DCT_method_ptr do_dct = fdct->do_float_dct;
FAST_FLOAT * divisors = fdct->float_divisors[compptr->quant_tbl_no];
FAST_FLOAT workspace[DCTSIZE2]; /* work area for FDCT subroutine */
--- 275,282 ----
/* This version is used for floating-point DCT implementations. */
{
/* This routine is heavily used, so it's worth coding it tightly. */
! j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
! fdct_ptr fdct = (fdct_ptr) lossyc->fdct_private;
float_DCT_method_ptr do_dct = fdct->do_float_dct;
FAST_FLOAT * divisors = fdct->float_divisors[compptr->quant_tbl_no];
FAST_FLOAT workspace[DCTSIZE2]; /* work area for FDCT subroutine */
***************
*** 344,374 ****
GLOBAL(void)
jinit_forward_dct (j_compress_ptr cinfo)
{
! my_fdct_ptr fdct;
int i;
! fdct = (my_fdct_ptr)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
! SIZEOF(my_fdct_controller));
! cinfo->fdct = (struct jpeg_forward_dct *) fdct;
! fdct->pub.start_pass = start_pass_fdctmgr;
switch (cinfo->dct_method) {
#ifdef DCT_ISLOW_SUPPORTED
case JDCT_ISLOW:
! fdct->pub.forward_DCT = forward_DCT;
fdct->do_dct = jpeg_fdct_islow;
break;
#endif
#ifdef DCT_IFAST_SUPPORTED
case JDCT_IFAST:
! fdct->pub.forward_DCT = forward_DCT;
fdct->do_dct = jpeg_fdct_ifast;
break;
#endif
#ifdef DCT_FLOAT_SUPPORTED
case JDCT_FLOAT:
! fdct->pub.forward_DCT = forward_DCT_float;
fdct->do_float_dct = jpeg_fdct_float;
break;
#endif
--- 346,377 ----
GLOBAL(void)
jinit_forward_dct (j_compress_ptr cinfo)
{
! j_lossy_c_ptr lossyc = (j_lossy_c_ptr) cinfo->codec;
! fdct_ptr fdct;
int i;
! fdct = (fdct_ptr)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
! SIZEOF(fdct_controller));
! lossyc->fdct_private = (struct jpeg_forward_dct *) fdct;
! lossyc->fdct_start_pass = start_pass_fdctmgr;
switch (cinfo->dct_method) {
#ifdef DCT_ISLOW_SUPPORTED
case JDCT_ISLOW:
! lossyc->fdct_forward_DCT = forward_DCT;
fdct->do_dct = jpeg_fdct_islow;
break;
#endif
#ifdef DCT_IFAST_SUPPORTED
case JDCT_IFAST:
! lossyc->fdct_forward_DCT = forward_DCT;
fdct->do_dct = jpeg_fdct_ifast;
break;
#endif
#ifdef DCT_FLOAT_SUPPORTED
case JDCT_FLOAT:
! lossyc->fdct_forward_DCT = forward_DCT_float;
fdct->do_float_dct = jpeg_fdct_float;
break;
#endif
diff -cN ../jpeg-6b/jcdiffct.c ./jcdiffct.c
*** ../jpeg-6b/jcdiffct.c
--- ./jcdiffct.c Tue Apr 27 14:58:17 1999
***************
*** 0 ****
--- 1,409 ----
+ /*
+ * jcdiffct.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the difference buffer controller for compression.
+ * This controller is the top level of the lossless JPEG compressor proper.
+ * The difference buffer lies between prediction/differencing and entropy
+ * encoding.
+ */
+
+ #define JPEG_INTERNALS
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jlossls.h" /* Private declarations for lossless codec */
+
+
+ #ifdef C_LOSSLESS_SUPPORTED
+
+ /* We use a full-image sample buffer when doing Huffman optimization,
+ * and also for writing multiple-scan JPEG files. In all cases, the
+ * full-image buffer is filled during the first pass, and the scaling,
+ * prediction and differencing steps are run during subsequent passes.
+ */
+ #ifdef ENTROPY_OPT_SUPPORTED
+ #define FULL_SAMP_BUFFER_SUPPORTED
+ #else
+ #ifdef C_MULTISCAN_FILES_SUPPORTED
+ #define FULL_SAMP_BUFFER_SUPPORTED
+ #endif
+ #endif
+
+
+ /* Private buffer controller object */
+
+ typedef struct {
+ JDIMENSION iMCU_row_num; /* iMCU row # within image */
+ JDIMENSION mcu_ctr; /* counts MCUs processed in current row */
+ int MCU_vert_offset; /* counts MCU rows within iMCU row */
+ int MCU_rows_per_iMCU_row; /* number of such rows needed */
+
+ JSAMPROW cur_row[MAX_COMPONENTS]; /* row of point transformed samples */
+ JSAMPROW prev_row[MAX_COMPONENTS]; /* previous row of Pt'd samples */
+ JDIFFARRAY diff_buf[MAX_COMPONENTS]; /* iMCU row of differences */
+
+ /* In multi-pass modes, we need a virtual sample array for each component. */
+ jvirt_sarray_ptr whole_image[MAX_COMPONENTS];
+ } c_diff_controller;
+
+ typedef c_diff_controller * c_diff_ptr;
+
+
+ /* Forward declarations */
+ METHODDEF(boolean) compress_data
+ JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+ #ifdef FULL_SAMP_BUFFER_SUPPORTED
+ METHODDEF(boolean) compress_first_pass
+ JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+ METHODDEF(boolean) compress_output
+ JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+ #endif
+
+
+ LOCAL(void)
+ start_iMCU_row (j_compress_ptr cinfo)
+ /* Reset within-iMCU-row counters for a new row */
+ {
+ j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+ c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
+
+ /* In an interleaved scan, an MCU row is the same as an iMCU row.
+ * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
+ * But at the bottom of the image, process only what's left.
+ */
+ if (cinfo->comps_in_scan > 1) {
+ diff->MCU_rows_per_iMCU_row = 1;
+ } else {
+ if (diff->iMCU_row_num < (cinfo->total_iMCU_rows-1))
+ diff->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
+ else
+ diff->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
+ }
+
+ diff->mcu_ctr = 0;
+ diff->MCU_vert_offset = 0;
+ }
+
+
+ /*
+ * Initialize for a processing pass.
+ */
+
+ METHODDEF(void)
+ start_pass_diff (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+ {
+ j_lossless_c_ptr losslsc = (j_lossless_c_ptr) cinfo->codec;
+ c_diff_ptr diff = (c_diff_ptr) losslsc->diff_private;
+
+ diff->iMCU_row_num = 0;
+ start_iMCU_row(cinfo);
+
+ switch (pass_mode) {
+ case JBUF_PASS_THRU:
+ if (diff->whole_image[0] != NULL)
+ ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+ losslsc->pub.compress_data = compress_data;
+ break;
+ #ifdef FULL_SAMP_BUFFER_SUPPORTED
+ case JBUF_SAVE_AND_PASS:
+ if (diff->whole_image[0] == NULL)