mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-25 11:39:06 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Ugraded pango version

Browse Source 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1062 d0cd1f9f-072b-0410-8dd7-cf729c803f20
This commit is contained in:
theraysmith@gmail.com 2014-04-23 22:54:25 +00:00
parent fec775400d
commit cc47429587
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
training/pango_font_info.cpp
View File

@ -40,12 +40,7 @@
#include "tlog.h"
#include "unichar.h"
#include "util.h"
#include "pango/pango-context.h"
#include "pango/pango-font.h"
#include "pango/pango-glyph-item.h"
#include "pango/pango-glyph.h"
#include "pango/pango-layout.h"
#include "pango/pango-utils.h"
#include "pango/pango.h"
#include "pango/pangocairo.h"
#include "pango/pangofc-font.h"
@ -62,10 +57,6 @@ BOOL_PARAM_FLAG(fontconfig_refresh_cache, false,
BOOL_PARAM_FLAG(use_only_legacy_fonts, false,
"Overrides --fonts_dir and sets the known universe of fonts to"
"the list in legacy_fonts.h");
// Compatability with pango 1.20.
#include "pango/pango-glyph-item-private.h"
#define pango_glyph_item_iter_init_start _pango_glyph_item_iter_init_start
#define pango_glyph_item_iter_next_cluster _pango_glyph_item_iter_next_cluster
#else
using std::pair;
#endif
@ -354,7 +345,13 @@ bool PangoFontInfo::CanRenderString(const char* utf8_word, int len,
PangoFontMap* font_map = pango_cairo_font_map_get_default();
PangoContext* context = pango_context_new();
pango_context_set_font_map(context, font_map);
PangoLayout* layout = pango_layout_new(context);
PangoLayout* layout;
{ // Pango is not relasing the cached layout.
#ifndef USE_STD_NAMESPACE
DISABLE_HEAP_LEAK_CHECK;
#endif
layout = pango_layout_new(context);
}
if (desc_) {
pango_layout_set_font_description(layout, desc_);
} else {
@ -452,8 +449,21 @@ bool PangoFontInfo::CanRenderString(const char* utf8_word, int len,
// from the font_map, and then check what we loaded to see if it has the
// description we expected. If it is not, then the font is deemed unavailable.
/* static */
bool FontUtils::IsAvailableFont(const char* query_desc) {
PangoFontDescription *desc = pango_font_description_from_string(query_desc);
bool FontUtils::IsAvailableFont(const char* input_query_desc) {
string query_desc(input_query_desc);
if (PANGO_VERSION <= 12005) {
// Strip commas and any ' Medium' substring in the name.
query_desc.erase(std::remove(query_desc.begin(), query_desc.end(), ','),
query_desc.end());
const string kMediumStr = " Medium";
std::size_t found = query_desc.find(kMediumStr);
if (found != std::string::npos) {
query_desc.erase(found, kMediumStr.length());
}
}
PangoFontDescription *desc = pango_font_description_from_string(
query_desc.c_str());
PangoFont* selected_font = NULL;
{
InitFontconfig();
@ -474,7 +484,8 @@ bool FontUtils::IsAvailableFont(const char* query_desc) {
pango_font_description_get_weight(selected_desc));
char* selected_desc_str = pango_font_description_to_string(selected_desc);
tlog(2, "query_desc: '%s' Selected: 's'\n", query_desc, selected_desc_str);
tlog(2, "query_desc: '%s' Selected: 's'\n", query_desc.c_str(),
selected_desc_str);
g_free(selected_desc_str);
pango_font_description_free(selected_desc);

7
training/stringrenderer.cpp
View File

@ -38,12 +38,7 @@
#include "unicode/uchar.h" // from libicu
#include "util.h"
#ifndef USE_STD_NAMESPACE
// Compatability with pango 1.20.
#include "pango/pango-glyph-item-private.h"
#define pango_glyph_item_iter_init_start _pango_glyph_item_iter_init_start
#define pango_glyph_item_iter_next_cluster _pango_glyph_item_iter_next_cluster
#else
#ifdef USE_STD_NAMESPACE
using std::map;
using std::max;
using std::min;