Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
604e6fb5
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
604e6fb5
编写于
7月 05, 2016
作者:
D
dmarkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8158302: Handle contextual glyph substitutions
Reviewed-by: prr
上级
92e65435
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
13 addition
and
12 deletion
+13
-12
src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp
...share/native/sun/font/layout/ContextualGlyphSubstProc.cpp
+3
-2
src/share/native/sun/font/layout/ContextualGlyphSubstProc.h
src/share/native/sun/font/layout/ContextualGlyphSubstProc.h
+1
-1
src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp
...re/native/sun/font/layout/IndicRearrangementProcessor.cpp
+3
-3
src/share/native/sun/font/layout/IndicRearrangementProcessor.h
...hare/native/sun/font/layout/IndicRearrangementProcessor.h
+1
-1
src/share/native/sun/font/layout/LigatureSubstProc.cpp
src/share/native/sun/font/layout/LigatureSubstProc.cpp
+1
-2
src/share/native/sun/font/layout/LigatureSubstProc.h
src/share/native/sun/font/layout/LigatureSubstProc.h
+1
-1
src/share/native/sun/font/layout/StateTableProcessor.cpp
src/share/native/sun/font/layout/StateTableProcessor.cpp
+2
-1
src/share/native/sun/font/layout/StateTableProcessor.h
src/share/native/sun/font/layout/StateTableProcessor.h
+1
-1
未找到文件。
src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp
浏览文件 @
604e6fb5
...
...
@@ -46,6 +46,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(ContextualGlyphSubstitutionProcessor)
ContextualGlyphSubstitutionProcessor
::
ContextualGlyphSubstitutionProcessor
(
const
LEReferenceTo
<
MorphSubtableHeader
>
&
morphSubtableHeader
,
LEErrorCode
&
success
)
:
StateTableProcessor
(
morphSubtableHeader
,
success
),
entryTable
(),
contextualGlyphSubstitutionHeader
(
morphSubtableHeader
,
success
)
{
if
(
LE_FAILURE
(
success
))
return
;
contextualGlyphSubstitutionHeader
.
orphan
();
substitutionTableOffset
=
SWAPW
(
contextualGlyphSubstitutionHeader
->
substitutionTableOffset
);
...
...
@@ -66,10 +67,10 @@ void ContextualGlyphSubstitutionProcessor::beginStateTable()
markGlyph
=
0
;
}
ByteOffset
ContextualGlyphSubstitutionProcessor
::
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
)
ByteOffset
ContextualGlyphSubstitutionProcessor
::
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
,
LEErrorCode
&
success
)
{
LEErrorCode
success
=
LE_NO_ERROR
;
const
ContextualGlyphSubstitutionStateEntry
*
entry
=
entryTable
.
getAlias
(
index
,
success
);
if
(
LE_FAILURE
(
success
))
return
0
;
ByteOffset
newState
=
SWAPW
(
entry
->
newStateOffset
);
le_int16
flags
=
SWAPW
(
entry
->
flags
);
WordOffset
markOffset
=
SWAPW
(
entry
->
markOffset
);
...
...
src/share/native/sun/font/layout/ContextualGlyphSubstProc.h
浏览文件 @
604e6fb5
...
...
@@ -52,7 +52,7 @@ class ContextualGlyphSubstitutionProcessor : public StateTableProcessor
public:
virtual
void
beginStateTable
();
virtual
ByteOffset
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
);
virtual
ByteOffset
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
,
LEErrorCode
&
success
);
virtual
void
endStateTable
();
...
...
src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp
浏览文件 @
604e6fb5
...
...
@@ -63,10 +63,10 @@ void IndicRearrangementProcessor::beginStateTable()
lastGlyph
=
0
;
}
ByteOffset
IndicRearrangementProcessor
::
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
)
ByteOffset
IndicRearrangementProcessor
::
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
,
LEErrorCode
&
success
)
{
LEErrorCode
success
=
LE_NO_ERROR
;
// todo- make a param?
const
IndicRearrangementStateEntry
*
entry
=
entryTable
.
getAlias
(
index
,
success
)
;
const
IndicRearrangementStateEntry
*
entry
=
entryTable
.
getAlias
(
index
,
success
);
if
(
LE_FAILURE
(
success
))
return
0
;
ByteOffset
newState
=
SWAPW
(
entry
->
newStateOffset
);
IndicRearrangementFlags
flags
=
(
IndicRearrangementFlags
)
SWAPW
(
entry
->
flags
);
...
...
src/share/native/sun/font/layout/IndicRearrangementProcessor.h
浏览文件 @
604e6fb5
...
...
@@ -52,7 +52,7 @@ class IndicRearrangementProcessor : public StateTableProcessor
public:
virtual
void
beginStateTable
();
virtual
ByteOffset
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
);
virtual
ByteOffset
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
,
LEErrorCode
&
success
);
virtual
void
endStateTable
();
...
...
src/share/native/sun/font/layout/LigatureSubstProc.cpp
浏览文件 @
604e6fb5
...
...
@@ -67,9 +67,8 @@ void LigatureSubstitutionProcessor::beginStateTable()
m
=
-
1
;
}
ByteOffset
LigatureSubstitutionProcessor
::
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
)
ByteOffset
LigatureSubstitutionProcessor
::
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
,
LEErrorCode
&
success
)
{
LEErrorCode
success
=
LE_NO_ERROR
;
const
LigatureSubstitutionStateEntry
*
entry
=
entryTable
.
getAlias
(
index
,
success
);
if
(
LE_FAILURE
(
success
))
{
currGlyph
++
;
...
...
src/share/native/sun/font/layout/LigatureSubstProc.h
浏览文件 @
604e6fb5
...
...
@@ -54,7 +54,7 @@ class LigatureSubstitutionProcessor : public StateTableProcessor
public:
virtual
void
beginStateTable
();
virtual
ByteOffset
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
);
virtual
ByteOffset
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
,
LEErrorCode
&
success
);
virtual
void
endStateTable
();
...
...
src/share/native/sun/font/layout/StateTableProcessor.cpp
浏览文件 @
604e6fb5
...
...
@@ -81,6 +81,7 @@ void StateTableProcessor::process(LEGlyphStorage &glyphStorage, LEErrorCode &suc
while
(
currGlyph
<=
glyphCount
)
{
if
(
LE_STATE_PATIENCE_DECR
())
break
;
// patience exceeded.
if
(
LE_FAILURE
(
success
))
break
;
ClassCode
classCode
=
classCodeOOB
;
if
(
currGlyph
==
glyphCount
)
{
// XXX: How do we handle EOT vs. EOL?
...
...
@@ -100,7 +101,7 @@ void StateTableProcessor::process(LEGlyphStorage &glyphStorage, LEErrorCode &suc
EntryTableIndex
entryTableIndex
=
stateArray
.
getObject
((
le_uint8
)
classCode
,
success
);
if
(
LE_FAILURE
(
success
))
{
break
;
}
LE_STATE_PATIENCE_CURR
(
le_int32
,
currGlyph
);
currentState
=
processStateEntry
(
glyphStorage
,
currGlyph
,
entryTableIndex
);
currentState
=
processStateEntry
(
glyphStorage
,
currGlyph
,
entryTableIndex
,
success
);
LE_STATE_PATIENCE_INCR
(
currGlyph
);
}
...
...
src/share/native/sun/font/layout/StateTableProcessor.h
浏览文件 @
604e6fb5
...
...
@@ -53,7 +53,7 @@ public:
virtual
void
beginStateTable
()
=
0
;
virtual
ByteOffset
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
)
=
0
;
virtual
ByteOffset
processStateEntry
(
LEGlyphStorage
&
glyphStorage
,
le_int32
&
currGlyph
,
EntryTableIndex
index
,
LEErrorCode
&
success
)
=
0
;
virtual
void
endStateTable
()
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录