diff src/shape_stext.c @ 473:ba64f928542b Android_Skia

Remove mbe_matrix_t type. The struct mbe_matrix_t is defined in a layout accoriding definition of Cairo. It is not feasible for all graphic engine. Now, we start supporting of other graphic engine; Skia, so use type of (co_aix[6]) defined and used by MadButterfly intead of mbe_matrix_t. And, bridges of graphic engines are responsible for translate matrics into the matrix type of the graphic enigne.
author Thinker K.F. Li <thinker@branda.to>
date Thu, 12 Nov 2009 21:32:58 +0800
parents e54cd19cec28
children 744c64eb3182
line wrap: on
line diff
--- a/src/shape_stext.c	Thu Nov 12 21:32:52 2009 +0800
+++ b/src/shape_stext.c	Thu Nov 12 21:32:58 2009 +0800
@@ -149,23 +149,13 @@
 mb_scaled_font_t *make_scaled_font_face_matrix(mb_font_face_t *face,
 					       co_aix *matrix) {
     mbe_scaled_font_t *scaled_font;
-    mbe_matrix_t font_matrix;
-    static mbe_matrix_t id = {
-	1, 0,
-	0, 1,
-	0, 0
-    };
+    static co_aix id[6] = { 1, 0, 0,
+			    0, 1, 0 };
     
     ASSERT(matrix != NULL);
     
-    font_matrix.xx = *matrix++;
-    font_matrix.xy = *matrix++;
-    font_matrix.x0 = *matrix++;
-    font_matrix.yx = *matrix++;
-    font_matrix.yy = *matrix++;
-    font_matrix.y0 = *matrix;
     scaled_font = mbe_scaled_font_create((mbe_font_face_t *)face,
-					 &font_matrix, &id);
+					 matrix, &id);
 
     return (mb_scaled_font_t *)scaled_font;
 }