summaryrefslogtreecommitdiff
path: root/src/lib/evas/common/evas_font_main.c
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2018-08-30 13:46:41 +0900
committerHermet Park <hermetpark@gmail.com>2018-08-30 13:47:27 +0900
commit3862b304b0396e7ba918ae5f9407209fe3165e5e (patch)
treefbd4a2bad138ad1e01cb1fafce0aeb5ef7d1d0c8 /src/lib/evas/common/evas_font_main.c
parentd05ddaba62ab25f59b23dd05bef57011b18cb362 (diff)
evas-common: Remove cserve2 support
ref T7226 Depends on D6934
Diffstat (limited to '')
-rw-r--r--src/lib/evas/common/evas_font_main.c45
1 files changed, 1 insertions, 44 deletions
diff --git a/src/lib/evas/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c
index 39ca7624bc..b99df9a927 100644
--- a/src/lib/evas/common/evas_font_main.c
+++ b/src/lib/evas/common/evas_font_main.c
@@ -1,10 +1,6 @@
1#include "evas_font_private.h" 1#include "evas_font_private.h"
2#include "evas_font_draw.h" 2#include "evas_font_draw.h"
3 3
4#ifdef EVAS_CSERVE2
5# include "../cserve2/evas_cs2_private.h"
6#endif
7
8#include FT_OUTLINE_H 4#include FT_OUTLINE_H
9#include FT_SYNTHESIS_H 5#include FT_SYNTHESIS_H
10#include FT_BITMAP_H 6#include FT_BITMAP_H
@@ -535,24 +531,7 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt idx)
535 fg = _fash_gl_find(fi->fash, idx); 531 fg = _fash_gl_find(fi->fash, idx);
536 if (fg == (void *)(-1)) return NULL; 532 if (fg == (void *)(-1)) return NULL;
537 else if (fg) 533 else if (fg)
538 { 534 return fg;
539#ifdef EVAS_CSERVE2
540 if (fi->cs2_handler)
541 {
542 if (evas_cserve2_font_glyph_used(fi->cs2_handler, idx,
543 fi->hinting))
544 return fg;
545 else
546 {
547 _glyph_free(fg);
548 _fash_gl_add(fi->fash, idx, NULL);
549 }
550 }
551 else return fg;
552#else
553 return fg;
554#endif
555 }
556 } 535 }
557// fg = eina_hash_find(fi->glyphs, &hindex); 536// fg = eina_hash_find(fi->glyphs, &hindex);
558// if (fg) return fg; 537// if (fg) return fg;
@@ -623,11 +602,6 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt idx)
623 if (!fi->fash) fi->fash = _fash_gl_new(); 602 if (!fi->fash) fi->fash = _fash_gl_new();
624 if (fi->fash) _fash_gl_add(fi->fash, idx, fg); 603 if (fi->fash) _fash_gl_add(fi->fash, idx, fg);
625 604
626#ifdef EVAS_CSERVE2
627 if (fi->cs2_handler)
628 evas_cserve2_font_glyph_request(fi->cs2_handler, idx, fi->hinting);
629#endif
630
631// eina_hash_direct_add(fi->glyphs, &fg->index, fg); 605// eina_hash_direct_add(fi->glyphs, &fg->index, fg);
632 return fg; 606 return fg;
633} 607}
@@ -640,23 +614,6 @@ evas_common_font_int_cache_glyph_render(RGBA_Font_Glyph *fg)
640 RGBA_Font_Int *fi = fg->fi; 614 RGBA_Font_Int *fi = fg->fi;
641 FT_BitmapGlyph fbg; 615 FT_BitmapGlyph fbg;
642 616
643#ifdef EVAS_CSERVE2
644 if (fi->cs2_handler)
645 {
646 fg->glyph_out = evas_cserve2_font_glyph_bitmap_get(fi->cs2_handler,
647 fg->index,
648 fg->fi->hinting);
649 if (!fg->glyph_out)
650 {
651 if (!fi->fash) fi->fash = _fash_gl_new();
652 if (fi->fash) _fash_gl_add(fi->fash, fg->index, (void *)(-1));
653 free(fg);
654 return EINA_FALSE;
655 }
656 return EINA_TRUE;
657 }
658#endif
659
660 /* no cserve2 case */ 617 /* no cserve2 case */
661 if (fg->glyph_out) 618 if (fg->glyph_out)
662 return EINA_TRUE; 619 return EINA_TRUE;