[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master bacc48e61 1/2: Whitespace.
|
From: |
Werner Lemberg |
|
Subject: |
[freetype2] master bacc48e61 1/2: Whitespace. |
|
Date: |
Sat, 28 Jan 2023 11:06:54 -0500 (EST) |
branch: master
commit bacc48e61646644f8240eb5788e6b83466bd1c7b
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>
Whitespace.
---
src/base/ftbitmap.c | 4 +--
src/pcf/pcfdrivr.c | 7 +++--
src/pcf/pcfutil.c | 5 ++--
src/sfnt/ttcolr.c | 79 +++++++++++++++++++++++++-------------------------
src/truetype/ttgload.c | 8 ++---
src/truetype/ttgxvar.c | 8 ++---
6 files changed, 58 insertions(+), 53 deletions(-)
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index 55851f7b2..1c93648dc 100644
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -519,8 +519,8 @@
case FT_PIXEL_MODE_BGRA:
{
FT_Int width = (FT_Int)source->width;
- FT_Int neg = ( target->pitch == 0 && source->pitch < 0 ) ||
- target->pitch < 0;
+ FT_Int neg = ( target->pitch == 0 && source->pitch < 0 ) ||
+ target->pitch < 0;
FT_Bitmap_Done( library, target );
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index ac83918bc..bfa6eacca 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -104,7 +104,8 @@ THE SOFTWARE.
pcf_cmap_char_index( FT_CMap pcfcmap, /* PCF_CMap */
FT_UInt32 charcode )
{
- PCF_Enc enc = ( (PCF_CMap)pcfcmap )->enc;
+ PCF_Enc enc = ( (PCF_CMap)pcfcmap )->enc;
+
FT_UInt32 i = ( charcode >> 8 ) - enc->firstRow;
FT_UInt32 j = ( charcode & 0xFF ) - enc->firstCol;
FT_UInt32 h = enc->lastRow - enc->firstRow + 1;
@@ -125,11 +126,13 @@ THE SOFTWARE.
{
PCF_Enc enc = ( (PCF_CMap)pcfcmap )->enc;
FT_UInt32 charcode = *acharcode + 1;
+
FT_UInt32 i = ( charcode >> 8 ) - enc->firstRow;
FT_UInt32 j = ( charcode & 0xFF ) - enc->firstCol;
FT_UInt32 h = enc->lastRow - enc->firstRow + 1;
FT_UInt32 w = enc->lastCol - enc->firstCol + 1;
- FT_UInt result = 0;
+
+ FT_UInt result = 0;
/* adjust wrapped around "negative" values */
diff --git a/src/pcf/pcfutil.c b/src/pcf/pcfutil.c
index d634a5a01..957572691 100644
--- a/src/pcf/pcfutil.c
+++ b/src/pcf/pcfutil.c
@@ -57,8 +57,9 @@ in this Software without prior written authorization from The
Open Group.
}
-#if defined( __clang__ ) || ( defined( __GNUC__ ) && \
- ( __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 8 ) ) )
+#if defined( __clang__ ) || \
+ ( defined( __GNUC__ ) && \
+ ( __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 8 ) ) )
#define BSWAP16( x ) __builtin_bswap16( x )
#define BSWAP32( x ) __builtin_bswap32( x )
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index f98c60c87..d888423f5 100644
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -66,25 +66,25 @@
typedef enum FT_PaintFormat_Internal_
{
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID = 3,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_LINEAR_GRADIENT = 5,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_RADIAL_GRADIENT = 7,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SWEEP_GRADIENT = 9,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_TRANSFORM = 13,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_TRANSLATE = 15,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE = 17,
- FT_COLR_PAINTFORMAT_INTERNAL_SCALE_CENTER = 18,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_CENTER = 19,
- FT_COLR_PAINTFORMAT_INTERNAL_SCALE_UNIFORM = 20,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM = 21,
- FT_COLR_PAINTFORMAT_INTERNAL_SCALE_UNIFORM_CENTER = 22,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM_CENTER = 23,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE = 25,
- FT_COLR_PAINTFORMAT_INTERNAL_ROTATE_CENTER = 26,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE_CENTER = 27,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW = 29,
- FT_COLR_PAINTFORMAT_INTERNAL_SKEW_CENTER = 30,
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER = 31,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID = 3,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_LINEAR_GRADIENT = 5,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_RADIAL_GRADIENT = 7,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SWEEP_GRADIENT = 9,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_TRANSFORM = 13,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_TRANSLATE = 15,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE = 17,
+ FT_COLR_PAINTFORMAT_INTERNAL_SCALE_CENTER = 18,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_CENTER = 19,
+ FT_COLR_PAINTFORMAT_INTERNAL_SCALE_UNIFORM = 20,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM = 21,
+ FT_COLR_PAINTFORMAT_INTERNAL_SCALE_UNIFORM_CENTER = 22,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM_CENTER = 23,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE = 25,
+ FT_COLR_PAINTFORMAT_INTERNAL_ROTATE_CENTER = 26,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE_CENTER = 27,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW = 29,
+ FT_COLR_PAINTFORMAT_INTERNAL_SKEW_CENTER = 30,
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER = 31,
} FT_PaintFormat_Internal;
@@ -177,6 +177,7 @@
FT_ULong colr_offset_in_stream;
#endif
+
/* `COLR' always needs `CPAL' */
if ( !face->cpal )
return FT_THROW( Invalid_File_Format );
@@ -334,11 +335,11 @@
if ( colr->var_store.axisCount && var_idx_map_offset )
{
error = mm->load_delta_set_idx_map(
- FT_FACE( face ),
- colr_offset_in_stream + var_idx_map_offset,
- &colr->delta_set_idx_map,
- &colr->var_store,
- table_size );
+ FT_FACE( face ),
+ colr_offset_in_stream + var_idx_map_offset,
+ &colr->delta_set_idx_map,
+ &colr->var_store,
+ table_size );
if ( error != FT_Err_Ok )
goto InvalidTable;
}
@@ -681,7 +682,7 @@
else if ( apaint->format == FT_COLR_PAINTFORMAT_SOLID ||
(FT_PaintFormat_Internal)apaint->format ==
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID )
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID )
{
ENSURE_READ_BYTES( 4 );
apaint->u.solid.color.palette_index = FT_NEXT_USHORT( p );
@@ -689,7 +690,7 @@
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
if ( (FT_PaintFormat_Internal)apaint->format ==
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID )
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID )
{
ENSURE_READ_BYTES( 4 );
var_index_base = FT_NEXT_ULONG( p );
@@ -725,10 +726,10 @@
if ( !get_child_table_pointer( colr, paint_base, &p, &child_table_p ) )
return 0;
- if ( apaint->format == FT_COLR_PAINTFORMAT_LINEAR_GRADIENT ||
+ if ( apaint->format == FT_COLR_PAINTFORMAT_LINEAR_GRADIENT ||
( do_read_var =
- ( (FT_PaintFormat_Internal)apaint->format ==
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_LINEAR_GRADIENT ) ) )
+ ( (FT_PaintFormat_Internal)apaint->format ==
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_LINEAR_GRADIENT ) ) )
{
if ( !read_color_line( colr,
child_table_p,
@@ -773,10 +774,10 @@
return 1;
}
- else if ( apaint->format == FT_COLR_PAINTFORMAT_RADIAL_GRADIENT ||
+ else if ( apaint->format == FT_COLR_PAINTFORMAT_RADIAL_GRADIENT ||
( do_read_var =
- ( (FT_PaintFormat_Internal)apaint->format ==
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_RADIAL_GRADIENT ) ) )
+ ( (FT_PaintFormat_Internal)apaint->format ==
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_RADIAL_GRADIENT ) ) )
{
FT_Pos tmp;
@@ -835,10 +836,10 @@
return 1;
}
- else if ( apaint->format == FT_COLR_PAINTFORMAT_SWEEP_GRADIENT ||
+ else if ( apaint->format == FT_COLR_PAINTFORMAT_SWEEP_GRADIENT ||
( do_read_var =
- ( (FT_PaintFormat_Internal)apaint->format ==
- FT_COLR_PAINTFORMAT_INTERNAL_VAR_SWEEP_GRADIENT ) ) )
+ ( (FT_PaintFormat_Internal)apaint->format ==
+ FT_COLR_PAINTFORMAT_INTERNAL_VAR_SWEEP_GRADIENT ) ) )
{
if ( !read_color_line( colr,
child_table_p,
@@ -1462,13 +1463,13 @@
return 0;
font_clip_box.xMin +=
- FT_MulFix( item_deltas[0], face->root.size->metrics.x_scale );
+ FT_MulFix( item_deltas[0], face->root.size->metrics.x_scale );
font_clip_box.yMin +=
- FT_MulFix( item_deltas[1], face->root.size->metrics.y_scale );
+ FT_MulFix( item_deltas[1], face->root.size->metrics.y_scale );
font_clip_box.xMax +=
- FT_MulFix( item_deltas[2], face->root.size->metrics.x_scale );
+ FT_MulFix( item_deltas[2], face->root.size->metrics.x_scale );
font_clip_box.yMax +=
- FT_MulFix( item_deltas[3], face->root.size->metrics.y_scale );
+ FT_MulFix( item_deltas[3], face->root.size->metrics.y_scale );
}
#endif
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 179dae019..9e0692d27 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -2269,8 +2269,8 @@
FT_UInt glyph_index,
FT_Int32 load_flags )
{
- TT_Face face = (TT_Face)glyph->face;
- SFNT_Service sfnt = (SFNT_Service)face->sfnt;
+ TT_Face face = (TT_Face)glyph->face;
+ SFNT_Service sfnt = (SFNT_Service)face->sfnt;
FT_Stream stream = face->root.stream;
FT_Error error;
TT_SBit_MetricsRec sbit_metrics;
@@ -2326,7 +2326,7 @@
FT_Int32 load_flags,
FT_Bool glyf_table_only )
{
- TT_Face face = (TT_Face)glyph->face;
+ TT_Face face = (TT_Face)glyph->face;
FT_Stream stream = face->root.stream;
#ifdef TT_USE_BYTECODE_INTERPRETER
@@ -2334,7 +2334,7 @@
FT_Bool pedantic = FT_BOOL( load_flags & FT_LOAD_PEDANTIC );
#if defined TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY || \
defined TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
- TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( glyph->face );
+ TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( glyph->face );
#endif
#endif
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 74499c17e..ba538683c 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -3994,11 +3994,11 @@
FT_Vector* unrounded )
{
FT_Error error;
- TT_Face face = loader->face;
- FT_Stream stream = face->root.stream;
- FT_Memory memory = stream->memory;
+ TT_Face face = loader->face;
+ FT_Stream stream = face->root.stream;
+ FT_Memory memory = stream->memory;
FT_UInt glyph_index = loader->glyph_index;
- FT_UInt n_points = (FT_UInt)outline->n_points + 4;
+ FT_UInt n_points = (FT_UInt)outline->n_points + 4;
FT_Vector* points_org = NULL; /* coordinates in 16.16 format */
FT_Vector* points_out = NULL; /* coordinates in 16.16 format */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master bacc48e61 1/2: Whitespace.,
Werner Lemberg <=