comparison libass/ass_render.c @ 23022:199a3c6f54e8

Make get_*_glyph return void.

23021:a81c390d4a22

static void free_render_context(void)
{
}

static int get_outline_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
{
	int error;
	glyph_hash_val_t* val;
	glyph_hash_key_t key;
	key.font = render_context.font;

		info->advance.y = val->advance.y;
	} else {
		glyph_hash_val_t v;
		info->glyph = ass_font_get_glyph(frame_context.ass_priv->fontconfig_priv, render_context.font, symbol);
		if (!info->glyph)
			return 0;
		info->advance.x = d16_to_d6(info->glyph->advance.x);
		info->advance.y = d16_to_d6(info->glyph->advance.y);
		FT_Glyph_Get_CBox( info->glyph, FT_GLYPH_BBOX_PIXELS, &info->bbox);

		FT_Glyph_Copy(info->glyph, &v.glyph);

		error = FT_Glyph_StrokeBorder( &(info->outline_glyph), render_context.stroker, 0 , 0 ); // don't destroy original
		if (error) {
			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FT_Glyph_Stroke_Error, error);
		}
	}
	return 0;
}

/**
 * \brief Get normal and outline glyphs from cache (if possible) or font face
 * \param index face glyph index
 * \param symbol ucs4 char
 * \param info out: struct filled with extracted data
 * \param advance advance vector of the extracted glyph
 * \return 0 on success
 */
static int get_bitmap_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
{
	int error;
	bitmap_hash_val_t* val;
	bitmap_hash_key_t* key = &(info->hash_key);
	
	key->font = render_context.font;
	key->size = render_context.font_size;

		info->bbox = val->bbox_scaled;
		info->advance.x = val->advance.x;
		info->advance.y = val->advance.y;
	} else
		info->bm = info->bm_o = info->bm_s = 0;

	return 0;
}

/**
 * This function goes through text_info and calculates text parameters.
 * The following text_info fields are filled:

			matrix.yy = (FT_Fixed)( render_context.scale_y * 0x10000L );

			ass_font_set_transform(render_context.font, &matrix, &shift );
		}

		error = get_outline_glyph(code, text_info.glyphs + text_info.length, &shift);
		error |= get_bitmap_glyph(code, text_info.glyphs + text_info.length, &shift);

		if (error) {
			continue;
		}
		
		text_info.glyphs[text_info.length].pos.x = pen.x >> 6;
		text_info.glyphs[text_info.length].pos.y = pen.y >> 6;
		
		pen.x += text_info.glyphs[text_info.length].advance.x;

23022:199a3c6f54e8

static void free_render_context(void)
{
}

static void get_outline_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
{
	int error;
	glyph_hash_val_t* val;
	glyph_hash_key_t key;
	key.font = render_context.font;

		info->advance.y = val->advance.y;
	} else {
		glyph_hash_val_t v;
		info->glyph = ass_font_get_glyph(frame_context.ass_priv->fontconfig_priv, render_context.font, symbol);
		if (!info->glyph)
			return;
		info->advance.x = d16_to_d6(info->glyph->advance.x);
		info->advance.y = d16_to_d6(info->glyph->advance.y);
		FT_Glyph_Get_CBox( info->glyph, FT_GLYPH_BBOX_PIXELS, &info->bbox);

		FT_Glyph_Copy(info->glyph, &v.glyph);

		error = FT_Glyph_StrokeBorder( &(info->outline_glyph), render_context.stroker, 0 , 0 ); // don't destroy original
		if (error) {
			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FT_Glyph_Stroke_Error, error);
		}
	}
}

/**
 * \brief Get normal and outline glyphs from cache (if possible) or font face
 * \param index face glyph index
 * \param symbol ucs4 char
 * \param info out: struct filled with extracted data
 * \param advance advance vector of the extracted glyph
 * \return 0 on success
 */
static void get_bitmap_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
{
	bitmap_hash_val_t* val;
	bitmap_hash_key_t* key = &(info->hash_key);
	
	key->font = render_context.font;
	key->size = render_context.font_size;

		info->bbox = val->bbox_scaled;
		info->advance.x = val->advance.x;
		info->advance.y = val->advance.y;
	} else
		info->bm = info->bm_o = info->bm_s = 0;
}

/**
 * This function goes through text_info and calculates text parameters.
 * The following text_info fields are filled:

			matrix.yy = (FT_Fixed)( render_context.scale_y * 0x10000L );

			ass_font_set_transform(render_context.font, &matrix, &shift );
		}

		get_outline_glyph(code, text_info.glyphs + text_info.length, &shift);
		get_bitmap_glyph(code, text_info.glyphs + text_info.length, &shift);
		
		text_info.glyphs[text_info.length].pos.x = pen.x >> 6;
		text_info.glyphs[text_info.length].pos.y = pen.y >> 6;
		
		pen.x += text_info.glyphs[text_info.length].advance.x;