summaryrefslogtreecommitdiff
path: root/src/lib/evas/common
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-03-20 10:49:49 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-03-20 10:49:49 +0900
commit377e94263b6b5e4733aebce170fdcb96bc7ad127 (patch)
treee6fffdc301fd71a879ad7016c583ae0db71a329a /src/lib/evas/common
parent57bdbf6793fc8131b7e312598fec653bb16cecfa (diff)
evas - font - new color bitmap support - rename funcs to match file
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r--src/lib/evas/common/evas_font_draw.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/evas/common/evas_font_draw.c b/src/lib/evas/common/evas_font_draw.c
index 367b8cd..90b2b4c 100644
--- a/src/lib/evas/common/evas_font_draw.c
+++ b/src/lib/evas/common/evas_font_draw.c
@@ -24,7 +24,7 @@ evas_common_font_draw_init(void)
24} 24}
25 25
26static void * 26static void *
27_software_generic_image_new_from_data(int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace) 27_evas_font_image_new_from_data(int w, int h, DATA32 *image_data, int alpha, Evas_Colorspace cspace)
28{ 28{
29#ifdef EVAS_CSERVE2 29#ifdef EVAS_CSERVE2
30 if (evas_cserve2_use_get()) 30 if (evas_cserve2_use_get())
@@ -37,7 +37,7 @@ _software_generic_image_new_from_data(int w, int h, DATA32 *image_data, int alph
37} 37}
38 38
39static void 39static void
40_software_generic_image_free(void *image) 40_evas_font_image_free(void *image)
41{ 41{
42#ifdef EVAS_CSERVE2 42#ifdef EVAS_CSERVE2
43 if (evas_cserve2_use_get() && evas_cache2_image_cached(image)) 43 if (evas_cserve2_use_get() && evas_cache2_image_cached(image))
@@ -50,7 +50,7 @@ _software_generic_image_free(void *image)
50} 50}
51 51
52static void 52static void
53_software_generic_image_draw(void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth) 53_evas_font_image_draw(void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth)
54{ 54{
55 RGBA_Image *im; 55 RGBA_Image *im;
56 56
@@ -135,11 +135,11 @@ evas_common_font_rgba_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y,
135 } 135 }
136 else 136 else
137 { 137 {
138 fg->ext_dat = _software_generic_image_new_from_data(w, h, 138 fg->ext_dat = _evas_font_image_new_from_data(w, h,
139 (DATA32 *)fg->glyph_out->bitmap.buffer, 139 (DATA32 *)fg->glyph_out->bitmap.buffer,
140 EINA_TRUE, 140 EINA_TRUE,
141 EVAS_COLORSPACE_ARGB8888); 141 EVAS_COLORSPACE_ARGB8888);
142 fg->ext_dat_free = _software_generic_image_free; 142 fg->ext_dat_free = _evas_font_image_free;
143 } 143 }
144 } 144 }
145 145
@@ -175,7 +175,7 @@ evas_common_font_rgba_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y,
175 } 175 }
176 else 176 else
177 { 177 {
178 _software_generic_image_draw(dc, dst, 178 _evas_font_image_draw(dc, dst,
179 fg->ext_dat, 179 fg->ext_dat,
180 0, 0, w, h, 180 0, 0, w, h,
181 chr_x, y - (chr_y - y), w, h, 181 chr_x, y - (chr_y - y), w, h,