Commit e12e313a04c8340c1b8adae0c59dd1e76f56e2eb
2000-08-29T16:03:28
a small optimisation that should speed things a bit. I'm surprised I didn't do it before..
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
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index db2fe6b..aad4f33 100644
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -642,6 +642,7 @@
{
FT_Error error;
FT_Bool frame_accessed = 0;
+ FT_Byte* cursor = stream->cursor;
if ( !fields || !stream )
@@ -663,6 +664,7 @@
goto Exit;
frame_accessed = 1;
+ cursor = stream->cursor;
fields++;
continue; /* loop! */
@@ -690,74 +692,49 @@
case ft_frame_byte:
case ft_frame_schar: /* read a single byte */
- value = GET_Byte();
+ value = NEXT_Byte(cursor);
sign_shift = 24;
break;
case ft_frame_short_be:
case ft_frame_ushort_be: /* read a 2-byte big-endian short */
- value = GET_UShort();
+ value = NEXT_UShort(cursor);
sign_shift = 16;
break;
case ft_frame_short_le:
case ft_frame_ushort_le: /* read a 2-byte little-endian short */
- value = 0;
- p = stream->cursor;
-
- if ( p + 1 < stream->limit )
- {
- value = ( FT_UShort)p[0] | ((FT_UShort)p[1] << 8 );
- stream->cursor += 2;
- }
+ value = NEXT_UShortLE(cursor);
sign_shift = 16;
break;
case ft_frame_long_be:
case ft_frame_ulong_be: /* read a 4-byte big-endian long */
- value = GET_ULong();
+ value = NEXT_ULong(cursor);
sign_shift = 0;
break;
case ft_frame_long_le:
case ft_frame_ulong_le: /* read a 4-byte little-endian long */
- value = 0;
- p = stream->cursor;
-
- if ( p + 3 < stream->limit )
- {
- value = (FT_ULong)p[0] |
- ( (FT_ULong)p[1] << 8 ) |
- ( (FT_ULong)p[2] << 16 ) |
- ( (FT_ULong)p[3] << 24 );
- stream->cursor += 4;
- }
+ value = NEXT_ULongLE(cursor);
sign_shift = 0;
break;
case ft_frame_off3_be:
case ft_frame_uoff3_be: /* read a 3-byte big-endian long */
- value = GET_UOffset();
+ value = NEXT_UOffset(cursor);
sign_shift = 8;
break;
case ft_frame_off3_le:
case ft_frame_uoff3_le: /* read a 3-byte little-endian long */
- value = 0;
- p = stream->cursor;
-
- if ( p + 2 < stream->limit )
- {
- value = (FT_ULong)p[0] |
- ( (FT_ULong)p[1] << 8 ) |
- ( (FT_ULong)p[2] << 16 );
- stream->cursor += 3;
- }
+ value = NEXT_UOffsetLE(cursor);
sign_shift = 8;
break;
default:
/* otherwise, exit the loop */
+ stream->cursor = cursor;
goto Exit;
}