third_party/harfbuzz/src/harfbuzz-gdef.c - Issue 7595001: Update (old) harfbuzz to ToT

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/harfbuzz/src/harfbuzz-gdef.c

Issue 7595001: Update (old) harfbuzz to ToT (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/harfbuzz/src/harfbuzz-gdef.c

diff --git a/third_party/harfbuzz/src/harfbuzz-gdef.c b/third_party/harfbuzz/src/harfbuzz-gdef.c

index ff3a1f4738ee61220929125c69f27992a856dbf0..966b167b90d87043e17619759c08a82f28dcbfd5 100644

--- a/third_party/harfbuzz/src/harfbuzz-gdef.c

+++ b/third_party/harfbuzz/src/harfbuzz-gdef.c

@@ -442,7 +442,11 @@ static HB_Error Load_CaretValue( HB_CaretValue* cv,

if ( ACCESS_Frame( 2L ) )

return error;

+#ifdef HB_SUPPORT_MULTIPLE_MASTER

cv->cvf.cvf4.IdCaretValue = GET_UShort();

+#else

+ (void) GET_UShort();

+#endif

FORGET_Frame();

break;

@@ -458,7 +462,7 @@ static HB_Error Load_CaretValue( HB_CaretValue* cv,

static void Free_CaretValue( HB_CaretValue* cv)

{

if ( cv->CaretValueFormat == 3 )

- _HB_OPEN_Free_Device( &cv->cvf.cvf3.Device );

+ _HB_OPEN_Free_Device( cv->cvf.cvf3.Device );

}