Mercurial > MadButterfly

comparison tools/mb_c_source.m4 @ 356:3e84458968ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move mb_img_data_t out from argument list of rdman_shape_image_new(). - Application should specify content of sh_image_t by fill the shape with a paint_image_t.
author Thinker K.F. Li <thinker@branda.to>
date Mon, 09 Mar 2009 23:05:57 +0800
parents 700954870cee
children bf1addb037b7
comparison
equal deleted inserted replaced
355:958b67d911db 356:3e84458968ec
125 cairo_get_font_face(rdman->cr)); 125 cairo_get_font_face(rdman->cr));
126 rdman_add_shape(rdman, obj->$1, obj->$6); 126 rdman_add_shape(rdman, obj->$1, obj->$6);
127 ]]) 127 ]])
128 128
129 define([S_ADD_IMAGE],[[ 129 define([S_ADD_IMAGE],[[
130 obj->$1_img_data = MB_IMG_LDR_LOAD(img_ldr, "$2"); 130 obj->$1_paint_img = rdman_img_ldr_load_paint(rdman, "$2");
131 obj->$1 = rdman_shape_image_new(rdman, obj->$1_img_data, 131 obj->$1 = rdman_shape_image_new(rdman,
132 $3, $4, $5, $6); 132 $3, $4, $5, $6);
133 rdman_paint_fill(rdman, obj->$1_paint_img, obj->$1);
133 rdman_add_shape(rdman, obj->$1, obj->$7); 134 rdman_add_shape(rdman, obj->$1, obj->$7);
134 ]]) 135 ]])
135 define([S_PANGO_BEGIN_TEXT],[[ 136 define([S_PANGO_BEGIN_TEXT],[[
136 { 137 {
137 PangoAttribute *attr; 138 PangoAttribute *attr;
298 rdman_shape_free(rdman, obj->$1); 299 rdman_shape_free(rdman, obj->$1);
299 ]]) 300 ]])
300 301
301 define([F_ADD_IMAGE],[[ 302 define([F_ADD_IMAGE],[[
302 rdman_shape_free(rdman, obj->$1); 303 rdman_shape_free(rdman, obj->$1);
303 MB_IMG_DATA_FREE(obj->$1_img_data); 304 rdman_paint_free(rdman, obj->$1_paint_img);
304 ]]) 305 ]])
305 define([F_PANGO_BEGIN_TEXT],[[ 306 define([F_PANGO_BEGIN_TEXT],[[
306 rdman_shape_free(rdman, obj->$1); 307 rdman_shape_free(rdman, obj->$1);
307 ]]) 308 ]])
308 define([F_PANGO_SIZE],[[ 309 define([F_PANGO_SIZE],[[