Always remove DSIG, removed several options
diff --git a/woff2/font.cc b/woff2/font.cc
index 2733708..42d908f 100644
--- a/woff2/font.cc
+++ b/woff2/font.cc
@@ -173,4 +173,14 @@
return true;
}
+bool RemoveDigitalSignature(Font* font) {
+ std::map<uint32_t, Font::Table>::iterator it =
+ font->tables.find(kDsigTableTag);
+ if (it != font->tables.end()) {
+ font->tables.erase(it);
+ font->num_tables = font->tables.size();
+ }
+ return true;
+}
+
} // namespace woff2
diff --git a/woff2/font.h b/woff2/font.h
index dd003fb..8cb4bc3 100644
--- a/woff2/font.h
+++ b/woff2/font.h
@@ -29,6 +29,7 @@
static const uint32_t kGlyfTableTag = 0x676c7966;
static const uint32_t kHeadTableTag = 0x68656164;
static const uint32_t kLocaTableTag = 0x6c6f6361;
+static const uint32_t kDsigTableTag = 0x44534947;
// Represents an sfnt font file. Only the table directory is parsed, for the
// table data we only store a raw pointer, therefore a font object is valid only
@@ -76,6 +77,9 @@
bool GetGlyphData(const Font& font, int glyph_index,
const uint8_t** glyph_data, size_t* glyph_size);
+// Removes the digital signature (DSIG) table
+bool RemoveDigitalSignature(Font* font);
+
} // namespace woff2
#endif // WOFF2_FONT_H_
diff --git a/woff2/normalize.cc b/woff2/normalize.cc
index ef9f158..5ee41e5 100644
--- a/woff2/normalize.cc
+++ b/woff2/normalize.cc
@@ -186,7 +186,8 @@
}
bool NormalizeFont(Font* font) {
- return (NormalizeGlyphs(font) &&
+ return (RemoveDigitalSignature(font) &&
+ NormalizeGlyphs(font) &&
NormalizeOffsets(font) &&
FixChecksums(font));
}
diff --git a/woff2/woff2.cc b/woff2/woff2.cc
index 9c3e34e..81802cd 100644
--- a/woff2/woff2.cc
+++ b/woff2/woff2.cc
@@ -81,14 +81,6 @@
const size_t kWoff2HeaderSize = 48;
const size_t kWoff2EntrySize = 20;
-const size_t kLzmaHeaderSize = 13;
-
-// Compression type values common to both short and long formats
-const uint32_t kCompressionTypeMask = 0xf;
-const uint32_t kCompressionTypeNone = 0;
-const uint32_t kCompressionTypeGzip = 1;
-const uint32_t kCompressionTypeBrotli = 2;
-
// This is a special value for the short format only, as described in
// "Design for compressed header format" in draft doc.
const uint32_t kShortFlagsContinue = 3;
@@ -729,32 +721,24 @@
}
bool Woff2Compress(const uint8_t* data, const size_t len,
- uint32_t compression_type,
uint8_t* result, uint32_t* result_len) {
- if (compression_type == kCompressionTypeBrotli) {
- size_t compressed_len = *result_len;
- brotli::BrotliParams params;
- params.mode = brotli::BrotliParams::MODE_FONT;
- brotli::BrotliCompressBuffer(params, len, data, &compressed_len, result);
- *result_len = compressed_len;
- return true;
- }
- return false;
+ size_t compressed_len = *result_len;
+ brotli::BrotliParams params;
+ params.mode = brotli::BrotliParams::MODE_FONT;
+ brotli::BrotliCompressBuffer(params, len, data, &compressed_len, result);
+ *result_len = compressed_len;
+ return true;
}
bool Woff2Uncompress(uint8_t* dst_buf, size_t dst_size,
- const uint8_t* src_buf, size_t src_size, uint32_t compression_type) {
- if (compression_type == kCompressionTypeBrotli) {
- size_t uncompressed_size = dst_size;
- int ok = BrotliDecompressBuffer(src_size, src_buf,
- &uncompressed_size, dst_buf);
- if (!ok || uncompressed_size != dst_size) {
- return OTS_FAILURE();
- }
- return true;
+ const uint8_t* src_buf, size_t src_size) {
+ size_t uncompressed_size = dst_size;
+ int ok = BrotliDecompressBuffer(src_size, src_buf,
+ &uncompressed_size, dst_buf);
+ if (!ok || uncompressed_size != dst_size) {
+ return OTS_FAILURE();
}
- // Unknown compression type
- return OTS_FAILURE();
+ return true;
}
bool ReadLongDirectory(ots::Buffer* file, std::vector<Table>* tables,
@@ -865,7 +849,7 @@
if ((flag_byte & 0xC0) != 0) {
return OTS_FAILURE();
}
- uint32_t flags = kCompressionTypeBrotli;
+ uint32_t flags = 0;
if (i > 0) {
flags |= kWoff2FlagsContinueStream;
}
@@ -967,11 +951,10 @@
return OTS_FAILURE();
}
dst_offset = Round4(dst_offset);
- if ((table->flags & kCompressionTypeMask) != kCompressionTypeNone) {
- uncompressed_sum += table->src_length;
- if (uncompressed_sum > std::numeric_limits<uint32_t>::max()) {
- return OTS_FAILURE();
- }
+
+ uncompressed_sum += table->src_length;
+ if (uncompressed_sum > std::numeric_limits<uint32_t>::max()) {
+ return OTS_FAILURE();
}
}
// Enforce same 30M limit on uncompressed tables as OTS
@@ -1013,18 +996,11 @@
const Table* table = &tables[i];
uint32_t flags = table->flags;
const uint8_t* src_buf = data + table->src_offset;
- uint32_t compression_type = flags & kCompressionTypeMask;
size_t transform_length = table->transform_length;
if ((flags & kWoff2FlagsContinueStream) != 0) {
if (!continue_valid) {
return OTS_FAILURE();
}
- } else if (compression_type == kCompressionTypeNone) {
- if (transform_length != table->src_length) {
- return OTS_FAILURE();
- }
- transform_buf = src_buf;
- continue_valid = false;
} else if ((flags & kWoff2FlagsContinueStream) == 0) {
uint64_t total_size = transform_length;
for (uint16_t j = i + 1; j < num_tables; ++j) {
@@ -1038,7 +1014,7 @@
}
uncompressed_buf.resize(total_size);
if (!Woff2Uncompress(&uncompressed_buf[0], total_size,
- src_buf, compressed_length, compression_type)) {
+ src_buf, compressed_length)) {
return OTS_FAILURE();
}
transform_buf = &uncompressed_buf[0];
@@ -1129,17 +1105,6 @@
}
struct Woff2ConvertOptions {
- uint32_t compression_type;
- bool continue_streams;
- bool keep_dsig;
- bool transform_glyf;
-
- Woff2ConvertOptions()
- : compression_type(kCompressionTypeBrotli),
- continue_streams(true),
- keep_dsig(true),
- transform_glyf(true) {}
-
};
@@ -1153,8 +1118,6 @@
bool ConvertTTFToWOFF2(const uint8_t *data, size_t length,
uint8_t *result, size_t *result_length) {
- Woff2ConvertOptions options;
-
Font font;
if (!ReadFont(data, length, &font)) {
fprintf(stderr, "Parsing of the input font failed.\n");
@@ -1166,12 +1129,7 @@
return false;
}
- if (!options.keep_dsig) {
- font.tables.erase(TAG('D', 'S', 'I', 'G'));
- }
-
- if (options.transform_glyf &&
- !TransformGlyfAndLocaTables(&font)) {
+ if (!TransformGlyfAndLocaTables(&font)) {
fprintf(stderr, "Font transformation failed.\n");
return false;
}
@@ -1204,7 +1162,6 @@
}
// Compress all transformed data in one stream.
if (!Woff2Compress(transform_buf.data(), total_transform_length,
- options.compression_type,
&compression_buf[0],
&total_compressed_length)) {
fprintf(stderr, "Compression of combined table failed.\n");
@@ -1221,7 +1178,7 @@
}
Table table;
table.tag = src_table.tag;
- table.flags = options.compression_type;
+ table.flags = 0;
table.src_length = src_table.length;
table.transform_length = src_table.length;
const uint8_t* transformed_data = src_table.data;
