From a44b784bca958934b522830b98fb9866275f9fa2 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 2 Dec 2013 09:52:38 +0100 Subject: [PATCH] Formatting. --- builds/unix/ftsystem.c | 3 ++- src/base/ftobjs.c | 4 +++- src/base/ftoutln.c | 3 ++- src/sfnt/sfobjs.c | 9 ++++++--- src/truetype/ttgload.c | 3 ++- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c index 3ddc64f19..7f7b3acb3 100644 --- a/builds/unix/ftsystem.c +++ b/builds/unix/ftsystem.c @@ -317,7 +317,8 @@ } total_read_count = 0; - do { + do + { ssize_t read_count; diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index b1c2a2bf1..bd0c66e4a 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -3388,8 +3388,10 @@ FT_CMap cmap = FT_CMAP( face->charmap ); - do { + do + { gindex = cmap->clazz->char_next( cmap, &code ); + } while ( gindex >= (FT_UInt)face->num_glyphs ); result = ( gindex == 0 ) ? 0 : code; diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c index 177a4caba..35df0cd82 100644 --- a/src/base/ftoutln.c +++ b/src/base/ftoutln.c @@ -723,7 +723,8 @@ #if 0 #define FT_OUTLINE_GET_CONTOUR( outline, c, first, last ) \ - do { \ + do \ + { \ (first) = ( c > 0 ) ? (outline)->points + \ (outline)->contours[c - 1] + 1 \ : (outline)->points; \ diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 5c0d0f61c..a31c77cbe 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -899,7 +899,8 @@ #define LOAD_( x ) \ - do { \ + do \ + { \ FT_TRACE2(( "`" #x "' " )); \ FT_TRACE3(( "-->\n" )); \ \ @@ -914,7 +915,8 @@ } while ( 0 ) #define LOADM_( x, vertical ) \ - do { \ + do \ + { \ FT_TRACE2(( "`%s" #x "' ", \ vertical ? "vertical " : "" )); \ FT_TRACE3(( "-->\n" )); \ @@ -930,7 +932,8 @@ } while ( 0 ) #define GET_NAME( id, field ) \ - do { \ + do \ + { \ error = tt_face_get_name( face, TT_NAME_ID_ ## id, field ); \ if ( error ) \ goto Exit; \ diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index d459ec138..90a500974 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -1334,7 +1334,8 @@ * */ #define TT_LOADER_SET_PP( loader ) \ - do { \ + do \ + { \ (loader)->pp1.x = (loader)->bbox.xMin - (loader)->left_bearing; \ (loader)->pp1.y = 0; \ (loader)->pp2.x = (loader)->pp1.x + (loader)->advance; \