Attachment #82315 for bug #126458

View | Details | Raw Unified | Return to bug 126458
Collapse All | Expand All

Lines 696-702 Link Here

(-)src.orig/font.c (-2 lines)
696	{	696	{
697	GpFont *src_font;	697	GpFont *src_font;
698	GpFont *result;	698	GpFont *result;
699	cairo_font_face_t *face;
700	cairo_font_slant_t slant;	699	cairo_font_slant_t slant;
701	cairo_font_weight_t weight;	700	cairo_font_weight_t weight;
702		701
Lines 769-775 Link Here
769	gdip_create_font_from_logfont(void hdc, void lf, GpFont **font, bool ucs2)	768	gdip_create_font_from_logfont(void hdc, void lf, GpFont **font, bool ucs2)
770	{	769	{
771	GpFont *result;	770	GpFont *result;
772	cairo_font_face_t *face;
773	cairo_font_slant_t slant;	771	cairo_font_slant_t slant;
774	cairo_font_weight_t weight;	772	cairo_font_weight_t weight;
775	LOGFONTA *logfont;	773	LOGFONTA *logfont;




		return Ok;


	float			FontSize;

	/* Sanity; should we check for length==0? */
	if (!graphics || !stringUnicode || !font) {

GpStatus 
GdipGetRenderingOrigin (GpGraphics *graphics, int *x, int *y)
{
        double cx, cy;
	g_return_val_if_fail (graphics != NULL, InvalidParameter);
	g_return_val_if_fail (x != NULL, InvalidParameter);
	g_return_val_if_fail (y != NULL, InvalidParameter);

		gdip_plot_path (graphics, graphics->clip->path, graphics->aa_offset_x, graphics->aa_offset_y);
		break;
	default:
		g_warning ("Unknown region type %d", (int)graphics->clip);
		break;
	}
	




{
	cairo_surface_t *original;
	cairo_surface_t *texture;
	cairo_pattern_t *pat;
	GpRect *rect = brush->rectangle;

	g_return_val_if_fail (rect != NULL, InvalidParameter);

{
	cairo_surface_t *original;
	cairo_surface_t *texture;
	cairo_pattern_t *pat;
	cairo_matrix_t tempMatrix;
	GpRect *rect = brush->rectangle;
	g_return_val_if_fail (rect != NULL, InvalidParameter);

{
	cairo_surface_t *original;
	cairo_surface_t *texture;
	cairo_pattern_t *pat;
	GpMatrix tempMatrix;
	GpRect *rect = brush->rectangle;
	g_return_val_if_fail (rect != NULL, InvalidParameter);

{
	cairo_surface_t *original;
	cairo_surface_t *texture;
	cairo_pattern_t *pat;
	GpMatrix tempMatrix;
	GpRect *rect = brush->rectangle;
	g_return_val_if_fail (rect != NULL, InvalidParameter);

	cairo_t *ct;
	cairo_pattern_t *pattern;
	GpTexture *texture;
	GpImage *img;
	GpBitmap *bmp;
	cairo_format_t format;
	GpMatrix *product = NULL;
	unsigned int width;

Return to bug 126458

Lines 3372-3378 Link Here

(-)src.orig/graphics.c (-3 / +1 lines)
3372	return Ok;	3372	return Ok;
3373		3373
3374		3374
3375	float FontSize;
3376		3375
3377	/* Sanity; should we check for length==0? */	3376	/* Sanity; should we check for length==0? */
3378	if (!graphics \|\| !stringUnicode \|\| !font) {	3377	if (!graphics \|\| !stringUnicode \|\| !font) {
Lines 3455-3461 Link Here
3455	GpStatus	3454	GpStatus
3456	GdipGetRenderingOrigin (GpGraphics graphics, int x, int *y)	3455	GdipGetRenderingOrigin (GpGraphics graphics, int x, int *y)
3457	{	3456	{
3458	double cx, cy;
3459	g_return_val_if_fail (graphics != NULL, InvalidParameter);	3457	g_return_val_if_fail (graphics != NULL, InvalidParameter);
3460	g_return_val_if_fail (x != NULL, InvalidParameter);	3458	g_return_val_if_fail (x != NULL, InvalidParameter);
3461	g_return_val_if_fail (y != NULL, InvalidParameter);	3459	g_return_val_if_fail (y != NULL, InvalidParameter);
Lines 3698-3704 Link Here
3698	gdip_plot_path (graphics, graphics->clip->path, graphics->aa_offset_x, graphics->aa_offset_y);	3696	gdip_plot_path (graphics, graphics->clip->path, graphics->aa_offset_x, graphics->aa_offset_y);
3699	break;	3697	break;
3700	default:	3698	default:
3701	g_warning ("Unknown region type %d", graphics->clip);	3699	g_warning ("Unknown region type %d", (int)graphics->clip);
3702	break;	3700	break;
3703	}	3701	}
3704		3702

Lines 70-76 Link Here

(-)src.orig/texturebrush.c (-6 / +6 lines)
70	{	70	{
71	cairo_surface_t *original;	71	cairo_surface_t *original;
72	cairo_surface_t *texture;	72	cairo_surface_t *texture;
73	cairo_pattern_t pat, pattern;	73	cairo_pattern_t *pat;
74	GpRect *rect = brush->rectangle;	74	GpRect *rect = brush->rectangle;
75		75
76	g_return_val_if_fail (rect != NULL, InvalidParameter);	76	g_return_val_if_fail (rect != NULL, InvalidParameter);
Lines 114-120 Link Here
114	{	114	{
115	cairo_surface_t *original;	115	cairo_surface_t *original;
116	cairo_surface_t *texture;	116	cairo_surface_t *texture;
117	cairo_pattern_t pat, pattern;	117	cairo_pattern_t *pat;
118	cairo_matrix_t tempMatrix;	118	cairo_matrix_t tempMatrix;
119	GpRect *rect = brush->rectangle;	119	GpRect *rect = brush->rectangle;
120	g_return_val_if_fail (rect != NULL, InvalidParameter);	120	g_return_val_if_fail (rect != NULL, InvalidParameter);
Lines 173-179 Link Here
173	{	173	{
174	cairo_surface_t *original;	174	cairo_surface_t *original;
175	cairo_surface_t *texture;	175	cairo_surface_t *texture;
176	cairo_pattern_t pat, pattern;	176	cairo_pattern_t *pat;
177	GpMatrix tempMatrix;	177	GpMatrix tempMatrix;
178	GpRect *rect = brush->rectangle;	178	GpRect *rect = brush->rectangle;
179	g_return_val_if_fail (rect != NULL, InvalidParameter);	179	g_return_val_if_fail (rect != NULL, InvalidParameter);
Lines 232-238 Link Here
232	{	232	{
233	cairo_surface_t *original;	233	cairo_surface_t *original;
234	cairo_surface_t *texture;	234	cairo_surface_t *texture;
235	cairo_pattern_t pat, pattern;	235	cairo_pattern_t *pat;
236	GpMatrix tempMatrix;	236	GpMatrix tempMatrix;
237	GpRect *rect = brush->rectangle;	237	GpRect *rect = brush->rectangle;
238	g_return_val_if_fail (rect != NULL, InvalidParameter);	238	g_return_val_if_fail (rect != NULL, InvalidParameter);
Lines 361-368 Link Here
361	cairo_t *ct;	361	cairo_t *ct;
362	cairo_pattern_t *pattern;	362	cairo_pattern_t *pattern;
363	GpTexture *texture;	363	GpTexture *texture;
364	GpImage img, gr_img;	364	GpImage *img;
365	GpBitmap bmp, gr_bmp;	365	GpBitmap *bmp;
366	cairo_format_t format;	366	cairo_format_t format;
367	GpMatrix *product = NULL;	367	GpMatrix *product = NULL;
368	unsigned int width;	368	unsigned int width;