mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-21 18:23:59 +00:00
Code Issues Releases Activity

Remove redundant byte-swapping boundary

Browse Source 
* src/sfnt.c (sfnt_read_OS_2_table):

* src/sfnt.h (struct sfnt_OS_2_table): Don't redundantly realign
after s_family_class.
This commit is contained in:
Po Lu 2024-04-04 13:52:52 +08:00
parent 42c0603c7a
commit daefd6771a
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sfnt.c
View File

@ -16650,10 +16650,10 @@ sfnt_read_OS_2_table (int fd, struct sfnt_offset_subtable *subtable)
OS_2 = xmalloc (sizeof *OS_2);
/* Read data up to the end of `panose'. */
/* Read data into the structure. */
wanted = SFNT_ENDOF (struct sfnt_OS_2_table, panose,
unsigned char[10]);
wanted = SFNT_ENDOF (struct sfnt_OS_2_table, fs_last_char_index,
uint16_t);
rc = read (fd, OS_2, wanted);
if (rc == -1 || rc != wanted)
@ -16680,20 +16680,6 @@ sfnt_read_OS_2_table (int fd, struct sfnt_offset_subtable *subtable)
sfnt_swap16 (&OS_2->y_strikeout_size);
sfnt_swap16 (&OS_2->y_strikeout_position);
sfnt_swap16 (&OS_2->s_family_class);
/* Read fields between ul_unicode_range and fs_last_char_index. */
wanted = (SFNT_ENDOF (struct sfnt_OS_2_table, fs_last_char_index,
uint16_t)
- offsetof (struct sfnt_OS_2_table, ul_unicode_range));
rc = read (fd, &OS_2->ul_unicode_range, wanted);
if (rc == -1 || rc != wanted)
{
xfree (OS_2);
return NULL;
}
/* Swap the remainder and return the table. */
sfnt_swap32 (&OS_2->ul_unicode_range[0]);
sfnt_swap32 (&OS_2->ul_unicode_range[1]);
sfnt_swap32 (&OS_2->ul_unicode_range[2]);

2
src/sfnt.h
View File

@ -1395,8 +1395,6 @@ struct sfnt_OS_2_table
/* Microsoft ``panose'' classification. */
unsigned char panose[10];
/* Alignment boundary! */
/* Unicode range specification. */
uint32_t ul_unicode_range[4];