Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor fixes.

Browse Source
GSoC-2019-moazin
Moazin Khatti 6 years ago
parent d8202166c0
commit e028be97b8
15 changed files with 49 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      include/freetype/config/ftmodule.h
  2. 1
      include/freetype/freetype.h
  3. 4
      include/freetype/ftimage.h
  4. 2
      include/freetype/svgrenderer.h
  5. 19
      src/base/ftglyph.c
  6. 6
      src/base/ftobjs.c
  7. 6
      src/sfnt/sfobjs.c
  8. 11
      src/sfnt/ttsvg.c
  9. 2
      src/sfnt/ttsvg.h
  10. 21
      src/svg/ftsvg.c
  11. 2
      src/svg/ftsvg.h
  12. 2
      src/svg/module.mk
  13. 2
      src/svg/rules.mk
  14. 2
      src/svg/svg.c
  15. 2
      src/svg/svgtypes.c

3
include/freetype/config/ftmodule.h
Unescape View File

@ -22,8 +22,7 @@ FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
FT_USE_MODULE( FT_Module_Class, psaux_module_class )
FT_USE_MODULE( FT_Module_Class, psnames_module_class )
FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
FT_USE_MODULE( FT_Renderer_Class, ft_svg_renderer_class )
/*FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )*/
FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )

1
include/freetype/freetype.h
Unescape View File

@ -141,6 +141,7 @@ FT_BEGIN_HEADER
* FT_FACE_FLAG_GLYPH_NAMES
* FT_FACE_FLAG_EXTERNAL_STREAM
* FT_FACE_FLAG_HINTER
* FT_FACE_FLAG_SVG
*
* FT_HAS_HORIZONTAL
* FT_HAS_VERTICAL

4
include/freetype/ftimage.h
Unescape View File

@ -734,7 +734,7 @@ FT_BEGIN_HEADER
* but FreeType isn't currently capable of rendering them correctly.
*
* FT_GLYPH_FORMAT_SVG ::
* The glyph is inside an SVG documents in the SVG table.
* The glyph is represented by an SVG documents in the SVG table.
*
*/
typedef enum FT_Glyph_Format_
@ -757,7 +757,7 @@ FT_BEGIN_HEADER
#define ft_glyph_format_bitmap FT_GLYPH_FORMAT_BITMAP
#define ft_glyph_format_outline FT_GLYPH_FORMAT_OUTLINE
#define ft_glyph_format_plotter FT_GLYPH_FORMAT_PLOTTER
#define ft_glyph_format_svg FT_GLYPH_FROMAT_SVG
#define ft_glyph_format_svg FT_GLYPH_FORMAT_SVG
/*************************************************************************/

2
include/freetype/svgrenderer.h
Unescape View File

@ -5,7 +5,7 @@
* Interface for SVG Renderer Module (specification).
*
* Copyright (C) 2004-2019 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
* 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

19
src/base/ftglyph.c
Unescape View File

@ -289,12 +289,12 @@
ft_svg_glyph_init( FT_Glyph svg_glyph,
FT_GlyphSlot slot )
{
FT_SvgGlyph glyph = (FT_SvgGlyph)svg_glyph;
FT_Error error = FT_Err_Ok;
FT_Memory memory = FT_GLYPH( glyph )->library->memory;
FT_ULong doc_length;
FT_ULong doc_length;
FT_SVG_Document document;
FT_SvgGlyph glyph = (FT_SvgGlyph)svg_glyph;
FT_Error error = FT_Err_Ok;
FT_Memory memory = FT_GLYPH( glyph )->library->memory;
if ( slot->format != FT_GLYPH_FORMAT_SVG )
{
@ -316,13 +316,13 @@
goto Exit;
}
/* init the parent first */
slot->format = FT_GLYPH_FORMAT_OUTLINE;
/* let's init the parent first */
ft_outline_glyph_class.glyph_init( svg_glyph, slot );
slot->format = FT_GLYPH_FORMAT_SVG;
/* allocate a new document */
doc_length = document->svg_document_length;
doc_length = document->svg_document_length;
glyph->svg_document = memory->alloc( memory, doc_length );
glyph->svg_document_length = doc_length;
glyph->glyph_index = slot->glyph_index;
@ -420,9 +420,10 @@
document->start_glyph_id = glyph->start_glyph_id;
document->end_glyph_id = glyph->end_glyph_id;
slot->format = FT_GLYPH_FORMAT_SVG;
slot->format = FT_GLYPH_FORMAT_SVG;
slot->glyph_index = glyph->glyph_index;
slot->other = document;
slot->other = document;
return error;
}

6
src/base/ftobjs.c
Unescape View File

@ -5604,7 +5604,13 @@
FT_Module renderer;
SVG_Renderer_Interface *svg;
/* TODO: (OT-SVG) Handle the case if the module is not found */
renderer = FT_Get_Module( library, "ot-svg" );
/* If ot-svg module is not available return with error */
if ( renderer == 0 )
return FT_THROW( Missing_Module );
svg = (SVG_Renderer_Interface*)renderer->clazz->module_interface;
svg->set_hooks(renderer, init_hook, free_hook, render_hook);
return FT_Err_Ok;

6
src/sfnt/sfobjs.c
Unescape View File

@ -751,7 +751,7 @@
FT_Bool is_apple_sbix;
FT_Bool has_CBLC;
FT_Bool has_CBDT;
FT_Bool has_SVG = FALSE; /* For OpenType SVG fonts */
FT_Bool has_SVG = FALSE; /* for OT-SVG */
FT_Bool ignore_typographic_family = FALSE;
FT_Bool ignore_typographic_subfamily = FALSE;
@ -955,8 +955,8 @@
}
/* opentype svg colored glyph support */
/* no If statement because the function always exists for now */
LOAD_( svg );
/* no If statement because the function always exists for now */
LOAD_( svg );
if( face->svg )
has_SVG = TRUE;

11
src/sfnt/ttsvg.c
Unescape View File

@ -5,7 +5,7 @@
* OpenType SVG Color (specification).
*
* Copyright (C) 2018-2019 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
* 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
@ -112,8 +112,9 @@
{
FT_Memory memory = face->root.memory;
FT_Stream stream = face->root.stream;
Svg* svg = (Svg*) face->svg;
Svg* svg = (Svg*) face->svg;
if( svg )
{
FT_FRAME_RELEASE( svg->table );
@ -246,8 +247,10 @@
svg_document->end_glyph_id = end_glyph_id;
glyph->other = svg_document;
glyph->metrics.horiAdvance *= ((float)glyph->face->size->metrics.x_ppem)/((float)glyph->face->units_per_EM) * 64.0;
glyph->metrics.vertAdvance *= ((float)glyph->face->size->metrics.y_ppem)/((float)glyph->face->units_per_EM) * 64.0;
glyph->metrics.horiAdvance *= ((float)glyph->face->size->metrics.x_ppem)/
((float)glyph->face->units_per_EM) * 64.0;
glyph->metrics.vertAdvance *= ((float)glyph->face->size->metrics.y_ppem)/
((float)glyph->face->units_per_EM) * 64.0;
return FT_Err_Ok;
}

2
src/sfnt/ttsvg.h
Unescape View File

@ -5,7 +5,7 @@
* OpenType SVG Color (specification).
*
* Copyright (C) 2018-2019 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
* 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

21
src/svg/ftsvg.c
Unescape View File

@ -5,7 +5,7 @@
* The FreeType svg renderer interface (body).
*
* Copyright (C) 1996-2019 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
* 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
@ -37,7 +37,9 @@
static FT_Error
ft_svg_init( SVG_Renderer svg_module )
{
FT_Error error = FT_Err_Ok;
FT_Error error = FT_Err_Ok;
svg_module->loaded = FALSE;
return error;
}
@ -48,26 +50,27 @@
FT_Render_Mode mode,
const FT_Vector* origin )
{
SVG_Renderer renderer_ = (SVG_Renderer)renderer;
SVG_Renderer svg_renderer = (SVG_Renderer)renderer;
if( renderer_->loaded == FALSE )
if( svg_renderer->loaded == FALSE )
{
renderer_->loaded = TRUE;
renderer_->hooks.svg_lib_init();
svg_renderer->loaded = TRUE;
svg_renderer->hooks.svg_lib_init();
}
return renderer_->hooks.svg_lib_render( slot );
return svg_renderer->hooks.svg_lib_render( slot );
}
static FT_Error
ft_svg_set_hooks( FT_Module renderer_,
ft_svg_set_hooks( FT_Module module,
SVG_Lib_Init init_hook,
SVG_Lib_Free free_hook,
SVG_Lib_Render render_hook )
{
SVG_Renderer renderer;
renderer = (SVG_Renderer)renderer_;
renderer = (SVG_Renderer)module;
renderer->hooks.svg_lib_init = init_hook;
renderer->hooks.svg_lib_free = free_hook;
renderer->hooks.svg_lib_render = render_hook;

2
src/svg/ftsvg.h
Unescape View File

@ -5,7 +5,7 @@
* The FreeType svg renderer interface (specification).
*
* Copyright (C) 1996-2019 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
* 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

2
src/svg/module.mk
Unescape View File

@ -4,7 +4,7 @@
# Copyright (C) 1996-2019 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
# 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 license,

2
src/svg/rules.mk
Unescape View File

@ -4,7 +4,7 @@
# Copyright (C) 1996-2019 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
# 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 license,

2
src/svg/svg.c
Unescape View File

@ -5,7 +5,7 @@
* FreeType svg renderer module component (body only).
*
* Copyright (C) 1996-2019 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
* 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

2
src/svg/svgtypes.c
Unescape View File

@ -6,7 +6,7 @@
* The FreeType svg renderer internal types (specification).
*
* Copyright (C) 1996-2019 by
* David Turner, Robert Wilhelm, and Werner Lemberg.
* 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

Write Preview
Loading…
Cancel
Save