Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
22da7fd9
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
12 个月 前同步成功
通知
0
Star
18
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Harfbuzz
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
22da7fd9
编写于
5月 12, 2010
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename a few files to be C++ sources
In anticipation for buffer revamp coming.
上级
c3df649f
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
34 addition
and
33 deletion
+34
-33
src/Makefile.am
src/Makefile.am
+8
-8
src/hb-buffer-private.hh
src/hb-buffer-private.hh
+1
-1
src/hb-buffer.cc
src/hb-buffer.cc
+7
-7
src/hb-common.h
src/hb-common.h
+1
-0
src/hb-font-private.hh
src/hb-font-private.hh
+1
-1
src/hb-font.cc
src/hb-font.cc
+2
-2
src/hb-ft.cc
src/hb-ft.cc
+4
-4
src/hb-ot-layout-common-private.hh
src/hb-ot-layout-common-private.hh
+1
-1
src/hb-ot-layout-gdef-private.hh
src/hb-ot-layout-gdef-private.hh
+1
-1
src/hb-ot-layout-gsubgpos-private.hh
src/hb-ot-layout-gsubgpos-private.hh
+1
-1
src/hb-ot-layout-private.hh
src/hb-ot-layout-private.hh
+1
-1
src/hb-ot-layout.cc
src/hb-ot-layout.cc
+1
-1
src/hb-ot-shape-private.hh
src/hb-ot-shape-private.hh
+0
-0
src/hb-ot-shape.cc
src/hb-ot-shape.cc
+2
-2
src/hb-shape.cc
src/hb-shape.cc
+3
-3
未找到文件。
src/Makefile.am
浏览文件 @
22da7fd9
...
...
@@ -12,16 +12,16 @@ HBLIBS =
HBSOURCES
=
\
hb-blob.c
\
hb-blob-private.h
\
hb-buffer.c
\
hb-buffer-private.h
\
hb-buffer.c
c
\
hb-buffer-private.h
h
\
hb-font.cc
\
hb-font-private.h
\
hb-font-private.h
h
\
hb-object-private.h
\
hb-open-file-private.hh
\
hb-open-type-private.hh
\
hb-language.c
\
hb-private.h
\
hb-shape.c
\
hb-shape.c
c
\
hb-unicode.c
\
hb-unicode-private.h
\
$(NULL)
...
...
@@ -43,9 +43,9 @@ HBSOURCES += \
hb-ot-layout-gpos-private.hh
\
hb-ot-layout-gsubgpos-private.hh
\
hb-ot-layout-gsub-private.hh
\
hb-ot-layout-private.h
\
hb-ot-shape.c
\
hb-ot-shape-private.h
\
hb-ot-layout-private.h
h
\
hb-ot-shape.c
c
\
hb-ot-shape-private.h
h
\
hb-ot-tag.c
\
$(NULL)
HBHEADERS
+=
\
...
...
@@ -80,7 +80,7 @@ if HAVE_FREETYPE
HBCFLAGS
+=
$(FREETYPE_CFLAGS)
HBLIBS
+=
$(FREETYPE_LIBS)
HBSOURCES
+=
\
hb-ft.c
\
hb-ft.c
c
\
$(NULL)
HBHEADERS
+=
\
hb-ft.h
\
...
...
src/hb-buffer-private.h
→
src/hb-buffer-private.h
h
浏览文件 @
22da7fd9
/*
* Copyright (C) 1998-2004 David Turner and Werner Lemberg
* Copyright (C) 2004,2007,2009 Red Hat, Inc.
* Copyright (C) 2004,2007,2009
,2010
Red Hat, Inc.
*
* This is part of HarfBuzz, a text shaping library.
*
...
...
src/hb-buffer.c
→
src/hb-buffer.c
c
浏览文件 @
22da7fd9
/*
* Copyright (C) 1998-2004 David Turner and Werner Lemberg
* Copyright (C) 2004,2007 Red Hat, Inc.
* Copyright (C) 2004,2007
,2009,2010
Red Hat, Inc.
*
* This is part of HarfBuzz, a text shaping library.
*
...
...
@@ -25,7 +25,7 @@
* Red Hat Author(s): Owen Taylor, Behdad Esfahbod
*/
#include "hb-buffer-private.h"
#include "hb-buffer-private.h
h
"
#include <string.h>
...
...
@@ -66,7 +66,7 @@ hb_buffer_ensure_separate (hb_buffer_t *buffer, unsigned int size)
{
assert
(
buffer
->
have_output
);
if
(
!
buffer
->
positions
)
buffer
->
positions
=
calloc
(
buffer
->
allocated
,
sizeof
(
buffer
->
positions
[
0
]));
buffer
->
positions
=
(
hb_internal_glyph_position_t
*
)
calloc
(
buffer
->
allocated
,
sizeof
(
buffer
->
positions
[
0
]));
buffer
->
out_string
=
(
hb_internal_glyph_info_t
*
)
buffer
->
positions
;
memcpy
(
buffer
->
out_string
,
buffer
->
in_string
,
buffer
->
out_length
*
sizeof
(
buffer
->
out_string
[
0
]));
...
...
@@ -200,16 +200,16 @@ hb_buffer_ensure (hb_buffer_t *buffer, unsigned int size)
new_allocated
+=
(
new_allocated
>>
1
)
+
8
;
if
(
buffer
->
positions
)
buffer
->
positions
=
realloc
(
buffer
->
positions
,
new_allocated
*
sizeof
(
buffer
->
positions
[
0
]));
buffer
->
positions
=
(
hb_internal_glyph_position_t
*
)
realloc
(
buffer
->
positions
,
new_allocated
*
sizeof
(
buffer
->
positions
[
0
]));
if
(
buffer
->
out_string
!=
buffer
->
in_string
)
{
buffer
->
in_string
=
realloc
(
buffer
->
in_string
,
new_allocated
*
sizeof
(
buffer
->
in_string
[
0
]));
buffer
->
in_string
=
(
hb_internal_glyph_info_t
*
)
realloc
(
buffer
->
in_string
,
new_allocated
*
sizeof
(
buffer
->
in_string
[
0
]));
buffer
->
out_string
=
(
hb_internal_glyph_info_t
*
)
buffer
->
positions
;
}
else
{
buffer
->
in_string
=
realloc
(
buffer
->
in_string
,
new_allocated
*
sizeof
(
buffer
->
in_string
[
0
]));
buffer
->
in_string
=
(
hb_internal_glyph_info_t
*
)
realloc
(
buffer
->
in_string
,
new_allocated
*
sizeof
(
buffer
->
in_string
[
0
]));
buffer
->
out_string
=
buffer
->
in_string
;
}
...
...
@@ -260,7 +260,7 @@ hb_buffer_clear_positions (hb_buffer_t *buffer)
if
(
unlikely
(
!
buffer
->
positions
))
{
buffer
->
positions
=
calloc
(
buffer
->
allocated
,
sizeof
(
buffer
->
positions
[
0
]));
buffer
->
positions
=
(
hb_internal_glyph_position_t
*
)
calloc
(
buffer
->
allocated
,
sizeof
(
buffer
->
positions
[
0
]));
return
;
}
...
...
src/hb-common.h
浏览文件 @
22da7fd9
...
...
@@ -83,6 +83,7 @@ typedef enum _hb_direction_t {
#define HB_DIRECTION_IS_VERTICAL(dir) ((dir) == HB_DIRECTION_TTB || (dir) == HB_DIRECTION_BTT)
#define HB_DIRECTION_IS_FORWARD(dir) ((dir) == HB_DIRECTION_LTR || (dir) == HB_DIRECTION_TTB)
#define HB_DIRECTION_IS_BACKWARD(dir) ((dir) == HB_DIRECTION_RTL || (dir) == HB_DIRECTION_BTT)
#define HB_DIRECTION_REVERSE(dir) ((hb_direction_t) (((unsigned int) (dir)) ^ 1))
#endif
/* HB_COMMON_H */
src/hb-font-private.h
→
src/hb-font-private.h
h
浏览文件 @
22da7fd9
...
...
@@ -31,7 +31,7 @@
#include "hb-font.h"
#include "hb-ot-layout-private.h"
#include "hb-ot-layout-private.h
h
"
HB_BEGIN_DECLS
...
...
src/hb-font.cc
浏览文件 @
22da7fd9
...
...
@@ -26,11 +26,11 @@
#include "hb-private.h"
#include "hb-font-private.h"
#include "hb-font-private.h
h
"
#include "hb-blob-private.h"
#include "hb-open-file-private.hh"
#include "hb-ot-layout-private.h"
#include "hb-ot-layout-private.h
h
"
#include <string.h>
...
...
src/hb-ft.c
→
src/hb-ft.c
c
浏览文件 @
22da7fd9
...
...
@@ -29,7 +29,7 @@
#include "hb-ft.h"
#include "hb-font-private.h"
#include "hb-font-private.h
h
"
#include FT_TRUETYPE_TABLES_H
...
...
@@ -160,7 +160,7 @@ _get_table (hb_tag_t tag, void *user_data)
return
hb_blob_create_empty
();
/* TODO Use FT_Memory? */
buffer
=
malloc
(
length
);
buffer
=
(
FT_Byte
*
)
malloc
(
length
);
if
(
buffer
==
NULL
)
return
NULL
;
...
...
@@ -200,7 +200,7 @@ hb_ft_face_create (FT_Face ft_face,
static
void
hb_ft_face_finalize
(
FT_Face
ft_face
)
{
hb_face_destroy
(
ft_face
->
generic
.
data
);
hb_face_destroy
(
(
hb_face_t
*
)
ft_face
->
generic
.
data
);
}
hb_face_t
*
...
...
@@ -215,7 +215,7 @@ hb_ft_face_create_cached (FT_Face ft_face)
ft_face
->
generic
.
finalizer
=
(
FT_Generic_Finalizer
)
hb_ft_face_finalize
;
}
return
hb_face_reference
(
ft_face
->
generic
.
data
);
return
hb_face_reference
(
(
hb_face_t
*
)
ft_face
->
generic
.
data
);
}
...
...
src/hb-ot-layout-common-private.hh
浏览文件 @
22da7fd9
...
...
@@ -27,7 +27,7 @@
#ifndef HB_OT_LAYOUT_COMMON_PRIVATE_HH
#define HB_OT_LAYOUT_COMMON_PRIVATE_HH
#include "hb-ot-layout-private.h"
#include "hb-ot-layout-private.h
h
"
#include "hb-open-type-private.hh"
...
...
src/hb-ot-layout-gdef-private.hh
浏览文件 @
22da7fd9
...
...
@@ -29,7 +29,7 @@
#include "hb-ot-layout-common-private.hh"
#include "hb-font-private.h"
#include "hb-font-private.h
h
"
/*
...
...
src/hb-ot-layout-gsubgpos-private.hh
浏览文件 @
22da7fd9
...
...
@@ -27,7 +27,7 @@
#ifndef HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH
#define HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH
#include "hb-buffer-private.h"
#include "hb-buffer-private.h
h
"
#include "hb-ot-layout-gdef-private.hh"
...
...
src/hb-ot-layout-private.h
→
src/hb-ot-layout-private.h
h
浏览文件 @
22da7fd9
...
...
@@ -32,7 +32,7 @@
#include "hb-ot-layout.h"
#include "hb-font.h"
#include "hb-buffer-private.h"
#include "hb-buffer-private.h
h
"
HB_BEGIN_DECLS
...
...
src/hb-ot-layout.cc
浏览文件 @
22da7fd9
...
...
@@ -28,7 +28,7 @@
#define HB_OT_LAYOUT_CC
#include "hb-ot-layout-private.h"
#include "hb-ot-layout-private.h
h
"
#include "hb-ot-layout-gdef-private.hh"
#include "hb-ot-layout-gsub-private.hh"
...
...
src/hb-ot-shape-private.h
→
src/hb-ot-shape-private.h
h
浏览文件 @
22da7fd9
文件已移动
src/hb-ot-shape.c
→
src/hb-ot-shape.c
c
浏览文件 @
22da7fd9
...
...
@@ -24,9 +24,9 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#include "hb-ot-shape-private.h"
#include "hb-ot-shape-private.h
h
"
#include "hb-buffer-private.h"
#include "hb-buffer-private.h
h
"
#include "hb-ot-layout.h"
...
...
src/hb-shape.c
→
src/hb-shape.c
c
浏览文件 @
22da7fd9
...
...
@@ -28,9 +28,9 @@
#include "hb-shape.h"
#include "hb-buffer-private.h"
#include "hb-buffer-private.h
h
"
#include "hb-ot-shape-private.h"
#include "hb-ot-shape-private.h
h
"
/* Prepare */
...
...
@@ -64,7 +64,7 @@ hb_ensure_native_direction (hb_buffer_t *buffer)
original_direction
!=
_hb_script_get_horizontal_direction
(
buffer
->
script
))
{
hb_buffer_reverse_clusters
(
buffer
);
buffer
->
direction
^=
1
;
buffer
->
direction
=
HB_DIRECTION_REVERSE
(
buffer
->
direction
)
;
}
return
original_direction
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录