[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] wl/freetype-demos-support-ot-svg-glyphs-new cb03156: M
|
From: |
Werner Lemberg |
|
Subject: |
[freetype2-demos] wl/freetype-demos-support-ot-svg-glyphs-new cb03156: More corrections, reformulations, formatting. |
|
Date: |
Tue, 4 Jan 2022 06:15:48 -0500 (EST) |
branch: wl/freetype-demos-support-ot-svg-glyphs-new
commit cb031560f3b3632dcb9fc427c12c1998adb94938
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>
More corrections, reformulations, formatting.
Problematic spots are marked with 'XXX'.
---
src/ftcommon.c | 13 +-
src/rsvg-port.c | 392 +++++++++++++++++++++++++++++---------------------------
src/rsvg-port.h | 43 ++++---
3 files changed, 239 insertions(+), 209 deletions(-)
diff --git a/src/ftcommon.c b/src/ftcommon.c
index a9929a4..fe5946e 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -29,7 +29,6 @@
#include FT_FONT_FORMATS_H
#include FT_OTSVG_H
-#include <rsvg-port.h>
/* error messages */
#undef FTERRORS_H_
@@ -40,6 +39,7 @@
#include "common.h"
#include "strbuf.h"
#include "ftcommon.h"
+#include "rsvg-port.h"
#include <stdio.h>
#include <stdlib.h>
@@ -340,10 +340,12 @@
{
FTDemo_Handle* handle;
- SVG_RendererHooks hooks = {(SVG_Lib_Init_Func)rsvg_port_init,
- (SVG_Lib_Free_Func)rsvg_port_free,
- (SVG_Lib_Render_Func)rsvg_port_render,
-
(SVG_Lib_Preset_Slot_Func)rsvg_port_preset_slot};
+ SVG_RendererHooks hooks = {
+ (SVG_Lib_Init_Func)rsvg_port_init,
+ (SVG_Lib_Free_Func)rsvg_port_free,
+ (SVG_Lib_Render_Func)rsvg_port_render,
+ (SVG_Lib_Preset_Slot_Func)rsvg_port_preset_slot };
+
handle = (FTDemo_Handle *)malloc( sizeof ( FTDemo_Handle ) );
if ( !handle )
@@ -355,6 +357,7 @@
if ( error )
PanicZ( "could not initialize FreeType" );
+ /* XXX error handling? */
FT_Property_Set( handle->library, "ot-svg", "svg_hooks", &hooks );
error = FTC_Manager_New( handle->library, 0, 0, 0,
diff --git a/src/rsvg-port.c b/src/rsvg-port.c
index 5bfbdf1..85cbc90 100644
--- a/src/rsvg-port.c
+++ b/src/rsvg-port.c
@@ -2,11 +2,11 @@
*
* rsvg-port.c
*
- * Librsvg based hook functions for OT-SVG rendering in FreeType.
- * (implementation)
+ * Librsvg-based hook functions for OT-SVG rendering in FreeType
+ * (implementation).
*
- * Copyright (C) 1996-2021 by
- * David Turner, Robert Wilhelm, Werner Lemberg and Moazin Khatti.
+ * Copyright (C) 2021 by
+ * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
*
* This file is part of the FreeType project, and may only be used,
* modified, and distributed under the terms of the FreeType project
@@ -18,19 +18,21 @@
#include <cairo.h>
#include <librsvg/rsvg.h>
-#include <rsvg-port.h>
-#include <ft2build.h>
#include <stdlib.h>
#include <math.h>
+
+#include <ft2build.h>
#include <freetype/freetype.h>
#include <freetype/ftbbox.h>
#include <freetype/otsvg.h>
+#include "rsvg-port.h"
- /**
- * The init hook is called when the first OT-SVG glyph is rendered.
- * All we do is allocate an internal state structure and set the pointer
- * in `library->svg_renderer_state`. This state structure becomes very
+
+ /*
+ * The init hook is called when the first OT-SVG glyph is rendered. All
+ * we do is to allocate an internal state structure and set the pointer in
+ * `library->svg_renderer_state`. This state structure becomes very
* useful to cache some of the results obtained by one hook function that
* the other one might use.
*/
@@ -38,48 +40,49 @@
rsvg_port_init( FT_Pointer *state )
{
/* allocate the memory upon initialization */
- *state = malloc( sizeof( Rsvg_Port_StateRec ) );
+ *state = malloc( sizeof( Rsvg_Port_StateRec ) ); /* XXX error handling */
+
return FT_Err_Ok;
}
- /**
- * Freeing up the state structure.
+ /*
+ * Deallocate the state structure.
*/
void
- rsvg_port_free( FT_Pointer *state)
+ rsvg_port_free( FT_Pointer *state )
{
- /* free the memory of the state structure */
free( *state );
}
- /**
- * The render hook that's called to render. The job of this hook is to
- * simply render the glyph in the buffer that has been allocated on
- * the FreeType side. Here we simply use the recording surface by playing
- * it back against the surface.
+
+ /*
+ * The render hook. The job of this hook is to simply render the glyph in
+ * the buffer that has been allocated on the FreeType side. Here we
+ * simply use the recording surface by playing it back against the
+ * surface.
*/
FT_Error
- rsvg_port_render( FT_GlyphSlot slot,
- FT_Pointer * _state )
+ rsvg_port_render( FT_GlyphSlot slot,
+ FT_Pointer *_state )
{
- FT_Error error = FT_Err_Ok;
+ FT_Error error = FT_Err_Ok;
+
+ Rsvg_Port_State state;
+ cairo_status_t status;
+ cairo_t *cr;
+ cairo_surface_t *surface;
- Rsvg_Port_State state;
- cairo_status_t status;
- cairo_t *cr;
- cairo_surface_t *surface;
state = *(Rsvg_Port_State*)_state;
- /* create an image surface to store the rendered image, however,
- * don't allocate memory, instead use the space already provided
- * in `slot->bitmap.buffer'.
- */
+ /* Create an image surface to store the rendered image. However, */
+ /* don't allocate memory; instead use the space already provided in */
+ /* `slot->bitmap.buffer`. */
surface = cairo_image_surface_create_for_data( slot->bitmap.buffer,
CAIRO_FORMAT_ARGB32,
- slot->bitmap.width,
- slot->bitmap.rows,
+ (int)slot->bitmap.width,
+ (int)slot->bitmap.rows,
slot->bitmap.pitch );
status = cairo_surface_status( surface );
@@ -102,12 +105,13 @@
return FT_Err_Invalid_Outline;
}
- /* set a translate transform that translates the points in such
- * a way that we get a tight rendering with least redundant white
- * space */
- cairo_translate( cr, -1 * (state->x), -1 * (state->y) );
- /* replay from the recorded surface. Saves us from parsing the document
- * again and redoing this already done in the preset hook. */
+ /* Set a translate transform that translates the points in such a way */
+ /* that we get a tight rendering with least redundant white spac. */
+ cairo_translate( cr, -state->x, -state->y );
+
+ /* Replay from the recorded surface. This saves us from parsing the */
+ /* document again and redoing what was already done in the preset */
+ /* hook. */
cairo_set_source_surface( cr, state->rec_surface, 0.0, 0.0 );
cairo_paint( cr );
@@ -115,87 +119,88 @@
slot->bitmap.pixel_mode = FT_PIXEL_MODE_BGRA;
slot->bitmap.num_grays = 256;
- slot->format = FT_GLYPH_FORMAT_BITMAP;
+ slot->format = FT_GLYPH_FORMAT_BITMAP;
- /* clean everything */
+ /* Clean up everything. */
cairo_surface_destroy( surface );
cairo_destroy( cr );
cairo_surface_destroy( state->rec_surface );
+
return error;
}
- /**
+
+ /*
* This hook is called at two different locations. Firstly, it is called
- * when presetting the glyphslot when FT_Load_Glyph is called. Secondly,
- * it is called right before the render hook is called. When `cache` is
- * false, it's the former while when `cache` is true, it's the latter.
+ * when presetting the glyphslot when `FT_Load_Glyph` is called.
+ * Secondly, it is called right before the render hook is called. When
+ * `cache` is false, it is the former, when `cache` is true, it is the
+ * latter.
*
- * The job of this function is to preset the slot setting the width, height,
- * pitch, bitmap.left and bitmap.top. These are all necessary for
appropriate
- * memory allocation as well as ultimately compositing the glyph later on by
- * client applications.
+ * The job of this function is to preset the slot setting the width,
+ * height, pitch, `bitmap.left`, and `bitmap.top`. These are all
+ * necessary for appropriate memory allocation, as well as ultimately
+ * compositing the glyph later on by client applications.
*/
FT_Error
- rsvg_port_preset_slot( FT_GlyphSlot slot, FT_Bool cache, FT_Pointer
*_state )
+ rsvg_port_preset_slot( FT_GlyphSlot slot,
+ FT_Bool cache,
+ FT_Pointer *_state )
{
- /* FreeType variables */
- FT_Error error = FT_Err_Ok;
- FT_SVG_Document document = (FT_SVG_Document)slot->other;
- FT_Size_Metrics metrics = document->metrics;
- FT_UShort units_per_EM = document->units_per_EM;
- FT_UShort end_glyph_id = document->end_glyph_id;
- FT_UShort start_glyph_id = document->start_glyph_id;
-
- /* Librsvg variables */
- GError *gerror = NULL;
- gboolean ret;
- gboolean out_has_width;
- gboolean out_has_height;
- gboolean out_has_viewbox;
+ /* FreeType variables. */
+ FT_Error error = FT_Err_Ok;
+
+ FT_SVG_Document document = (FT_SVG_Document)slot->other;
+ FT_Size_Metrics metrics = document->metrics;
+
+ FT_UShort units_per_EM = document->units_per_EM;
+ FT_UShort end_glyph_id = document->end_glyph_id;
+ FT_UShort start_glyph_id = document->start_glyph_id;
+
+ /* Librsvg variables. */
+ GError *gerror = NULL;
+ gboolean ret;
+
+ gboolean out_has_width;
+ gboolean out_has_height;
+ gboolean out_has_viewbox;
+
RsvgHandle *handle;
RsvgLength out_width;
RsvgLength out_height;
RsvgRectangle out_viewbox;
RsvgDimensionData dimension_svg;
- cairo_t *rec_cr;
- cairo_matrix_t transform_matrix;
- /* Rendering port's state */
+ cairo_t *rec_cr;
+ cairo_matrix_t transform_matrix;
+
+ /* Rendering port's state. */
Rsvg_Port_State state;
Rsvg_Port_StateRec state_dummy;
- /* general variables */
- double x;
- double y;
- double xx;
- double xy;
- double yx;
- double yy;
- double x0;
- double y0;
- double width;
- double height;
- double x_svg_to_out;
- double y_svg_to_out;
-
- float metrics_width;
- float metrics_height;
- float horiBearingX;
- float horiBearingY;
- float vertBearingX;
- float vertBearingY;
- float vertical_advance;
-
- /* if cache is `TRUE` we store calculations in the actual port
- * state variable, otherwise we just create a dummy variable and
- * store there. This saves from too many if statements.
- */
+ /* General variables. */
+ double x, y;
+ double xx, xy, yx, yy;
+ double x0, y0;
+ double width, height;
+ double x_svg_to_out, y_svg_to_out;
+ double tmpd;
+
+ float metrics_width, metrics_height;
+ float horiBearingX, horiBearingY;
+ float vertBearingX, vertBearingY;
+ float tmpf;
+
+
+ /* If `cache` is `TRUE` we store calculations in the actual port */
+ /* state variable, otherwise we just create a dummy variable and */
+ /* store there. This saves us from too many 'if' statements. */
if ( cache )
state = *(Rsvg_Port_State*)_state;
else
state = &state_dummy;
- /* form an RsvgHandle by loading the SVG document */
+ /* Form an `RsvgHandle` by loading the SVG document. */
handle = rsvg_handle_new_from_data( document->svg_document,
document->svg_document_length,
&gerror );
@@ -205,7 +210,7 @@
goto CleanLibrsvg;
}
- /* get attributes like `viewBox` and `width/height`. */
+ /* Get attributes like `viewBox` and `width`/`height`. */
rsvg_handle_get_intrinsic_dimensions( handle,
&out_has_width,
&out_width,
@@ -214,70 +219,71 @@
&out_has_viewbox,
&out_viewbox );
- /**
+ /*
* Figure out the units in the EM square in the SVG document. This is
- * specified by the ViewBox or the width/height attributes, if present,
- * otherwise it should be assumed that the units in the EM square are
- * the same as in the TTF/CFF outlines.
+ * specified by the `ViewBox` or the `width`/`height` attributes, if
+ * present, otherwise it should be assumed that the units in the EM
+ * square are the same as in the TTF/CFF outlines.
*
* TODO: I'm not sure what the standard says about the situation if
- * the ViewBox as well as width/height are present, however, I've never
- * seen that situation in real fonts.
+ * `ViewBox` as well as `width`/`height` are present; however, I've
+ * never seen that situation in real fonts.
*/
if ( out_has_viewbox == TRUE )
{
- dimension_svg.width = out_viewbox.width;
- dimension_svg.height = out_viewbox.height;
+ dimension_svg.width = (int)out_viewbox.width; /* XXX rounding? */
+ dimension_svg.height = (int)out_viewbox.height;
}
- else if ( ( out_has_width == TRUE ) && ( out_has_height == TRUE ) )
+ else if ( out_has_width == TRUE && out_has_height == TRUE )
{
- dimension_svg.width = out_width.length;
- dimension_svg.height = out_height.length;
+ dimension_svg.width = (int)out_width.length; /* XXX rounding? */
+ dimension_svg.height = (int)out_height.length;
}
else
{
- /* if no `viewBox` and `width/height` are present, the `units_per_EM`
- * in SVG coordinates must be the same as `units_per_EM` of the TTF/CFF
- * outlines.
- */
+ /* If neither `ViewBox` nor `width`/`height` are present, the */
+ /* `units_per_EM` in SVG coordinates must be the same as */
+ /* `units_per_EM` of the TTF/CFF outlines. */
dimension_svg.width = units_per_EM;
dimension_svg.height = units_per_EM;
}
- /* scale factors from SVG coordinates to the output size needed */
- x_svg_to_out = (float)metrics.x_ppem/(float)dimension_svg.width;
- y_svg_to_out = (float)metrics.y_ppem/(float)dimension_svg.height;
+ /* Scale factors from SVG coordinates to the needed output size. */
+ x_svg_to_out = (float)metrics.x_ppem / dimension_svg.width;
+ y_svg_to_out = (float)metrics.y_ppem / dimension_svg.height;
- /* create a cairo recording surface. This is done for two reasons.
+ /*
+ * Create a cairo recording surface. This is done for two reasons.
* Firstly, it is required to get the bounding box of the final drawing
- * so we can use appropriate translate transform to get a tight rendering.
- * Secondly, if `cache` is true, we can save this surface and later
- * replay it against an image surface for the final rendering. This save
- * us from loading and parsing the document again.
+ * so we can use an appropriate translate transform to get a tight
+ * rendering. Secondly, if `cache` is true, we can save this surface
+ * and later replay it against an image surface for the final rendering.
+ * This saves us from loading and parsing the document again.
*/
- state->rec_surface = cairo_recording_surface_create(
CAIRO_CONTENT_COLOR_ALPHA,
- NULL );
+ state->rec_surface =
+ cairo_recording_surface_create( CAIRO_CONTENT_COLOR_ALPHA, NULL );
rec_cr = cairo_create( state->rec_surface );
-
- /* we need to take into account any transformations applied. The end
+ /*
+ * We need to take into account any transformations applied. The end
* user who applied the transformation doesn't know the internal details
* of the SVG document. Thus, we expect that the end user should just
- * write the transformation as if the glyph is a traditional one. We then,
- * do some maths on this to get the equivalent transformation in SVG
- * coordinates.
+ * write the transformation as if the glyph is a traditional one. We
+ * then do some maths on this to get the equivalent transformation in
+ * SVG coordinates.
*/
- xx = 1 * (((double)document->transform.xx)/((double)(1 << 16 )));
- xy = -1 * (((double)document->transform.xy)/((double)(1 << 16 )));
- yx = -1 * (((double)document->transform.yx)/((double)(1 << 16 )));
- yy = 1 * (((double)document->transform.yy)/((double)(1 << 16 )));
- x0 = 1 * ((double)document->delta.x/(double)(1 << 6)) *
- ((double)dimension_svg.width/(double)metrics.x_ppem);
- y0 = -1 * ((double)document->delta.y/(double)(1 << 6)) *
- ((double)dimension_svg.height/(double)metrics.y_ppem);
-
- /* cairo stores transformation and translate both in one matrix */
+ xx = (double)document->transform.xx / ( 1 << 16 );
+ xy = -(double)document->transform.xy / ( 1 << 16 );
+ yx = -(double)document->transform.yx / ( 1 << 16 );
+ yy = (double)document->transform.yy / ( 1 << 16 );
+
+ x0 = (double)document->delta.x / 64 *
+ dimension_svg.width / metrics.x_ppem;
+ y0 = -(double)document->delta.y / 64 *
+ dimension_svg.height / metrics.y_ppem;
+
+ /* Cairo stores both transformation and translation in one matrix. */
transform_matrix.xx = xx;
transform_matrix.yx = yx;
transform_matrix.xy = xy;
@@ -285,18 +291,18 @@
transform_matrix.x0 = x0;
transform_matrix.y0 = y0;
- /* set up a scale transfromation to scale up the document to the
- * required output size */
+ /* Set up a scale transformation to scale up the document to the */
+ /* required output size. */
cairo_scale( rec_cr, x_svg_to_out, y_svg_to_out );
- /* set up a transformation matrix */
+ /* Set up a transformation matrix. */
cairo_transform( rec_cr, &transform_matrix );
- /* if the document contains only one glyph, `start_glyph_id' and
- * `end_glyph_id' will have the same value, else, `end_glyph_id'
- * will be higher. */
+ /* If the document contains only one glyph, `start_glyph_id` and */
+ /* `end_glyph_id` have the same value. Otherwise `end_glyph_id` */
+ /* is larger. */
if ( start_glyph_id == end_glyph_id )
{
- /* render the whole document to the recording surface */
+ /* Render the whole document to the recording surface. */
ret = rsvg_handle_render_cairo ( handle, rec_cr );
if ( ret == FALSE )
{
@@ -306,16 +312,12 @@
}
else if ( start_glyph_id < end_glyph_id )
{
- int length;
- char* str;
-
- length = snprintf( NULL, 0, "%u", slot->glyph_index );
- str = (char*)malloc( 6 + length + 1 );
- strcpy( str, "#glyph");
- snprintf( str + 6, length + 1, "%u", slot->glyph_index );
- /* render only the element with `id' equal to `glyph<ID>' */
+ char str[32] = "#glyph";
+
+
+ /* Render only the element with its ID equal to `glyph<ID>`. */
+ sprintf( str + 6, "%u", slot->glyph_index );
ret = rsvg_handle_render_cairo_sub( handle, rec_cr, str );
- free(str);
if ( ret == FALSE )
{
error = FT_Err_Invalid_SVG_Document;
@@ -323,60 +325,76 @@
}
}
- /* get the bounding box of the drawing */
+ /* Get the bounding box of the drawing. */
cairo_recording_surface_ink_extents( state->rec_surface, &x, &y,
- &width, &height);
+ &width, &height );
- /* we store the bounding box's `x` and `y` so that the render hook
- * can apply a translation to get a tight rendering.
- */
+ /* We store the bounding box's `x` and `y` values so that the render */
+ /* hook can apply a translation to get a tight rendering. */
state->x = x;
state->y = y;
- /* preset the values */
- slot->bitmap_left = state->x ;
- slot->bitmap_top = (state->y) * -1;
- slot->bitmap.rows = ceil( height );
- slot->bitmap.width = ceil( width );
- slot->bitmap.pitch = slot->bitmap.width * 4;
+ /* Preset the values. */
+ slot->bitmap_left = (FT_Int) state->x; /* XXX rounding? */
+ slot->bitmap_top = (FT_Int)-state->y;
+
+ /* Do conversion in two steps to avoid 'bad function cast' warning. */
+ tmpd = ceil( height );
+ slot->bitmap.rows = (unsigned int)tmpd;
+ tmpd = ceil( width );
+ slot->bitmap.width = (unsigned int)tmpd;
+
+ slot->bitmap.pitch = (int)slot->bitmap.width * 4;
slot->bitmap.pixel_mode = FT_PIXEL_MODE_BGRA;
- /* let's compute all the bearings and set them correctly.
- * The outline is scaled already, we just need to use the
- * bounding box now.
- */
- metrics_width = width;
- metrics_height = height;
- horiBearingX = state->x;
- horiBearingY = state->y * -1;
- vertBearingX = (slot->metrics.horiBearingX / (1 << 6)) -
((slot->metrics.horiAdvance / (1 << 6)) / 2.0);
- vertBearingY = ((slot->metrics.vertAdvance / (1 << 6)) -
(slot->metrics.height / (1 << 6)))/2.0;
- slot->metrics.width = round(metrics_width * (1 << 6));
- slot->metrics.height = round(metrics_height * (1 << 6));
- slot->metrics.horiBearingX = horiBearingX * (1 << 6);
- slot->metrics.horiBearingY = horiBearingY * (1 << 6);
- slot->metrics.vertBearingX = vertBearingX * (1 << 6);
- slot->metrics.vertBearingY = vertBearingY * (1 << 6);
- if(slot->metrics.vertAdvance == 0)
- slot->metrics.vertAdvance = metrics_height * 1.2 * (1 << 6);
-
- /* if a render call is to follow, just destroy the context for the
- * recording surface, since no more drawing will be done on it, but,
- * keep the surface itself for use by the render hook.
- */
+ /* Compute all the bearings and set them correctly. The outline is */
+ /* scaled already, we just need to use the bounding box. */
+ metrics_width = (float)width;
+ metrics_height = (float)height;
+
+ horiBearingX = (float) state->x;
+ horiBearingY = (float)-state->y;
+
+ vertBearingX = slot->metrics.horiBearingX / 64.0f -
+ slot->metrics.horiAdvance / 64.0f / 2;
+ vertBearingY = ( slot->metrics.vertAdvance / 64.0f -
+ slot->metrics.height / 64.0f ) / 2; /* XXX parentheses
correct? */
+
+ /* Do conversion in two steps to avoid 'bad function cast' warning. */
+ tmpf = roundf( metrics_width * 64 );
+ slot->metrics.width = (FT_Pos)tmpf;
+ tmpf = roundf( metrics_height * 64 );
+ slot->metrics.height = (FT_Pos)tmpf;
+
+ slot->metrics.horiBearingX = (FT_Pos)( horiBearingX * 64 ); /* XXX
rounding? */
+ slot->metrics.horiBearingY = (FT_Pos)( horiBearingY * 64 );
+ slot->metrics.vertBearingX = (FT_Pos)( vertBearingX * 64 );
+ slot->metrics.vertBearingY = (FT_Pos)( vertBearingY * 64 );
+
+ if ( slot->metrics.vertAdvance == 0 )
+ slot->metrics.vertAdvance = (FT_Pos)( metrics_height * 1.2 * 64 );
+
+ /* If a render call is to follow, just destroy the context for the */
+ /* recording surface since no more drawing will be done on it. */
+ /* However, keep the surface itself for use by the render hook. */
if ( cache == TRUE )
{
cairo_destroy( rec_cr );
goto CleanLibrsvg;
}
- /* destroy the recording surface as well as the context */
+ /* Destroy the recording surface as well as the context. */
CleanCairo:
cairo_surface_destroy( state->rec_surface );
cairo_destroy( rec_cr );
+
CleanLibrsvg:
- /* destroy the handle */
+ /* Destroy the handle. */
g_object_unref( handle );
+
return error;
}
+
+
+/* End */
diff --git a/src/rsvg-port.h b/src/rsvg-port.h
index 7d3bcfb..f6cafd9 100644
--- a/src/rsvg-port.h
+++ b/src/rsvg-port.h
@@ -2,10 +2,11 @@
*
* rsvg-port.h
*
- * Librsvg based hook functions for OT-SVG rendering in FreeType. (headers)
+ * Librsvg based hook functions for OT-SVG rendering in FreeType
+ * (headers).
*
- * Copyright (C) 1996-2021 by
- * David Turner, Robert Wilhelm, Werner Lemberg and Moazin Khatti.
+ * Copyright (C) 2021 by
+ * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
*
* This file is part of the FreeType project, and may only be used,
* modified, and distributed under the terms of the FreeType project
@@ -23,32 +24,40 @@
#include <ft2build.h>
#include <freetype/freetype.h>
- /* Different hook functions can persist data by creating a state structure
- * and putting its address in `library->svg_renderer_state`. Functions can
- * store and retrieve data from this structure
+
+ /*
+ * Different hook functions can access persisting data by creating a state
+ * structure and putting its address in `library->svg_renderer_state`.
+ * Functions can then store and retrieve data from this structure.
*/
- typedef struct Rsvg_Port_StateRec_
+ typedef struct Rsvg_Port_StateRec_
{
- cairo_surface_t *rec_surface;
- double x;
- double y;
+ cairo_surface_t *rec_surface;
+
+ double x;
+ double y;
+
} Rsvg_Port_StateRec;
typedef struct Rsvg_Port_StateRec_* Rsvg_Port_State;
+
FT_Error
- rsvg_port_init( FT_Pointer *state);
+ rsvg_port_init( FT_Pointer *state );
void
- rsvg_port_free( FT_Pointer *state );
+ rsvg_port_free( FT_Pointer *state );
FT_Error
- rsvg_port_render( FT_GlyphSlot slot,
- FT_Pointer *state );
+ rsvg_port_render( FT_GlyphSlot slot,
+ FT_Pointer *state );
FT_Error
rsvg_port_preset_slot( FT_GlyphSlot slot,
- FT_Bool cache,
- FT_Pointer *state);
+ FT_Bool cache,
+ FT_Pointer *state );
+
+#endif /* RSVG_PORT_H */
+
-#endif
+/* End */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] wl/freetype-demos-support-ot-svg-glyphs-new cb03156: More corrections, reformulations, formatting.,
Werner Lemberg <=