зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1252407 - Update woff2 library to upstream commit 643c7b45891cbeb5dc1f7599a4c9b53fbe82a08f. r=fredw
This commit is contained in:
Родитель
fbd3ebdb6d
Коммит
e8a26c768f
|
@ -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.
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче