wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1252407 - Update woff2 library to upstream commit 643c7b45891cbeb5dc1f7599a4c9b53fbe82a08f. r=fredw

Browse Source
This commit is contained in:
Jonathan Kew 2016-03-02 06:59:16 +00:00
parent b71974da3a
commit 2880527f62
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/woff2/README.mozilla
View File

@ -11,7 +11,7 @@ The in-tree copy is updated by running
sh update.sh
from within the modules/woff2 directory.
Current version: [commit ee1b44e0b4fd29a33bdef5f1ec3769325862d615].
Current version: [commit 643c7b45891cbeb5dc1f7599a4c9b53fbe82a08f].
redefine-unique_ptr.patch redefines the class std::unique_ptr to workaround a
build issue with missing C++11 features.

2
modules/woff2/redefine-unique_ptr.patch
View File

@ -19,8 +19,8 @@ diff --git a/modules/woff2/src/woff2_dec.cc b/modules/woff2/src/woff2_dec.cc
+ #define unique_ptr UniquePtr
+}
#include "./buffer.h"
#include "./decode.h"
#include "./buffer.h"
#include "./port.h"
#include "./round.h"
#include "./store_bytes.h"

5
modules/woff2/src/woff2_dec.cc
View File

@ -34,8 +34,8 @@ namespace std
#define unique_ptr UniquePtr
}
#include "./buffer.h"
#include "./decode.h"
#include "./buffer.h"
#include "./port.h"
#include "./round.h"
#include "./store_bytes.h"
@ -1129,7 +1129,8 @@ bool ConvertWOFF2ToTTF(uint8_t* result, size_t result_length,
for (uint32_t j = 0; j < num_tables; j++) {
unsigned int table_idx;
if (PREDICT_FALSE(!Read255UShort(&file, &table_idx))) {
if (PREDICT_FALSE(!Read255UShort(&file, &table_idx)) ||
table_idx >= tables.size()) {
return FONT_COMPRESSION_FAILURE();
}
ttc_font.table_indices[j] = table_idx;