summaryrefslogtreecommitdiff
path: root/src/sfnt/ttsbit.c
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2005-03-01 02:13:50 +0000
committerWerner Lemberg <wl@gnu.org>2005-03-01 02:13:50 +0000
commite793092d0a9f4d4d383315bcefd485dcbe4804b3 (patch)
treeeb8ca59af95da475b0985b803340d36ef73dd8de /src/sfnt/ttsbit.c
parent7305f62767eacd6b58d1c6d5dcf8eda1b209c457 (diff)
downloadfreetype2-e793092d0a9f4d4d383315bcefd485dcbe4804b3.tar.gz
Formatting.
* src/truetype/ttpload.c (tt_face_load_loca): Fix typo. * src/sfnt/ttkern.c: Include `ttkern.h'. (FT_COMPONENT): Updated. * include/freetype/internal/fttrace.h: Add entry for `ttkern'. * src/sfnt/ttsbit0.c: s/FT_Err_/SFNT_Err_/. Decorate constants with `U' and `L' where necessary. * src/sfnt/ttcmap.c (tt_cmap4_next): Remove unused variable.
Diffstat (limited to 'src/sfnt/ttsbit.c')
-rw-r--r--src/sfnt/ttsbit.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index c449ddd87..610b63bcc 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -4,7 +4,7 @@
/* */
/* TrueType and OpenType embedded bitmap support (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -584,12 +584,11 @@
}
}
- /* now set up the root fields to indicate the strikes
- */
+ /* now set up the root fields to indicate the strikes */
if ( face->num_sbit_strikes )
{
FT_ULong n;
- FT_Face root = FT_FACE(face);
+ FT_Face root = FT_FACE( face );
if ( FT_NEW_ARRAY( root->available_sizes, face->num_sbit_strikes ) )
@@ -608,9 +607,9 @@
/* assume 72dpi */
bsize->height =
- (FT_Short)( ( height * strike->y_ppem + fupem/2 ) / fupem );
+ (FT_Short)( ( height * strike->y_ppem + fupem / 2 ) / fupem );
bsize->width =
- (FT_Short)( ( avg * strike->y_ppem + fupem/2 ) / fupem );
+ (FT_Short)( ( avg * strike->y_ppem + fupem / 2 ) / fupem );
bsize->size = strike->y_ppem << 6;
bsize->x_ppem = strike->x_ppem << 6;
bsize->y_ppem = strike->y_ppem << 6;
@@ -1514,6 +1513,7 @@
return error;
}
+#endif /* !OPTIMIZE_MEMORY */
+
/* END */
-#endif /* !OPTIMIZE_MEMORY */