FT_Size object to share a FT_Face object for several sizes (4fbe68e5) · Commits · Bernd Paysan / freetype-gl

texture-font.c

+47 −8

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		*/
		#include <ft2build.h>
		#include FT_FREETYPE_H
		#include FT_SIZES_H
		#include FT_STROKER_H
		// #include FT_ADVANCES_H
		#include FT_LCD_FILTER_H
		@@ -237,12 +238,12 @@ texture_font_set_size ( texture_font_t *self, float size )
		}
		}
		error = FT_Select_Size(self->face, best_match);
		self->scale = self->size / self->face->available_sizes[best_match].width;
		if(error) {
		freetype_error( error, "FT_Error (%s:%d, code 0x%02x) : %s\n",
		__FILENAME__, __LINE__, FT_Errors[error].code, FT_Errors[error].message);
		return 0;
		}
		self->scale = self->size / self->face->available_sizes[best_match].width;
		} else {
		/* Set char size */
		error = FT_Set_Char_Size(self->face, (int)(size * HRES), 0, DPI * HRES, DPI);
		@@ -411,6 +412,7 @@ texture_font_t *
		texture_font_clone( texture_font_t *old, float pt_size)
		{
		texture_font_t *self;
		FT_Error error = 0;

		self = calloc(1, sizeof(*self));
		if (!self) {
		@@ -421,6 +423,21 @@ texture_font_clone( texture_font_t *old, float pt_size)

		memcpy(self, old, sizeof(*self));
		self->glyphs = vector_new(sizeof(texture_glyph_t *));

		error = FT_New_Size( self->face, &self->ft_size );
		if(error) {
		freetype_error( error, "FT_Error (%s:%d, code 0x%02x) : %s\n",
		__FILENAME__, __LINE__, FT_Errors[error].code, FT_Errors[error].message);
		return NULL;
		}

		error = FT_Activate_Size( self->ft_size );
		if(error) {
		freetype_error( error, "FT_Error (%s:%d, code 0x%02x) : %s\n",
		__FILENAME__, __LINE__, FT_Errors[error].code, FT_Errors[error].message);
		return NULL;
		}

		if(!texture_font_set_size ( self, pt_size * 100.f ))
		return NULL;

		@@ -503,6 +520,20 @@ texture_font_load_face( texture_font_t *self, float size )
		goto cleanup_face;
		}

		error = FT_New_Size( self->face, &self->ft_size );
		if(error) {
		freetype_error( error, "FT_Error (%s:%d, code 0x%02x) : %s\n",
		__FILENAME__, __LINE__, FT_Errors[error].code, FT_Errors[error].message);
		goto cleanup_face;
		}

		error = FT_Activate_Size( self->ft_size );
		if(error) {
		freetype_error( error, "FT_Error (%s:%d, code 0x%02x) : %s\n",
		__FILENAME__, __LINE__, FT_Errors[error].code, FT_Errors[error].message);
		goto cleanup_face;
		}

		if(!texture_font_set_size ( self, size ))
		goto cleanup_face;
		}
		@@ -524,9 +555,16 @@ texture_font_delete( texture_font_t *self )
		{
		size_t i;
		texture_glyph_t *glyph;
		FT_Error error=0;

		assert( self );

		error = FT_Done_Size( self->ft_size );
		if(error) {
		freetype_error( error, "FT_Error (%s:%d, code 0x%02x) : %s\n",
		__FILENAME__, __LINE__, FT_Errors[error].code, FT_Errors[error].message);
		}

		texture_font_close( self, MODE_ALWAYS_OPEN, MODE_FREE_CLOSE );

		if(self->location == TEXTURE_FONT_FILE && self->filename)
		@@ -718,6 +756,13 @@ texture_font_load_glyph_gi( texture_font_t * self,
		#endif
		}

		error = FT_Activate_Size( self->ft_size );
		if(error) {
		freetype_error( error, "FT_Error (%s:%d, code 0x%02x) : %s\n",
		__FILENAME__, __LINE__, FT_Errors[error].code, FT_Errors[error].message);
		return 0;
		}

		error = FT_Load_Glyph( self->face, glyph_index, flags );
		if( error )
		{
		@@ -910,12 +955,6 @@ cleanup_stroker:
		glyph->s1 = x + tgt_w - 0.5;
		glyph->t1 = y + tgt_h - 0.5;
		}
		// Discard hinting to get advance
		FT_Load_Glyph( self->face, glyph_index,
		#ifdef FT_LOAD_COLOR
		((self->atlas->depth == 4) ? FT_LOAD_COLOR : 0) \|
		#endif
		FT_LOAD_RENDER \| FT_LOAD_NO_HINTING);
		slot = self->face->glyph;
		if( self->atlas->depth == 4 ) {
		// color fonts use actual pixels, not subpixels

texture-font.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,7 @@ texture_font_default_mode(font_mode_t mode);
		#if !defined(FT2BUILD_H_) && !defined(__FT2BUILD_H__) && !defined(FREETYPE_H_)
		typedef struct FT_FaceRec_* FT_Face;
		typedef struct FT_LibraryRec_* FT_Library;
		typedef struct fT_SizeRec_* FT_Size;
		#endif

		/* same for harfbuzz */
		@@ -393,6 +394,11 @@ typedef struct texture_font_t
		*/
		FT_Face face;

		/**
		* Freetype size pointer
		*/
		FT_Size ft_size;

		/**
		* Harfbuzz font pointer
		*/