From dea2e6358b2f963008d447d27564dd79890b61f0 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 24 Oct 2022 06:59:45 +0200 Subject: [PATCH] Replace '1/64th' (and similar entries) with '1/64' in docs and comments. --- docs/raster.txt | 2 +- include/freetype/ftcache.h | 2 +- include/freetype/ftglyph.h | 4 ++-- include/freetype/ftlcdfil.h | 6 +++--- include/freetype/ftpfr.h | 2 +- include/freetype/internal/pshints.h | 4 ++-- include/freetype/tttables.h | 4 ++-- src/autofit/aftypes.h | 14 +++++++------- src/sdf/ftsdf.c | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/raster.txt b/docs/raster.txt index 05fbe4917..fbc615a1e 100644 --- a/docs/raster.txt +++ b/docs/raster.txt @@ -63,7 +63,7 @@ II. Rendering Technology `26.6' means that 26 bits are used for the integer part of a value and 6 bits are used for the fractional part. Consequently, the `distance' between two neighbouring pixels is - 64 `units' (1 unit = 1/64th of a pixel). + 64 `units' (1 unit = 1/64 of a pixel). Note that, for the rasterizer, pixel centers are located at integer coordinates. The TrueType bytecode interpreter, diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h index ecbbd7b8f..296ea01a2 100644 --- a/include/freetype/ftcache.h +++ b/include/freetype/ftcache.h @@ -424,7 +424,7 @@ FT_BEGIN_HEADER * pixel :: * A Boolean. If 1, the `width` and `height` fields are interpreted as * integer pixel character sizes. Otherwise, they are expressed as - * 1/64th of points. + * 1/64 of points. * * x_res :: * Only used when `pixel` is value~0 to indicate the horizontal diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h index b9235463f..765379a86 100644 --- a/include/freetype/ftglyph.h +++ b/include/freetype/ftglyph.h @@ -413,7 +413,7 @@ FT_BEGIN_HEADER * * delta :: * A pointer to a 2d vector to apply. Coordinates are expressed in - * 1/64th of a pixel. + * 1/64 of a pixel. * * @return: * FreeType error code (if not 0, the glyph format is not scalable). @@ -500,7 +500,7 @@ FT_BEGIN_HEADER * @output: * acbox :: * The glyph coordinate bounding box. Coordinates are expressed in - * 1/64th of pixels if it is grid-fitted. + * 1/64 of pixels if it is grid-fitted. * * @note: * Coordinates are relative to the glyph origin, using the y~upwards diff --git a/include/freetype/ftlcdfil.h b/include/freetype/ftlcdfil.h index c767c6cb4..09e582a4d 100644 --- a/include/freetype/ftlcdfil.h +++ b/include/freetype/ftlcdfil.h @@ -137,11 +137,11 @@ FT_BEGIN_HEADER * * FT_LCD_FILTER_DEFAULT :: * This is a beveled, normalized, and color-balanced five-tap filter - * with weights of [0x08 0x4D 0x56 0x4D 0x08] in 1/256th units. + * with weights of [0x08 0x4D 0x56 0x4D 0x08] in 1/256 units. * * FT_LCD_FILTER_LIGHT :: * this is a boxy, normalized, and color-balanced three-tap filter with - * weights of [0x00 0x55 0x56 0x55 0x00] in 1/256th units. + * weights of [0x00 0x55 0x56 0x55 0x00] in 1/256 units. * * FT_LCD_FILTER_LEGACY :: * FT_LCD_FILTER_LEGACY1 :: @@ -226,7 +226,7 @@ FT_BEGIN_HEADER * * weights :: * A pointer to an array; the function copies the first five bytes and - * uses them to specify the filter weights in 1/256th units. + * uses them to specify the filter weights in 1/256 units. * * @return: * FreeType error code. 0~means success. diff --git a/include/freetype/ftpfr.h b/include/freetype/ftpfr.h index 428e32706..547d09f43 100644 --- a/include/freetype/ftpfr.h +++ b/include/freetype/ftpfr.h @@ -161,7 +161,7 @@ FT_BEGIN_HEADER * * @note: * You can use the `x_scale` or `y_scale` results of @FT_Get_PFR_Metrics - * to convert the advance to device subpixels (i.e., 1/64th of pixels). + * to convert the advance to device subpixels (i.e., 1/64 of pixels). */ FT_EXPORT( FT_Error ) FT_Get_PFR_Advance( FT_Face face, diff --git a/include/freetype/internal/pshints.h b/include/freetype/internal/pshints.h index 5de83e456..6d85e412f 100644 --- a/include/freetype/internal/pshints.h +++ b/include/freetype/internal/pshints.h @@ -294,7 +294,7 @@ FT_BEGIN_HEADER * * @note: * On input, all points within the outline are in font coordinates. On - * output, they are in 1/64th of pixels. + * output, they are in 1/64 of pixels. * * The scaling transformation is taken from the 'globals' object which * must correspond to the same font as the glyph. @@ -607,7 +607,7 @@ FT_BEGIN_HEADER * * @note: * On input, all points within the outline are in font coordinates. On - * output, they are in 1/64th of pixels. + * output, they are in 1/64 of pixels. * * The scaling transformation is taken from the 'globals' object which * must correspond to the same font than the glyph. diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h index 21664df7b..82c24ff4e 100644 --- a/include/freetype/tttables.h +++ b/include/freetype/tttables.h @@ -424,8 +424,8 @@ FT_BEGIN_HEADER /* only version 5 and higher: */ - FT_UShort usLowerOpticalPointSize; /* in twips (1/20th points) */ - FT_UShort usUpperOpticalPointSize; /* in twips (1/20th points) */ + FT_UShort usLowerOpticalPointSize; /* in twips (1/20 points) */ + FT_UShort usUpperOpticalPointSize; /* in twips (1/20 points) */ } TT_OS2; diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h index 754aad7ba..ae8227b85 100644 --- a/src/autofit/aftypes.h +++ b/src/autofit/aftypes.h @@ -119,13 +119,13 @@ extern void* _af_debug_hints; typedef struct AF_ScalerRec_ { - FT_Face face; /* source font face */ - FT_Fixed x_scale; /* from font units to 1/64th device pixels */ - FT_Fixed y_scale; /* from font units to 1/64th device pixels */ - FT_Pos x_delta; /* in 1/64th device pixels */ - FT_Pos y_delta; /* in 1/64th device pixels */ - FT_Render_Mode render_mode; /* monochrome, anti-aliased, LCD, etc. */ - FT_UInt32 flags; /* additional control flags, see above */ + FT_Face face; /* source font face */ + FT_Fixed x_scale; /* from font units to 1/64 device pixels */ + FT_Fixed y_scale; /* from font units to 1/64 device pixels */ + FT_Pos x_delta; /* in 1/64 device pixels */ + FT_Pos y_delta; /* in 1/64 device pixels */ + FT_Render_Mode render_mode; /* monochrome, anti-aliased, LCD, etc. */ + FT_UInt32 flags; /* additional control flags, see above */ } AF_ScalerRec, *AF_Scaler; diff --git a/src/sdf/ftsdf.c b/src/sdf/ftsdf.c index 971427aeb..07ffe0cba 100644 --- a/src/sdf/ftsdf.c +++ b/src/sdf/ftsdf.c @@ -1293,7 +1293,7 @@ /* Calculate the number of necessary bisections. Each */ /* bisection causes a four-fold reduction of the deviation, */ /* hence we bisect the Bezier curve until the deviation */ - /* becomes less than 1/8th of a pixel. For more details */ + /* becomes less than 1/8 of a pixel. For more details */ /* check file `ftgrays.c`. */ num_splits = 1; while ( dx > ONE_PIXEL / 8 )