Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
a7660331a
tesseract
提交
900bf607
T
tesseract
项目概览
a7660331a
/
tesseract
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
tesseract
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
900bf607
编写于
7月 16, 2017
作者:
E
Egor Pugin
提交者:
GitHub
7月 16, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1040 from stweil/clean
Delete unused code in PangoFontInfo
上级
45fb7dde
5a7b7ed7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
0 addition
and
68 deletion
+0
-68
cppan.yml
cppan.yml
+0
-6
training/CMakeLists.txt
training/CMakeLists.txt
+0
-3
training/pango_font_info.cpp
training/pango_font_info.cpp
+0
-49
training/pango_font_info.h
training/pango_font_info.h
+0
-10
未找到文件。
cppan.yml
浏览文件 @
900bf607
...
...
@@ -224,12 +224,6 @@ projects:
dependencies
:
-
common_training
-
pvt.cppan.demo.unicode.icu.i18n
options
:
any
:
link_libraries
:
win32
:
private
:
-
Shlwapi
lstmeval
:
files
:
training/lstmeval.cpp
...
...
training/CMakeLists.txt
浏览文件 @
900bf607
...
...
@@ -196,9 +196,6 @@ target_link_libraries (unicharset_training common_training ${ICU_LIBRARIES
else
()
target_link_libraries
(
unicharset_training common_training pvt.cppan.demo.unicode.icu.i18n
)
endif
()
if
(
WIN32
)
target_link_libraries
(
unicharset_training Shlwapi
)
endif
()
project_group
(
unicharset_training
"Training Tools"
)
...
...
training/pango_font_info.cpp
浏览文件 @
900bf607
...
...
@@ -46,16 +46,6 @@
#include "pango/pangocairo.h"
#include "pango/pangofc-font.h"
#ifdef _MSC_VER
#ifndef strcasecmp
#define strcasecmp stricmp
#endif
#include <Shlwapi.h>
#ifndef strcasestr
#define strcasestr StrStrIA
#endif
#endif
STRING_PARAM_FLAG
(
fontconfig_tmpdir
,
"/tmp"
,
"Overrides fontconfig default temporary dir"
);
...
...
@@ -98,10 +88,6 @@ PangoFontInfo::PangoFontInfo(const string& desc)
void
PangoFontInfo
::
Clear
()
{
font_size_
=
0
;
is_bold_
=
false
;
is_italic_
=
false
;
is_smallcaps_
=
false
;
is_monospace_
=
false
;
family_name_
.
clear
();
font_type_
=
UNKNOWN
;
if
(
desc_
)
{
...
...
@@ -182,29 +168,6 @@ static void ListFontFamilies(PangoFontFamily*** families,
pango_font_map_list_families
(
font_map
,
families
,
n_families
);
}
// Inspects whether a given font family is monospace. If the font is not
// available, it cannot make a decision and returns false by default.
static
bool
IsMonospaceFontFamily
(
const
char
*
family_name
)
{
PangoFontFamily
**
families
=
0
;
int
n_families
=
0
;
bool
is_monospace
=
false
;
ListFontFamilies
(
&
families
,
&
n_families
);
ASSERT_HOST
(
n_families
>
0
);
bool
found
=
false
;
for
(
int
i
=
0
;
i
<
n_families
;
++
i
)
{
if
(
!
strcasecmp
(
family_name
,
pango_font_family_get_name
(
families
[
i
])))
{
is_monospace
=
pango_font_family_is_monospace
(
families
[
i
]);
found
=
true
;
break
;
}
}
if
(
!
found
)
{
tlog
(
1
,
"Could not find monospace property of family %s
\n
"
,
family_name
);
}
g_free
(
families
);
return
is_monospace
;
}
bool
PangoFontInfo
::
ParseFontDescription
(
const
PangoFontDescription
*
desc
)
{
Clear
();
const
char
*
family
=
pango_font_description_get_family
(
desc
);
...
...
@@ -217,7 +180,6 @@ bool PangoFontInfo::ParseFontDescription(const PangoFontDescription *desc) {
}
family_name_
=
string
(
family
);
desc_
=
pango_font_description_copy
(
desc
);
is_monospace_
=
IsMonospaceFontFamily
(
family
);
// Set font size in points
font_size_
=
pango_font_description_get_size
(
desc
);
...
...
@@ -225,17 +187,6 @@ bool PangoFontInfo::ParseFontDescription(const PangoFontDescription *desc) {
font_size_
/=
PANGO_SCALE
;
}
PangoStyle
style
=
pango_font_description_get_style
(
desc
);
is_italic_
=
(
PANGO_STYLE_ITALIC
==
style
||
PANGO_STYLE_OBLIQUE
==
style
);
is_smallcaps_
=
(
pango_font_description_get_variant
(
desc
)
==
PANGO_VARIANT_SMALL_CAPS
);
is_bold_
=
(
pango_font_description_get_weight
(
desc
)
>=
PANGO_WEIGHT_BOLD
);
// We don't have a way to detect whether a font is of type Fraktur. The fonts
// we currently use all have "Fraktur" in their family name, so we do a
// fragile but functional check for that here.
is_fraktur_
=
(
strcasestr
(
family
,
"Fraktur"
)
!=
nullptr
);
return
true
;
}
...
...
training/pango_font_info.h
浏览文件 @
900bf607
...
...
@@ -105,11 +105,6 @@ class PangoFontInfo {
const
string
&
family_name
()
const
{
return
family_name_
;
}
// Size in points (1/72"), rounded to the nearest integer.
int
font_size
()
const
{
return
font_size_
;
}
bool
is_bold
()
const
{
return
is_bold_
;
}
bool
is_italic
()
const
{
return
is_italic_
;
}
bool
is_smallcaps
()
const
{
return
is_smallcaps_
;
}
bool
is_monospace
()
const
{
return
is_monospace_
;
}
bool
is_fraktur
()
const
{
return
is_fraktur_
;
}
FontTypeEnum
font_type
()
const
{
return
font_type_
;
}
int
resolution
()
const
{
return
resolution_
;
}
...
...
@@ -128,11 +123,6 @@ class PangoFontInfo {
// Font properties set automatically from parsing the font description name.
string
family_name_
;
int
font_size_
;
bool
is_bold_
;
bool
is_italic_
;
bool
is_smallcaps_
;
bool
is_monospace_
;
bool
is_fraktur_
;
FontTypeEnum
font_type_
;
// The Pango description that was used to initialize the instance.
PangoFontDescription
*
desc_
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录