Skip to content

Commit 52fef34

Browse files
dcommanderdcommander
committed
Eliminate internal use of GETJOCTET() macro
Because of 01e3032 (officially eliminating support for compilers without unsigned char, since we never effectively supported those compilers anyhow), GETJOCTET() is now a no-op. Since that macro is in jmorecfg.h, it is part of the de facto libjpeg API and must remain in the public headers. However, there is no reason to continue using it internally, and eliminating its internal use improves code readability.
1 parent e821464 commit 52fef34

6 files changed

Lines changed: 108 additions & 111 deletions

File tree

‎djpeg.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ jpeg_getc(j_decompress_ptr cinfo)
444444
ERREXIT(cinfo, JERR_CANT_SUSPEND);
445445
}
446446
datasrc->bytes_in_buffer--;
447-
return GETJOCTET(*datasrc->next_input_byte++);
447+
return *datasrc->next_input_byte++;
448448
}
449449

450450

‎jdarith.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ get_byte(j_decompress_ptr cinfo)
8080
if (!(*src->fill_input_buffer) (cinfo))
8181
ERREXIT(cinfo, JERR_CANT_SUSPEND);
8282
src->bytes_in_buffer--;
83-
return GETJOCTET(*src->next_input_byte++);
83+
return *src->next_input_byte++;
8484
}
8585

8686

‎jdhuff.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ jpeg_fill_bit_buffer(bitread_working_state *state,
308308
bytes_in_buffer = cinfo->src->bytes_in_buffer;
309309
}
310310
bytes_in_buffer--;
311-
c = GETJOCTET(*next_input_byte++);
311+
c = *next_input_byte++;
312312

313313
/* If it's 0xFF, check and discard stuffed zero byte */
314314
if (c == 0xFF) {
@@ -325,7 +325,7 @@ jpeg_fill_bit_buffer(bitread_working_state *state,
325325
bytes_in_buffer = cinfo->src->bytes_in_buffer;
326326
}
327327
bytes_in_buffer--;
328-
c = GETJOCTET(*next_input_byte++);
328+
c = *next_input_byte++;
329329
} while (c == 0xFF);
330330

331331
if (c == 0) {
@@ -388,8 +388,8 @@ jpeg_fill_bit_buffer(bitread_working_state *state,
388388

389389
#define GET_BYTE { \
390390
register int c0, c1; \
391-
c0 = GETJOCTET(*buffer++); \
392-
c1 = GETJOCTET(*buffer); \
391+
c0 = *buffer++; \
392+
c1 = *buffer; \
393393
/* Pre-execute most common case */ \
394394
get_buffer = (get_buffer << 8) | c0; \
395395
bits_left += 8; \

‎jdicc.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ marker_is_icc(jpeg_saved_marker_ptr marker)
3838
marker->marker == ICC_MARKER &&
3939
marker->data_length >= ICC_OVERHEAD_LEN &&
4040
/* verify the identifying string */
41-
GETJOCTET(marker->data[0]) == 0x49 &&
42-
GETJOCTET(marker->data[1]) == 0x43 &&
43-
GETJOCTET(marker->data[2]) == 0x43 &&
44-
GETJOCTET(marker->data[3]) == 0x5F &&
45-
GETJOCTET(marker->data[4]) == 0x50 &&
46-
GETJOCTET(marker->data[5]) == 0x52 &&
47-
GETJOCTET(marker->data[6]) == 0x4F &&
48-
GETJOCTET(marker->data[7]) == 0x46 &&
49-
GETJOCTET(marker->data[8]) == 0x49 &&
50-
GETJOCTET(marker->data[9]) == 0x4C &&
51-
GETJOCTET(marker->data[10]) == 0x45 &&
52-
GETJOCTET(marker->data[11]) == 0x0;
41+
marker->data[0] == 0x49 &&
42+
marker->data[1] == 0x43 &&
43+
marker->data[2] == 0x43 &&
44+
marker->data[3] == 0x5F &&
45+
marker->data[4] == 0x50 &&
46+
marker->data[5] == 0x52 &&
47+
marker->data[6] == 0x4F &&
48+
marker->data[7] == 0x46 &&
49+
marker->data[8] == 0x49 &&
50+
marker->data[9] == 0x4C &&
51+
marker->data[10] == 0x45 &&
52+
marker->data[11] == 0x0;
5353
}
5454

5555

@@ -102,12 +102,12 @@ jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr,
102102
for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
103103
if (marker_is_icc(marker)) {
104104
if (num_markers == 0)
105-
num_markers = GETJOCTET(marker->data[13]);
106-
else if (num_markers != GETJOCTET(marker->data[13])) {
105+
num_markers = marker->data[13];
106+
else if (num_markers != marker->data[13]) {
107107
WARNMS(cinfo, JWRN_BOGUS_ICC); /* inconsistent num_markers fields */
108108
return FALSE;
109109
}
110-
seq_no = GETJOCTET(marker->data[12]);
110+
seq_no = marker->data[12];
111111
if (seq_no <= 0 || seq_no > num_markers) {
112112
WARNMS(cinfo, JWRN_BOGUS_ICC); /* bogus sequence number */
113113
return FALSE;
@@ -154,7 +154,7 @@ jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr,
154154
JOCTET FAR *src_ptr;
155155
JOCTET *dst_ptr;
156156
unsigned int length;
157-
seq_no = GETJOCTET(marker->data[12]);
157+
seq_no = marker->data[12];
158158
dst_ptr = icc_data + data_offset[seq_no];
159159
src_ptr = marker->data + ICC_OVERHEAD_LEN;
160160
length = data_length[seq_no];

‎jdmarker.c‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,18 @@ typedef my_marker_reader *my_marker_ptr;
151151
#define INPUT_BYTE(cinfo, V, action) \
152152
MAKESTMT( MAKE_BYTE_AVAIL(cinfo, action); \
153153
bytes_in_buffer--; \
154-
V = GETJOCTET(*next_input_byte++); )
154+
V = *next_input_byte++; )
155155

156156
/* As above, but read two bytes interpreted as an unsigned 16-bit integer.
157157
* V should be declared unsigned int or perhaps JLONG.
158158
*/
159159
#define INPUT_2BYTES(cinfo, V, action) \
160160
MAKESTMT( MAKE_BYTE_AVAIL(cinfo, action); \
161161
bytes_in_buffer--; \
162-
V = ((unsigned int)GETJOCTET(*next_input_byte++)) << 8; \
162+
V = ((unsigned int)(*next_input_byte++)) << 8; \
163163
MAKE_BYTE_AVAIL(cinfo, action); \
164164
bytes_in_buffer--; \
165-
V += GETJOCTET(*next_input_byte++); )
165+
V += *next_input_byte++; )
166166

167167

168168
/*
@@ -608,18 +608,18 @@ examine_app0(j_decompress_ptr cinfo, JOCTET *data, unsigned int datalen,
608608
JLONG totallen = (JLONG)datalen + remaining;
609609

610610
if (datalen >= APP0_DATA_LEN &&
611-
GETJOCTET(data[0]) == 0x4A &&
612-
GETJOCTET(data[1]) == 0x46 &&
613-
GETJOCTET(data[2]) == 0x49 &&
614-
GETJOCTET(data[3]) == 0x46 &&
615-
GETJOCTET(data[4]) == 0) {
611+
data[0] == 0x4A &&
612+
data[1] == 0x46 &&
613+
data[2] == 0x49 &&
614+
data[3] == 0x46 &&
615+
data[4] == 0) {
616616
/* Found JFIF APP0 marker: save info */
617617
cinfo->saw_JFIF_marker = TRUE;
618-
cinfo->JFIF_major_version = GETJOCTET(data[5]);
619-
cinfo->JFIF_minor_version = GETJOCTET(data[6]);
620-
cinfo->density_unit = GETJOCTET(data[7]);
621-
cinfo->X_density = (GETJOCTET(data[8]) << 8) + GETJOCTET(data[9]);
622-
cinfo->Y_density = (GETJOCTET(data[10]) << 8) + GETJOCTET(data[11]);
618+
cinfo->JFIF_major_version = data[5];
619+
cinfo->JFIF_minor_version = data[6];
620+
cinfo->density_unit = data[7];
621+
cinfo->X_density = (data[8] << 8) + data[9];
622+
cinfo->Y_density = (data[10] << 8) + data[11];
623623
/* Check version.
624624
* Major version must be 1, anything else signals an incompatible change.
625625
* (We used to treat this as an error, but now it's a nonfatal warning,
@@ -634,24 +634,22 @@ examine_app0(j_decompress_ptr cinfo, JOCTET *data, unsigned int datalen,
634634
cinfo->JFIF_major_version, cinfo->JFIF_minor_version,
635635
cinfo->X_density, cinfo->Y_density, cinfo->density_unit);
636636
/* Validate thumbnail dimensions and issue appropriate messages */
637-
if (GETJOCTET(data[12]) | GETJOCTET(data[13]))
638-
TRACEMS2(cinfo, 1, JTRC_JFIF_THUMBNAIL,
639-
GETJOCTET(data[12]), GETJOCTET(data[13]));
637+
if (data[12] | data[13])
638+
TRACEMS2(cinfo, 1, JTRC_JFIF_THUMBNAIL, data[12], data[13]);
640639
totallen -= APP0_DATA_LEN;
641-
if (totallen !=
642-
((JLONG)GETJOCTET(data[12]) * (JLONG)GETJOCTET(data[13]) * (JLONG)3))
640+
if (totallen != ((JLONG)data[12] * (JLONG)data[13] * (JLONG)3))
643641
TRACEMS1(cinfo, 1, JTRC_JFIF_BADTHUMBNAILSIZE, (int)totallen);
644642
} else if (datalen >= 6 &&
645-
GETJOCTET(data[0]) == 0x4A &&
646-
GETJOCTET(data[1]) == 0x46 &&
647-
GETJOCTET(data[2]) == 0x58 &&
648-
GETJOCTET(data[3]) == 0x58 &&
649-
GETJOCTET(data[4]) == 0) {
643+
data[0] == 0x4A &&
644+
data[1] == 0x46 &&
645+
data[2] == 0x58 &&
646+
data[3] == 0x58 &&
647+
data[4] == 0) {
650648
/* Found JFIF "JFXX" extension APP0 marker */
651649
/* The library doesn't actually do anything with these,
652650
* but we try to produce a helpful trace message.
653651
*/
654-
switch (GETJOCTET(data[5])) {
652+
switch (data[5]) {
655653
case 0x10:
656654
TRACEMS1(cinfo, 1, JTRC_THUMB_JPEG, (int)totallen);
657655
break;
@@ -662,8 +660,7 @@ examine_app0(j_decompress_ptr cinfo, JOCTET *data, unsigned int datalen,
662660
TRACEMS1(cinfo, 1, JTRC_THUMB_RGB, (int)totallen);
663661
break;
664662
default:
665-
TRACEMS2(cinfo, 1, JTRC_JFIF_EXTENSION,
666-
GETJOCTET(data[5]), (int)totallen);
663+
TRACEMS2(cinfo, 1, JTRC_JFIF_EXTENSION, data[5], (int)totallen);
667664
break;
668665
}
669666
} else {
@@ -684,16 +681,16 @@ examine_app14(j_decompress_ptr cinfo, JOCTET *data, unsigned int datalen,
684681
unsigned int version, flags0, flags1, transform;
685682

686683
if (datalen >= APP14_DATA_LEN &&
687-
GETJOCTET(data[0]) == 0x41 &&
688-
GETJOCTET(data[1]) == 0x64 &&
689-
GETJOCTET(data[2]) == 0x6F &&
690-
GETJOCTET(data[3]) == 0x62 &&
691-
GETJOCTET(data[4]) == 0x65) {
684+
data[0] == 0x41 &&
685+
data[1] == 0x64 &&
686+
data[2] == 0x6F &&
687+
data[3] == 0x62 &&
688+
data[4] == 0x65) {
692689
/* Found Adobe APP14 marker */
693-
version = (GETJOCTET(data[5]) << 8) + GETJOCTET(data[6]);
694-
flags0 = (GETJOCTET(data[7]) << 8) + GETJOCTET(data[8]);
695-
flags1 = (GETJOCTET(data[9]) << 8) + GETJOCTET(data[10]);
696-
transform = GETJOCTET(data[11]);
690+
version = (data[5] << 8) + data[6];
691+
flags0 = (data[7] << 8) + data[8];
692+
flags1 = (data[9] << 8) + data[10];
693+
transform = data[11];
697694
TRACEMS4(cinfo, 1, JTRC_ADOBE, version, flags0, flags1, transform);
698695
cinfo->saw_Adobe_marker = TRUE;
699696
cinfo->Adobe_transform = (UINT8)transform;

0 commit comments

Comments
 (0)