Skip to content

Commit

Permalink
harfbuzz 10.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
edocevoli committed Dec 29, 2024
1 parent 4910e19 commit 966b45e
Show file tree
Hide file tree
Showing 184 changed files with 16,122 additions and 7,389 deletions.
2 changes: 1 addition & 1 deletion Admin/TPM/windows-x64/miktex-harfbuzz-bin-x64.tpm.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<TPM:Copyright owner="Mozilla Foundation" year="2012"/>
<TPM:Copyright owner="Google, Inc." year="2020"/>
<TPM:License type="mit"/>
<TPM:Version>8.2.1</TPM:Version>
<TPM:Version>10.1.0</TPM:Version>
<TPM:TargetSystem minVersion="@MIKTEX_MIN_TARGET_SYSTEM_VERSION@">windows-x64</TPM:TargetSystem>
<TPM:Date>@MIKTEX_DATETIME_STR@</TPM:Date>
<TPM:Description>
Expand Down
22 changes: 3 additions & 19 deletions Libraries/3rd/harfbuzz/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## CMakeLists.txt
##
## Copyright (C) 2013-2022 Christian Schenk
## Copyright (C) 2013-2024 Christian Schenk
##
## This file is free software; the copyright holder gives
## unlimited permission to copy and/or distribute it, with or
Expand All @@ -17,26 +17,15 @@ include_directories(BEFORE
)

set(public_include_directories
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/source/src
)

add_definitions(
-DHAVE_CONFIG_H
-DHAVE_FALLBACK
-DHB_NO_MT
)

set(HAVE_ROUND 1)

set(HAVE_GRAPHITE2 1)
set(HAVE_OT 1)

set(HAVE_CXX11 1)

if(MIKTEX_NATIVE_WINDOWS)
set(HAVE_WINDOWS_H 1)
endif()

configure_file(
config.h.cmake
Expand All @@ -57,13 +46,8 @@ list(APPEND harfbuzz_sources
)

list(APPEND harfbuzz_sources
${HB_BASE_sources}
${HB_BASE_RAGEL_GENERATED_sources}

${HB_BASE_headers}

${HB_GRAPHITE2_sources}
${HB_GRAPHITE2_headers}
${project_sources}
${project_headers}
)

set(CMAKE_C_VISIBILITY_PRESET protected)
Expand Down
21 changes: 0 additions & 21 deletions Libraries/3rd/harfbuzz/include/miktex/harfbuzz/rename-symbols.h

This file was deleted.

6 changes: 6 additions & 0 deletions Libraries/3rd/harfbuzz/source/src/OT/Color/CBDT/CBDT.hh
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ struct IndexSubtable
{
TRACE_SANITIZE (this);
if (!u.header.sanitize (c)) return_trace (false);
hb_barrier ();
switch (u.header.indexFormat)
{
case 1: return_trace (u.format1.sanitize (c, glyph_count));
Expand Down Expand Up @@ -378,6 +379,7 @@ struct IndexSubtableRecord
{
TRACE_SANITIZE (this);
return_trace (c->check_struct (this) &&
hb_barrier () &&
firstGlyphIndex <= lastGlyphIndex &&
offsetToSubtable.sanitize (c, base, lastGlyphIndex - firstGlyphIndex + 1));
}
Expand Down Expand Up @@ -635,6 +637,7 @@ struct BitmapSizeTable
{
TRACE_SANITIZE (this);
return_trace (c->check_struct (this) &&
hb_barrier () &&
indexSubtableArrayOffset.sanitize (c, base, numberOfIndexSubtables) &&
horizontal.sanitize (c) &&
vertical.sanitize (c));
Expand Down Expand Up @@ -738,7 +741,9 @@ struct CBLC
{
TRACE_SANITIZE (this);
return_trace (c->check_struct (this) &&
hb_barrier () &&
likely (version.major == 2 || version.major == 3) &&
hb_barrier () &&
sizeTables.sanitize (c, this));
}

Expand Down Expand Up @@ -975,6 +980,7 @@ struct CBDT
{
TRACE_SANITIZE (this);
return_trace (c->check_struct (this) &&
hb_barrier () &&
likely (version.major == 2 || version.major == 3));
}

Expand Down
Loading

0 comments on commit 966b45e

Please sign in to comment.