Added Brotli compress/decompress utilities and makefiles
This commit is contained in:
@@ -0,0 +1,10 @@
|
||||
#brotli/dec
|
||||
|
||||
include ../../shared.mk
|
||||
|
||||
OBJS = bit_reader.o decode.o huffman.o safe_malloc.o streams.o
|
||||
|
||||
all : $(OBJS)
|
||||
|
||||
clean :
|
||||
rm -f $(OBJS)
|
||||
+21
-24
@@ -14,6 +14,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "./bit_reader.h"
|
||||
#include "./context.h"
|
||||
#include "./decode.h"
|
||||
@@ -372,8 +373,8 @@ static void ReadInsertAndCopy(const HuffmanTree* tree,
|
||||
} else {
|
||||
*copy_dist = 0;
|
||||
}
|
||||
insert_code = (kInsertRangeLut[range_idx] << 3) + ((code >> 3) & 7);
|
||||
copy_code = (kCopyRangeLut[range_idx] << 3) + (code & 7);
|
||||
insert_code = kInsertRangeLut[range_idx] + ((code >> 3) & 7);
|
||||
copy_code = kCopyRangeLut[range_idx] + (code & 7);
|
||||
*insert_len = kInsertLengthPrefixCode[insert_code].offset;
|
||||
insert_extra_bits = kInsertLengthPrefixCode[insert_code].nbits;
|
||||
if (insert_extra_bits > 0) {
|
||||
@@ -471,17 +472,11 @@ static int DecodeContextMap(int context_map_size,
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (*num_htrees == context_map_size) {
|
||||
int i;
|
||||
for (i = 0; i < context_map_size; ++i) {
|
||||
(*context_map)[i] = i;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
{
|
||||
HuffmanTree tree_index_htree;
|
||||
int use_rle_for_zeros = BrotliReadBits(br, 1);
|
||||
int max_run_length_prefix = 0;
|
||||
int i;
|
||||
if (use_rle_for_zeros) {
|
||||
max_run_length_prefix = BrotliReadBits(br, 4) + 1;
|
||||
}
|
||||
@@ -489,8 +484,6 @@ static int DecodeContextMap(int context_map_size,
|
||||
&tree_index_htree, br)) {
|
||||
return 0;
|
||||
}
|
||||
if (use_rle_for_zeros) {
|
||||
int i;
|
||||
for (i = 0; i < context_map_size;) {
|
||||
int code;
|
||||
if (!BrotliReadMoreInput(br)) {
|
||||
@@ -513,17 +506,6 @@ static int DecodeContextMap(int context_map_size,
|
||||
++i;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
int i;
|
||||
for (i = 0; i < context_map_size; ++i) {
|
||||
if (!BrotliReadMoreInput(br)) {
|
||||
printf("[DecodeContextMap] Unexpected end of input.\n");
|
||||
ok = 0;
|
||||
goto End;
|
||||
}
|
||||
(*context_map)[i] = ReadSymbol(&tree_index_htree, br);
|
||||
}
|
||||
}
|
||||
End:
|
||||
BrotliHuffmanTreeRelease(&tree_index_htree);
|
||||
}
|
||||
@@ -640,6 +622,7 @@ int BrotliDecompress(BrotliInput input, BrotliOutput output) {
|
||||
int input_size_bits = 0;
|
||||
int input_end = 0;
|
||||
int window_bits = 0;
|
||||
size_t max_backward_distance;
|
||||
size_t ringbuffer_size;
|
||||
size_t ringbuffer_mask;
|
||||
uint8_t* ringbuffer;
|
||||
@@ -678,6 +661,7 @@ int BrotliDecompress(BrotliInput input, BrotliOutput output) {
|
||||
} else {
|
||||
window_bits = 16;
|
||||
}
|
||||
max_backward_distance = (1 << window_bits) - 16;
|
||||
|
||||
ringbuffer_size = 1 << window_bits;
|
||||
ringbuffer_mask = ringbuffer_size - 1;
|
||||
@@ -812,6 +796,7 @@ int BrotliDecompress(BrotliInput input, BrotliOutput output) {
|
||||
int copy_length;
|
||||
int distance_code;
|
||||
int distance;
|
||||
size_t max_distance;
|
||||
uint8_t context;
|
||||
int j;
|
||||
const uint8_t* copy_src;
|
||||
@@ -899,15 +884,26 @@ int BrotliDecompress(BrotliInput input, BrotliOutput output) {
|
||||
dist_rb[dist_rb_idx & 3] = distance;
|
||||
++dist_rb_idx;
|
||||
}
|
||||
|
||||
BROTLI_LOG_UINT(distance);
|
||||
|
||||
if (pos < (size_t)distance || pos + copy_length > meta_block_end_pos) {
|
||||
max_distance = max_backward_distance;
|
||||
if (pos < max_distance) {
|
||||
max_distance = pos;
|
||||
}
|
||||
|
||||
if ((size_t)distance > max_distance) {
|
||||
printf("Invalid backward reference. pos: %ld distance: %d "
|
||||
"len: %d end: %lu\n", pos, distance, copy_length,
|
||||
(unsigned long)meta_block_end_pos);
|
||||
ok = 0;
|
||||
goto End;
|
||||
} else {
|
||||
if (pos + copy_length > meta_block_end_pos) {
|
||||
printf("Invalid backward reference. pos: %zu distance: %d "
|
||||
"len: %d end: %zu\n", pos, distance, copy_length,
|
||||
meta_block_end_pos);
|
||||
ok = 0;
|
||||
goto End;
|
||||
}
|
||||
|
||||
copy_src = &ringbuffer[(pos - distance) & ringbuffer_mask];
|
||||
@@ -938,6 +934,7 @@ int BrotliDecompress(BrotliInput input, BrotliOutput output) {
|
||||
}
|
||||
++pos;
|
||||
}
|
||||
}
|
||||
|
||||
// When we get here, we must have inserted at least one literal and made
|
||||
// a copy of at least length two, therefore accessing the last 2 bytes is
|
||||
|
||||
+2
-6
@@ -53,16 +53,12 @@ static const struct PrefixCodeRange kCopyLengthPrefixCode[] = {
|
||||
{326, 8}, { 582, 9}, {1094, 10}, {2118, 24},
|
||||
};
|
||||
|
||||
static const int kInsertAndCopyRangeLut[9] = {
|
||||
0, 1, 4, 2, 3, 6, 5, 7, 8,
|
||||
};
|
||||
|
||||
static const int kInsertRangeLut[9] = {
|
||||
0, 0, 1, 1, 0, 2, 1, 2, 2,
|
||||
0, 0, 8, 8, 0, 16, 8, 16, 16,
|
||||
};
|
||||
|
||||
static const int kCopyRangeLut[9] = {
|
||||
0, 1, 0, 1, 2, 0, 2, 1, 2,
|
||||
0, 8, 0, 8, 16, 0, 16, 8, 16,
|
||||
};
|
||||
|
||||
#endif // BROTLI_DEC_PREFIX_H_
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
#brotli/enc
|
||||
|
||||
include ../../shared.mk
|
||||
|
||||
OBJS = backward_references.o block_splitter.o encode.o entropy_encode.o histogram.o literal_cost.o prefix.o
|
||||
|
||||
all : $(OBJS)
|
||||
|
||||
clean :
|
||||
rm -f $(OBJS) $(SO)
|
||||
|
||||
@@ -47,27 +47,30 @@ void CreateBackwardReferences(size_t num_bytes,
|
||||
|
||||
while (i + 2 < i_end) {
|
||||
size_t best_len = 0;
|
||||
size_t best_len_code = 0;
|
||||
size_t best_dist = 0;
|
||||
double best_score = 0;
|
||||
const size_t max_distance = std::min(i + i_diff, max_backward_limit);
|
||||
size_t max_distance = std::min(i + i_diff, max_backward_limit);
|
||||
hasher->set_insert_length(insert_length);
|
||||
bool match_found = hasher->FindLongestMatch(
|
||||
ringbuffer, literal_cost, ringbuffer_mask,
|
||||
i + i_diff, i_end - i, max_distance,
|
||||
&best_len, &best_dist, &best_score);
|
||||
&best_len, &best_len_code, &best_dist, &best_score);
|
||||
if (match_found) {
|
||||
// Found a match. Let's look for something even better ahead.
|
||||
int delayed_backward_references_in_row = 0;
|
||||
while (i + 4 < i_end &&
|
||||
delayed_backward_references_in_row < 4) {
|
||||
size_t best_len_2 = 0;
|
||||
size_t best_len_code_2 = 0;
|
||||
size_t best_dist_2 = 0;
|
||||
double best_score_2 = 0;
|
||||
max_distance = std::min(i + i_diff + 1, max_backward_limit);
|
||||
hasher->Store(ringbuffer + i, i + i_diff);
|
||||
match_found = hasher->FindLongestMatch(
|
||||
ringbuffer, literal_cost, ringbuffer_mask,
|
||||
i + i_diff + 1, i_end - i - 1, max_distance,
|
||||
&best_len_2, &best_dist_2, &best_score_2);
|
||||
&best_len_2, &best_len_code_2, &best_dist_2, &best_score_2);
|
||||
double cost_diff_lazy = 0;
|
||||
if (best_len >= 4) {
|
||||
cost_diff_lazy +=
|
||||
@@ -96,6 +99,7 @@ void CreateBackwardReferences(size_t num_bytes,
|
||||
++insert_length;
|
||||
++delayed_backward_references_in_row;
|
||||
best_len = best_len_2;
|
||||
best_len_code = best_len_code_2;
|
||||
best_dist = best_dist_2;
|
||||
best_score = best_score_2;
|
||||
i++;
|
||||
@@ -106,6 +110,7 @@ void CreateBackwardReferences(size_t num_bytes,
|
||||
Command cmd;
|
||||
cmd.insert_length_ = insert_length;
|
||||
cmd.copy_length_ = best_len;
|
||||
cmd.copy_length_code_ = best_len_code;
|
||||
cmd.copy_distance_ = best_dist;
|
||||
commands->push_back(cmd);
|
||||
hasher->set_last_distance(best_dist);
|
||||
|
||||
@@ -24,13 +24,14 @@ namespace brotli {
|
||||
// Command holds a sequence of literals and a backward reference copy.
|
||||
class Command {
|
||||
public:
|
||||
Command() : insert_length_(0), copy_length_(0),
|
||||
Command() : insert_length_(0), copy_length_(0), copy_length_code_(0),
|
||||
copy_distance_(0), distance_code_(0),
|
||||
distance_prefix_(0), command_prefix_(0),
|
||||
distance_extra_bits_(0), distance_extra_bits_value_(0) {}
|
||||
|
||||
uint32_t insert_length_;
|
||||
uint32_t copy_length_;
|
||||
uint32_t copy_length_code_;
|
||||
uint32_t copy_distance_;
|
||||
// Values <= 16 are short codes, values > 16 are distances shifted by 16.
|
||||
uint32_t distance_code_;
|
||||
|
||||
+26
-21
@@ -34,6 +34,18 @@
|
||||
|
||||
namespace brotli {
|
||||
|
||||
static const int kWindowBits = 22;
|
||||
// To make decoding faster, we allow the decoder to write 16 bytes ahead in
|
||||
// its ringbuffer, therefore the encoder has to decrease max distance by this
|
||||
// amount.
|
||||
static const int kDecoderRingBufferWriteAheadSlack = 16;
|
||||
static const int kMaxBackwardDistance =
|
||||
(1 << kWindowBits) - kDecoderRingBufferWriteAheadSlack;
|
||||
|
||||
static const int kMetaBlockSizeBits = 21;
|
||||
static const int kRingBufferBits = 23;
|
||||
static const int kRingBufferMask = (1 << kRingBufferBits) - 1;
|
||||
|
||||
template<int kSize>
|
||||
double Entropy(const std::vector<Histogram<kSize> >& histograms) {
|
||||
double retval = 0;
|
||||
@@ -264,7 +276,7 @@ void EncodeCommand(const Command& cmd,
|
||||
uint64_t insert_extra_bits_val =
|
||||
cmd.insert_length_ - InsertLengthOffset(code);
|
||||
int copy_extra_bits = CopyLengthExtraBits(code);
|
||||
uint64_t copy_extra_bits_val = cmd.copy_length_ - CopyLengthOffset(code);
|
||||
uint64_t copy_extra_bits_val = cmd.copy_length_code_ - CopyLengthOffset(code);
|
||||
if (insert_extra_bits > 0) {
|
||||
WriteBits(insert_extra_bits, insert_extra_bits_val, storage_ix, storage);
|
||||
}
|
||||
@@ -325,8 +337,8 @@ void ComputeCommandPrefixes(std::vector<Command>* cmds,
|
||||
for (int i = 0; i < cmds->size(); ++i) {
|
||||
Command* cmd = &(*cmds)[i];
|
||||
cmd->command_prefix_ = CommandPrefix(cmd->insert_length_,
|
||||
cmd->copy_length_);
|
||||
if (cmd->copy_length_ > 0) {
|
||||
cmd->copy_length_code_);
|
||||
if (cmd->copy_length_code_ > 0) {
|
||||
PrefixEncodeCopyDistance(cmd->distance_code_,
|
||||
num_direct_distance_codes,
|
||||
distance_postfix_bits,
|
||||
@@ -454,7 +466,7 @@ void EncodeContextMap(const std::vector<int>& context_map,
|
||||
int* storage_ix, uint8_t* storage) {
|
||||
WriteBits(8, num_clusters - 1, storage_ix, storage);
|
||||
|
||||
if (num_clusters == 1 || num_clusters == context_map.size()) {
|
||||
if (num_clusters == 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -737,10 +749,10 @@ void StoreMetaBlock(const MetaBlock& mb,
|
||||
}
|
||||
if (*pos < end_pos && cmd.distance_prefix_ != 0xffff) {
|
||||
MoveAndEncode(distance_split_code, &distance_it, storage_ix, storage);
|
||||
int histogram_index = distance_it.type_;
|
||||
int context = (distance_it.type_ << 2) +
|
||||
((cmd.copy_length_ > 4) ? 3 : cmd.copy_length_ - 2);
|
||||
histogram_index = mb.distance_context_map[context];
|
||||
((cmd.copy_length_code_ > 4) ? 3 : cmd.copy_length_code_ - 2);
|
||||
int histogram_index = mb.distance_context_map[context];
|
||||
size_t max_distance = std::min(*pos, (size_t)kMaxBackwardDistance);
|
||||
EncodeCopyDistance(cmd, distance_codes[histogram_index],
|
||||
storage_ix, storage);
|
||||
}
|
||||
@@ -748,20 +760,9 @@ void StoreMetaBlock(const MetaBlock& mb,
|
||||
}
|
||||
}
|
||||
|
||||
static const int kWindowBits = 22;
|
||||
// To make decoding faster, we allow the decoder to write 16 bytes ahead in
|
||||
// its ringbuffer, therefore the encoder has to decrease max distance by this
|
||||
// amount.
|
||||
static const int kDecoderRingBufferWriteAheadSlack = 16;
|
||||
static const int kMaxBackwardDistance =
|
||||
(1 << kWindowBits) - kDecoderRingBufferWriteAheadSlack;
|
||||
|
||||
static const int kMetaBlockSizeBits = 21;
|
||||
static const int kRingBufferBits = 23;
|
||||
static const int kRingBufferMask = (1 << kRingBufferBits) - 1;
|
||||
|
||||
BrotliCompressor::BrotliCompressor()
|
||||
: hasher_(new Hasher),
|
||||
: window_bits_(kWindowBits),
|
||||
hasher_(new Hasher),
|
||||
dist_ringbuffer_idx_(0),
|
||||
input_pos_(0),
|
||||
ringbuffer_(kRingBufferBits, kMetaBlockSizeBits),
|
||||
@@ -784,8 +785,12 @@ void BrotliCompressor::WriteStreamHeader() {
|
||||
// Don't encode input size.
|
||||
WriteBits(3, 0, &storage_ix_, storage_);
|
||||
// Encode window size.
|
||||
if (window_bits_ == 16) {
|
||||
WriteBits(1, 0, &storage_ix_, storage_);
|
||||
} else {
|
||||
WriteBits(1, 1, &storage_ix_, storage_);
|
||||
WriteBits(3, kWindowBits - 17, &storage_ix_, storage_);
|
||||
WriteBits(3, window_bits_ - 17, &storage_ix_, storage_);
|
||||
}
|
||||
}
|
||||
|
||||
void BrotliCompressor::WriteMetaBlock(const size_t input_size,
|
||||
|
||||
@@ -49,6 +49,7 @@ class BrotliCompressor {
|
||||
|
||||
|
||||
private:
|
||||
int window_bits_;
|
||||
Hasher* hasher_;
|
||||
int dist_ringbuffer_[4];
|
||||
size_t dist_ringbuffer_idx_;
|
||||
|
||||
+14
-6
@@ -147,6 +147,7 @@ class HashLongestMatch {
|
||||
uint32_t max_length,
|
||||
const uint32_t max_backward,
|
||||
size_t * __restrict best_len_out,
|
||||
size_t * __restrict best_len_code_out,
|
||||
size_t * __restrict best_distance_out,
|
||||
double * __restrict best_score_out) {
|
||||
const size_t cur_ix_masked = cur_ix & ring_buffer_mask;
|
||||
@@ -227,6 +228,7 @@ class HashLongestMatch {
|
||||
best_len = len;
|
||||
best_ix = backward;
|
||||
*best_len_out = best_len;
|
||||
*best_len_code_out = best_len;
|
||||
*best_distance_out = best_ix;
|
||||
*best_score_out = best_score;
|
||||
match_found = true;
|
||||
@@ -234,7 +236,7 @@ class HashLongestMatch {
|
||||
}
|
||||
}
|
||||
const uint32_t key = Hash3Bytes(&data[cur_ix_masked], kBucketBits);
|
||||
const uint32_t * __restrict const bucket = &buckets_[key][0];
|
||||
const int * __restrict const bucket = &buckets_[key][0];
|
||||
const int down = (num_[key] > kBlockSize) ? (num_[key] - kBlockSize) : 0;
|
||||
int stop = int(cur_ix) - 64;
|
||||
if (stop < 0) { stop = 0; }
|
||||
@@ -259,12 +261,16 @@ class HashLongestMatch {
|
||||
best_len = len;
|
||||
best_ix = backward;
|
||||
*best_len_out = best_len;
|
||||
*best_len_code_out = best_len;
|
||||
*best_distance_out = best_ix;
|
||||
match_found = true;
|
||||
}
|
||||
}
|
||||
for (int i = num_[key] - 1; i >= down; --i) {
|
||||
size_t prev_ix = bucket[i & kBlockMask];
|
||||
int prev_ix = bucket[i & kBlockMask];
|
||||
if (prev_ix < 0) {
|
||||
continue;
|
||||
} else {
|
||||
const size_t backward = cur_ix - prev_ix;
|
||||
if (PREDICT_FALSE(backward > max_backward)) {
|
||||
break;
|
||||
@@ -277,9 +283,9 @@ class HashLongestMatch {
|
||||
FindMatchLengthWithLimit(&data[prev_ix], &data[cur_ix_masked],
|
||||
max_length);
|
||||
if (len >= 3) {
|
||||
// Comparing for >= 3 does not change the semantics, but just saves for
|
||||
// a few unnecessary binary logarithms in backward reference score,
|
||||
// since we are not interested in such short matches.
|
||||
// Comparing for >= 3 does not change the semantics, but just saves
|
||||
// for a few unnecessary binary logarithms in backward reference
|
||||
// score, since we are not interested in such short matches.
|
||||
const double score = BackwardReferenceScore(average_cost_,
|
||||
start_cost4,
|
||||
start_cost3,
|
||||
@@ -294,12 +300,14 @@ class HashLongestMatch {
|
||||
best_len = len;
|
||||
best_ix = backward;
|
||||
*best_len_out = best_len;
|
||||
*best_len_code_out = best_len;
|
||||
*best_distance_out = best_ix;
|
||||
*best_score_out = best_score;
|
||||
match_found = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return match_found;
|
||||
}
|
||||
|
||||
@@ -333,7 +341,7 @@ class HashLongestMatch {
|
||||
uint16_t num_[kBucketSize];
|
||||
|
||||
// Buckets containing kBlockSize of backward references.
|
||||
uint32_t buckets_[kBucketSize][kBlockSize];
|
||||
int buckets_[kBucketSize][kBlockSize];
|
||||
|
||||
int last_distance1_;
|
||||
int last_distance2_;
|
||||
|
||||
@@ -59,7 +59,7 @@ void BuildHistograms(
|
||||
if (cmd.copy_length_ > 0 && cmd.distance_prefix_ != 0xffff) {
|
||||
dist_it.Next();
|
||||
int context = (dist_it.type_ << kDistanceContextBits) +
|
||||
((cmd.copy_length_ > 4) ? 3 : cmd.copy_length_ - 2);
|
||||
((cmd.copy_length_code_ > 4) ? 3 : cmd.copy_length_code_ - 2);
|
||||
(*copy_dist_histograms)[context].Add(cmd.distance_prefix_);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
IDIRS=-I../brotli/dec/ -I../brotli/enc/ -I../
|
||||
|
||||
GFLAGS=-no-canonical-prefixes -fno-omit-frame-pointer -fno-tree-vrp -m64
|
||||
|
||||
CPP = g++
|
||||
LFLAGS =
|
||||
CPPFLAGS = -c $(IDIRS) -std=c++0x $(GFLAGS)
|
||||
|
||||
%.o : %.c
|
||||
$(CPP) $(CPPFLAGS) $< -o $@
|
||||
@@ -0,0 +1,28 @@
|
||||
#Converter makefile
|
||||
|
||||
include ../shared.mk
|
||||
|
||||
OUROBJ = font.o glyph.o normalize.o transform.o woff2.o
|
||||
|
||||
BROTLI = ../brotli
|
||||
ENCOBJ = $(BROTLI)/enc/*.o
|
||||
DECOBJ = $(BROTLI)/dec/*.o
|
||||
|
||||
OBJS = $(OUROBJ)
|
||||
EXECUTABLES=woff2_compress woff2_decompress
|
||||
|
||||
EXE_OBJS=$(patsubst %, %.o, $(EXECUTABLES))
|
||||
|
||||
all : $(OBJS) $(EXECUTABLES)
|
||||
|
||||
$(EXECUTABLES) : $(EXE_OBJS) deps
|
||||
$(CPP) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $@.o -o $@
|
||||
|
||||
deps :
|
||||
make -C $(BROTLI)/dec
|
||||
make -C $(BROTLI)/enc
|
||||
|
||||
clean :
|
||||
rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES)
|
||||
make -C $(BROTLI)/dec clean
|
||||
make -C $(BROTLI)/enc clean
|
||||
@@ -0,0 +1,40 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// File IO helpers
|
||||
|
||||
#ifndef BROTLI_WOFF2_FILE_H_
|
||||
#define BROTLI_WOFF2_FILE_H_
|
||||
|
||||
#include <fstream>
|
||||
#include <iterator>
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
inline std::string GetFileContent(std::string filename) {
|
||||
std::ifstream ifs(filename.c_str(), std::ios::binary);
|
||||
return std::string(
|
||||
std::istreambuf_iterator<char>(ifs.rdbuf()),
|
||||
std::istreambuf_iterator<char>());
|
||||
}
|
||||
|
||||
inline void SetFileContents(std::string filename, std::string content) {
|
||||
std::ofstream ofs(filename.c_str(), std::ios::binary);
|
||||
std::copy(content.begin(),
|
||||
content.end(),
|
||||
std::ostream_iterator<char>(ofs));
|
||||
}
|
||||
|
||||
} // namespace woff2
|
||||
#endif // BROTLI_WOFF2_FILE_H_
|
||||
+176
@@ -0,0 +1,176 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Font management utilities
|
||||
|
||||
#include "./font.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "./ots.h"
|
||||
#include "./port.h"
|
||||
#include "./store_bytes.h"
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
Font::Table* Font::FindTable(uint32_t tag) {
|
||||
std::map<uint32_t, Font::Table>::iterator it = tables.find(tag);
|
||||
return it == tables.end() ? 0 : &it->second;
|
||||
}
|
||||
|
||||
const Font::Table* Font::FindTable(uint32_t tag) const {
|
||||
std::map<uint32_t, Font::Table>::const_iterator it = tables.find(tag);
|
||||
return it == tables.end() ? 0 : &it->second;
|
||||
}
|
||||
|
||||
bool ReadFont(const uint8_t* data, size_t len, Font* font) {
|
||||
ots::Buffer file(data, len);
|
||||
|
||||
// We don't care about the search_range, entry_selector and range_shift
|
||||
// fields, they will always be computed upon writing the font.
|
||||
if (!file.ReadU32(&font->flavor) ||
|
||||
!file.ReadU16(&font->num_tables) ||
|
||||
!file.Skip(6)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
|
||||
std::map<uint32_t, uint32_t> intervals;
|
||||
for (uint16_t i = 0; i < font->num_tables; ++i) {
|
||||
Font::Table table;
|
||||
if (!file.ReadU32(&table.tag) ||
|
||||
!file.ReadU32(&table.checksum) ||
|
||||
!file.ReadU32(&table.offset) ||
|
||||
!file.ReadU32(&table.length)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
if ((table.offset & 3) != 0 ||
|
||||
table.length > len ||
|
||||
len - table.length < table.offset) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
intervals[table.offset] = table.length;
|
||||
table.data = data + table.offset;
|
||||
if (font->tables.find(table.tag) != font->tables.end()) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
font->tables[table.tag] = table;
|
||||
}
|
||||
|
||||
// Check that tables are non-overlapping.
|
||||
uint32_t last_offset = 12UL + 16UL * font->num_tables;
|
||||
for (const auto& i : intervals) {
|
||||
if (i.first < last_offset || i.first + i.second < i.first) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
last_offset = i.first + i.second;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
size_t FontFileSize(const Font& font) {
|
||||
size_t max_offset = 12ULL + 16ULL * font.num_tables;
|
||||
for (const auto& i : font.tables) {
|
||||
const Font::Table& table = i.second;
|
||||
size_t padding_size = (4 - (table.length & 3)) & 3;
|
||||
size_t end_offset = (padding_size + table.offset) + table.length;
|
||||
max_offset = std::max(max_offset, end_offset);
|
||||
}
|
||||
return max_offset;
|
||||
}
|
||||
|
||||
bool WriteFont(const Font& font, uint8_t* dst, size_t dst_size) {
|
||||
if (dst_size < 12ULL + 16ULL * font.num_tables) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
size_t offset = 0;
|
||||
StoreU32(font.flavor, &offset, dst);
|
||||
Store16(font.num_tables, &offset, dst);
|
||||
uint16_t max_pow2 = font.num_tables ? Log2Floor(font.num_tables) : 0;
|
||||
uint16_t search_range = max_pow2 ? 1 << (max_pow2 + 4) : 0;
|
||||
uint16_t range_shift = (font.num_tables << 4) - search_range;
|
||||
Store16(search_range, &offset, dst);
|
||||
Store16(max_pow2, &offset, dst);
|
||||
Store16(range_shift, &offset, dst);
|
||||
for (const auto& i : font.tables) {
|
||||
const Font::Table& table = i.second;
|
||||
StoreU32(table.tag, &offset, dst);
|
||||
StoreU32(table.checksum, &offset, dst);
|
||||
StoreU32(table.offset, &offset, dst);
|
||||
StoreU32(table.length, &offset, dst);
|
||||
if (table.offset + table.length < table.offset ||
|
||||
dst_size < table.offset + table.length) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
memcpy(dst + table.offset, table.data, table.length);
|
||||
size_t padding_size = (4 - (table.length & 3)) & 3;
|
||||
if (table.offset + table.length + padding_size < padding_size ||
|
||||
dst_size < table.offset + table.length + padding_size) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
memset(dst + table.offset + table.length, 0, padding_size);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
int NumGlyphs(const Font& font) {
|
||||
const Font::Table* head_table = font.FindTable(kHeadTableTag);
|
||||
const Font::Table* loca_table = font.FindTable(kLocaTableTag);
|
||||
if (head_table == NULL || loca_table == NULL || head_table->length < 52) {
|
||||
return 0;
|
||||
}
|
||||
int index_fmt = head_table->data[51];
|
||||
return (loca_table->length / (index_fmt == 0 ? 2 : 4)) - 1;
|
||||
}
|
||||
|
||||
bool GetGlyphData(const Font& font, int glyph_index,
|
||||
const uint8_t** glyph_data, size_t* glyph_size) {
|
||||
if (glyph_index < 0) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
const Font::Table* head_table = font.FindTable(kHeadTableTag);
|
||||
const Font::Table* loca_table = font.FindTable(kLocaTableTag);
|
||||
const Font::Table* glyf_table = font.FindTable(kGlyfTableTag);
|
||||
if (head_table == NULL || loca_table == NULL || glyf_table == NULL ||
|
||||
head_table->length < 52) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
int index_fmt = head_table->data[51];
|
||||
ots::Buffer loca_buf(loca_table->data, loca_table->length);
|
||||
if (index_fmt == 0) {
|
||||
uint16_t offset1, offset2;
|
||||
if (!loca_buf.Skip(2 * glyph_index) ||
|
||||
!loca_buf.ReadU16(&offset1) ||
|
||||
!loca_buf.ReadU16(&offset2) ||
|
||||
offset2 < offset1 ||
|
||||
2 * offset2 > glyf_table->length) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
*glyph_data = glyf_table->data + 2 * offset1;
|
||||
*glyph_size = 2 * (offset2 - offset1);
|
||||
} else {
|
||||
uint32_t offset1, offset2;
|
||||
if (!loca_buf.Skip(4 * glyph_index) ||
|
||||
!loca_buf.ReadU32(&offset1) ||
|
||||
!loca_buf.ReadU32(&offset2) ||
|
||||
offset2 < offset1 ||
|
||||
offset2 > glyf_table->length) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
*glyph_data = glyf_table->data + offset1;
|
||||
*glyph_size = offset2 - offset1;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace woff2
|
||||
@@ -0,0 +1,81 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Data model for a font file in sfnt format, reading and writing functions and
|
||||
// accessors for the glyph data.
|
||||
|
||||
#ifndef BROTLI_WOFF2_FONT_H_
|
||||
#define BROTLI_WOFF2_FONT_H_
|
||||
|
||||
#include <stddef.h>
|
||||
#include <inttypes.h>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
// Tags of popular tables.
|
||||
static const uint32_t kGlyfTableTag = 0x676c7966;
|
||||
static const uint32_t kHeadTableTag = 0x68656164;
|
||||
static const uint32_t kLocaTableTag = 0x6c6f6361;
|
||||
|
||||
// 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
|
||||
// as long the data from which it was parsed is around.
|
||||
struct Font {
|
||||
uint32_t flavor;
|
||||
uint16_t num_tables;
|
||||
|
||||
struct Table {
|
||||
uint32_t tag;
|
||||
uint32_t checksum;
|
||||
uint32_t offset;
|
||||
uint32_t length;
|
||||
const uint8_t* data;
|
||||
|
||||
// Buffer used to mutate the data before writing out.
|
||||
std::vector<uint8_t> buffer;
|
||||
};
|
||||
std::map<uint32_t, Table> tables;
|
||||
|
||||
Table* FindTable(uint32_t tag);
|
||||
const Table* FindTable(uint32_t tag) const;
|
||||
};
|
||||
|
||||
// Parses the font from the given data. Returns false on parsing failure or
|
||||
// buffer overflow. The font is valid only so long the input data pointer is
|
||||
// valid.
|
||||
bool ReadFont(const uint8_t* data, size_t len, Font* font);
|
||||
|
||||
// Returns the file size of the font.
|
||||
size_t FontFileSize(const Font& font);
|
||||
|
||||
// Writes the font into the specified dst buffer. The dst_size should be the
|
||||
// same as returned by FontFileSize(). Returns false upon buffer overflow (which
|
||||
// should not happen if dst_size was computed by FontFileSize()).
|
||||
bool WriteFont(const Font& font, uint8_t* dst, size_t dst_size);
|
||||
|
||||
// Returns the number of glyphs in the font.
|
||||
// NOTE: Currently this works only for TrueType-flavored fonts, will return
|
||||
// zero for CFF-flavored fonts.
|
||||
int NumGlyphs(const Font& font);
|
||||
|
||||
// Sets *glyph_data and *glyph_size to point to the location of the glyph data
|
||||
// with the given index. Returns false if the glyph is not found.
|
||||
bool GetGlyphData(const Font& font, int glyph_index,
|
||||
const uint8_t** glyph_data, size_t* glyph_size);
|
||||
|
||||
} // namespace woff2
|
||||
|
||||
#endif // BROTLI_WOFF2_FONT_H_
|
||||
+380
@@ -0,0 +1,380 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Glyph manipulation
|
||||
|
||||
#include "./glyph.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <limits>
|
||||
#include "./ots.h"
|
||||
#include "./store_bytes.h"
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
static const int32_t kFLAG_ONCURVE = 1;
|
||||
static const int32_t kFLAG_XSHORT = 1 << 1;
|
||||
static const int32_t kFLAG_YSHORT = 1 << 2;
|
||||
static const int32_t kFLAG_REPEAT = 1 << 3;
|
||||
static const int32_t kFLAG_XREPEATSIGN = 1 << 4;
|
||||
static const int32_t kFLAG_YREPEATSIGN = 1 << 5;
|
||||
static const int32_t kFLAG_ARG_1_AND_2_ARE_WORDS = 1 << 0;
|
||||
static const int32_t kFLAG_WE_HAVE_A_SCALE = 1 << 3;
|
||||
static const int32_t kFLAG_MORE_COMPONENTS = 1 << 5;
|
||||
static const int32_t kFLAG_WE_HAVE_AN_X_AND_Y_SCALE = 1 << 6;
|
||||
static const int32_t kFLAG_WE_HAVE_A_TWO_BY_TWO = 1 << 7;
|
||||
static const int32_t kFLAG_WE_HAVE_INSTRUCTIONS = 1 << 8;
|
||||
|
||||
bool ReadCompositeGlyphData(ots::Buffer* buffer, Glyph* glyph) {
|
||||
glyph->have_instructions = false;
|
||||
glyph->composite_data = buffer->buffer() + buffer->offset();
|
||||
size_t start_offset = buffer->offset();
|
||||
uint16_t flags = kFLAG_MORE_COMPONENTS;
|
||||
while (flags & kFLAG_MORE_COMPONENTS) {
|
||||
if (!buffer->ReadU16(&flags)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
glyph->have_instructions |= (flags & kFLAG_WE_HAVE_INSTRUCTIONS) != 0;
|
||||
size_t arg_size = 2; // glyph index
|
||||
if (flags & kFLAG_ARG_1_AND_2_ARE_WORDS) {
|
||||
arg_size += 4;
|
||||
} else {
|
||||
arg_size += 2;
|
||||
}
|
||||
if (flags & kFLAG_WE_HAVE_A_SCALE) {
|
||||
arg_size += 2;
|
||||
} else if (flags & kFLAG_WE_HAVE_AN_X_AND_Y_SCALE) {
|
||||
arg_size += 4;
|
||||
} else if (flags & kFLAG_WE_HAVE_A_TWO_BY_TWO) {
|
||||
arg_size += 8;
|
||||
}
|
||||
if (!buffer->Skip(arg_size)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
}
|
||||
if (buffer->offset() - start_offset > std::numeric_limits<uint32_t>::max()) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
glyph->composite_data_size = buffer->offset() - start_offset;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ReadGlyph(const uint8_t* data, size_t len, Glyph* glyph) {
|
||||
ots::Buffer buffer(data, len);
|
||||
|
||||
int16_t num_contours;
|
||||
if (!buffer.ReadS16(&num_contours)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
|
||||
if (num_contours == 0) {
|
||||
// Empty glyph.
|
||||
return true;
|
||||
}
|
||||
|
||||
// Read the bounding box.
|
||||
if (!buffer.ReadS16(&glyph->x_min) ||
|
||||
!buffer.ReadS16(&glyph->y_min) ||
|
||||
!buffer.ReadS16(&glyph->x_max) ||
|
||||
!buffer.ReadS16(&glyph->y_max)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
|
||||
if (num_contours > 0) {
|
||||
// Simple glyph.
|
||||
glyph->contours.resize(num_contours);
|
||||
|
||||
// Read the number of points per contour.
|
||||
uint16_t last_point_index = 0;
|
||||
for (int i = 0; i < num_contours; ++i) {
|
||||
uint16_t point_index;
|
||||
if (!buffer.ReadU16(&point_index)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
uint16_t num_points = point_index - last_point_index + (i == 0 ? 1 : 0);
|
||||
glyph->contours[i].resize(num_points);
|
||||
last_point_index = point_index;
|
||||
}
|
||||
|
||||
// Read the instructions.
|
||||
if (!buffer.ReadU16(&glyph->instructions_size)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
glyph->instructions_data = data + buffer.offset();
|
||||
if (!buffer.Skip(glyph->instructions_size)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
|
||||
// Read the run-length coded flags.
|
||||
std::vector<std::vector<uint8_t> > flags(num_contours);
|
||||
uint8_t flag = 0;
|
||||
uint8_t flag_repeat = 0;
|
||||
for (int i = 0; i < num_contours; ++i) {
|
||||
flags[i].resize(glyph->contours[i].size());
|
||||
for (int j = 0; j < glyph->contours[i].size(); ++j) {
|
||||
if (flag_repeat == 0) {
|
||||
if (!buffer.ReadU8(&flag)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
if (flag & kFLAG_REPEAT) {
|
||||
if (!buffer.ReadU8(&flag_repeat)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
flag_repeat--;
|
||||
}
|
||||
flags[i][j] = flag;
|
||||
glyph->contours[i][j].on_curve = flag & kFLAG_ONCURVE;
|
||||
}
|
||||
}
|
||||
|
||||
// Read the x coordinates.
|
||||
int prev_x = 0;
|
||||
for (int i = 0; i < num_contours; ++i) {
|
||||
for (int j = 0; j < glyph->contours[i].size(); ++j) {
|
||||
uint8_t flag = flags[i][j];
|
||||
if (flag & kFLAG_XSHORT) {
|
||||
// single byte x-delta coord value
|
||||
uint8_t x_delta;
|
||||
if (!buffer.ReadU8(&x_delta)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
int sign = (flag & kFLAG_XREPEATSIGN) ? 1 : -1;
|
||||
glyph->contours[i][j].x = prev_x + sign * x_delta;
|
||||
} else {
|
||||
// double byte x-delta coord value
|
||||
int16_t x_delta = 0;
|
||||
if (!(flag & kFLAG_XREPEATSIGN)) {
|
||||
if (!buffer.ReadS16(&x_delta)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
}
|
||||
glyph->contours[i][j].x = prev_x + x_delta;
|
||||
}
|
||||
prev_x = glyph->contours[i][j].x;
|
||||
}
|
||||
}
|
||||
|
||||
// Read the y coordinates.
|
||||
int prev_y = 0;
|
||||
for (int i = 0; i < num_contours; ++i) {
|
||||
for (int j = 0; j < glyph->contours[i].size(); ++j) {
|
||||
uint8_t flag = flags[i][j];
|
||||
if (flag & kFLAG_YSHORT) {
|
||||
// single byte y-delta coord value
|
||||
uint8_t y_delta;
|
||||
if (!buffer.ReadU8(&y_delta)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
int sign = (flag & kFLAG_YREPEATSIGN) ? 1 : -1;
|
||||
glyph->contours[i][j].y = prev_y + sign * y_delta;
|
||||
} else {
|
||||
// double byte y-delta coord value
|
||||
int16_t y_delta = 0;
|
||||
if (!(flag & kFLAG_YREPEATSIGN)) {
|
||||
if (!buffer.ReadS16(&y_delta)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
}
|
||||
glyph->contours[i][j].y = prev_y + y_delta;
|
||||
}
|
||||
prev_y = glyph->contours[i][j].y;
|
||||
}
|
||||
}
|
||||
} else if (num_contours == -1) {
|
||||
// Composite glyph.
|
||||
if (!ReadCompositeGlyphData(&buffer, glyph)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
// Read the instructions.
|
||||
if (glyph->have_instructions) {
|
||||
if (!buffer.ReadU16(&glyph->instructions_size)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
glyph->instructions_data = data + buffer.offset();
|
||||
if (!buffer.Skip(glyph->instructions_size)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
} else {
|
||||
glyph->instructions_size = 0;
|
||||
}
|
||||
} else {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
void StoreBbox(const Glyph& glyph, size_t* offset, uint8_t* dst) {
|
||||
Store16(glyph.x_min, offset, dst);
|
||||
Store16(glyph.y_min, offset, dst);
|
||||
Store16(glyph.x_max, offset, dst);
|
||||
Store16(glyph.y_max, offset, dst);
|
||||
}
|
||||
|
||||
void StoreInstructions(const Glyph& glyph, size_t* offset, uint8_t* dst) {
|
||||
Store16(glyph.instructions_size, offset, dst);
|
||||
StoreBytes(glyph.instructions_data, glyph.instructions_size, offset, dst);
|
||||
}
|
||||
|
||||
bool StoreEndPtsOfContours(const Glyph& glyph, size_t* offset, uint8_t* dst) {
|
||||
int end_point = -1;
|
||||
for (const auto& contour : glyph.contours) {
|
||||
end_point += contour.size();
|
||||
if (contour.size() > std::numeric_limits<uint16_t>::max() ||
|
||||
end_point > std::numeric_limits<uint16_t>::max()) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
Store16(end_point, offset, dst);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool StorePoints(const Glyph& glyph, size_t* offset,
|
||||
uint8_t* dst, size_t dst_size) {
|
||||
int last_flag = -1;
|
||||
int repeat_count = 0;
|
||||
int last_x = 0;
|
||||
int last_y = 0;
|
||||
size_t x_bytes = 0;
|
||||
size_t y_bytes = 0;
|
||||
|
||||
// Store the flags and calculate the total size of the x and y coordinates.
|
||||
for (const auto& contour : glyph.contours) {
|
||||
for (const auto& point : contour) {
|
||||
int flag = point.on_curve ? kFLAG_ONCURVE : 0;
|
||||
int dx = point.x - last_x;
|
||||
int dy = point.y - last_y;
|
||||
if (dx == 0) {
|
||||
flag |= kFLAG_XREPEATSIGN;
|
||||
} else if (dx > -256 && dx < 256) {
|
||||
flag |= kFLAG_XSHORT | (dx > 0 ? kFLAG_XREPEATSIGN : 0);
|
||||
x_bytes += 1;
|
||||
} else {
|
||||
x_bytes += 2;
|
||||
}
|
||||
if (dy == 0) {
|
||||
flag |= kFLAG_YREPEATSIGN;
|
||||
} else if (dy > -256 && dy < 256) {
|
||||
flag |= kFLAG_YSHORT | (dy > 0 ? kFLAG_YREPEATSIGN : 0);
|
||||
y_bytes += 1;
|
||||
} else {
|
||||
y_bytes += 2;
|
||||
}
|
||||
if (flag == last_flag && repeat_count != 255) {
|
||||
dst[*offset - 1] |= kFLAG_REPEAT;
|
||||
repeat_count++;
|
||||
} else {
|
||||
if (repeat_count != 0) {
|
||||
if (*offset >= dst_size) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
dst[(*offset)++] = repeat_count;
|
||||
}
|
||||
if (*offset >= dst_size) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
dst[(*offset)++] = flag;
|
||||
repeat_count = 0;
|
||||
}
|
||||
last_x = point.x;
|
||||
last_y = point.y;
|
||||
last_flag = flag;
|
||||
}
|
||||
}
|
||||
if (repeat_count != 0) {
|
||||
if (*offset >= dst_size) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
dst[(*offset)++] = repeat_count;
|
||||
}
|
||||
|
||||
if (*offset + x_bytes + y_bytes > dst_size) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
|
||||
// Store the x and y coordinates.
|
||||
size_t x_offset = *offset;
|
||||
size_t y_offset = *offset + x_bytes;
|
||||
last_x = 0;
|
||||
last_y = 0;
|
||||
for (const auto& contour : glyph.contours) {
|
||||
for (const auto& point : contour) {
|
||||
int dx = point.x - last_x;
|
||||
int dy = point.y - last_y;
|
||||
if (dx == 0) {
|
||||
// pass
|
||||
} else if (dx > -256 && dx < 256) {
|
||||
dst[x_offset++] = std::abs(dx);
|
||||
} else {
|
||||
Store16(dx, &x_offset, dst);
|
||||
}
|
||||
if (dy == 0) {
|
||||
// pass
|
||||
} else if (dy > -256 && dy < 256) {
|
||||
dst[y_offset++] = std::abs(dy);
|
||||
} else {
|
||||
Store16(dy, &y_offset, dst);
|
||||
}
|
||||
last_x += dx;
|
||||
last_y += dy;
|
||||
}
|
||||
}
|
||||
*offset = y_offset;
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
bool StoreGlyph(const Glyph& glyph, uint8_t* dst, size_t* dst_size) {
|
||||
size_t offset = 0;
|
||||
if (glyph.composite_data_size > 0) {
|
||||
// Composite glyph.
|
||||
if (*dst_size < ((10ULL + glyph.composite_data_size) +
|
||||
((glyph.have_instructions ? 2ULL : 0) +
|
||||
glyph.instructions_size))) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
Store16(-1, &offset, dst);
|
||||
StoreBbox(glyph, &offset, dst);
|
||||
StoreBytes(glyph.composite_data, glyph.composite_data_size, &offset, dst);
|
||||
if (glyph.have_instructions) {
|
||||
StoreInstructions(glyph, &offset, dst);
|
||||
}
|
||||
} else if (glyph.contours.size() > 0) {
|
||||
// Simple glyph.
|
||||
if (glyph.contours.size() > std::numeric_limits<int16_t>::max()) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
if (*dst_size < ((12ULL + 2 * glyph.contours.size()) +
|
||||
glyph.instructions_size)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
Store16(glyph.contours.size(), &offset, dst);
|
||||
StoreBbox(glyph, &offset, dst);
|
||||
if (!StoreEndPtsOfContours(glyph, &offset, dst)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
StoreInstructions(glyph, &offset, dst);
|
||||
if (!StorePoints(glyph, &offset, dst, *dst_size)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
}
|
||||
*dst_size = offset;
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace woff2
|
||||
@@ -0,0 +1,71 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Data model and I/O for glyph data within sfnt format files for the purpose of
|
||||
// performing the preprocessing step of the WOFF 2.0 conversion.
|
||||
|
||||
#ifndef BROTLI_WOFF2_GLYPH_H_
|
||||
#define BROTLI_WOFF2_GLYPH_H_
|
||||
|
||||
#include <stddef.h>
|
||||
#include <inttypes.h>
|
||||
#include <vector>
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
// Represents a parsed simple or composite glyph. The composite glyph data and
|
||||
// instructions are un-parsed and we keep only pointers to the raw data,
|
||||
// therefore the glyph is valid only so long the data from which it was parsed
|
||||
// is around.
|
||||
class Glyph {
|
||||
public:
|
||||
Glyph() : instructions_size(0), composite_data_size(0) {}
|
||||
|
||||
// Bounding box.
|
||||
int16_t x_min;
|
||||
int16_t x_max;
|
||||
int16_t y_min;
|
||||
int16_t y_max;
|
||||
|
||||
// Instructions.
|
||||
uint16_t instructions_size;
|
||||
const uint8_t* instructions_data;
|
||||
|
||||
// Data model for simple glyphs.
|
||||
struct Point {
|
||||
int x;
|
||||
int y;
|
||||
bool on_curve;
|
||||
};
|
||||
std::vector<std::vector<Point> > contours;
|
||||
|
||||
// Data for composite glyphs.
|
||||
const uint8_t* composite_data;
|
||||
uint32_t composite_data_size;
|
||||
bool have_instructions;
|
||||
};
|
||||
|
||||
// Parses the glyph from the given data. Returns false on parsing failure or
|
||||
// buffer overflow. The glyph is valid only so long the input data pointer is
|
||||
// valid.
|
||||
bool ReadGlyph(const uint8_t* data, size_t len, Glyph* glyph);
|
||||
|
||||
// Stores the glyph into the specified dst buffer. The *dst_size is the buffer
|
||||
// size on entry and is set to the actual (unpadded) stored size on exit.
|
||||
// Returns false on buffer overflow.
|
||||
bool StoreGlyph(const Glyph& glyph, uint8_t* dst, size_t* dst_size);
|
||||
|
||||
} // namespace woff2
|
||||
|
||||
#endif // BROTLI_WOFF2_GLYPH_H_
|
||||
@@ -0,0 +1,194 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Glyph normalization
|
||||
|
||||
#include "./normalize.h"
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include "./ots.h"
|
||||
#include "./port.h"
|
||||
#include "./font.h"
|
||||
#include "./glyph.h"
|
||||
#include "./round.h"
|
||||
#include "./store_bytes.h"
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
namespace {
|
||||
|
||||
void StoreLoca(int index_fmt, uint32_t value, size_t* offset, uint8_t* dst) {
|
||||
if (index_fmt == 0) {
|
||||
Store16(value >> 1, offset, dst);
|
||||
} else {
|
||||
StoreU32(value, offset, dst);
|
||||
}
|
||||
}
|
||||
|
||||
void NormalizeSimpleGlyphBoundingBox(Glyph* glyph) {
|
||||
if (glyph->contours.empty() || glyph->contours[0].empty()) {
|
||||
return;
|
||||
}
|
||||
int16_t x_min = glyph->contours[0][0].x;
|
||||
int16_t y_min = glyph->contours[0][0].y;
|
||||
int16_t x_max = x_min;
|
||||
int16_t y_max = y_min;
|
||||
for (const auto& contour : glyph->contours) {
|
||||
for (const auto& point : contour) {
|
||||
if (point.x < x_min) x_min = point.x;
|
||||
if (point.x > x_max) x_max = point.x;
|
||||
if (point.y < y_min) y_min = point.y;
|
||||
if (point.y > y_max) y_max = point.y;
|
||||
}
|
||||
}
|
||||
glyph->x_min = x_min;
|
||||
glyph->y_min = y_min;
|
||||
glyph->x_max = x_max;
|
||||
glyph->y_max = y_max;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
bool NormalizeGlyphs(Font* font) {
|
||||
Font::Table* head_table = font->FindTable(kHeadTableTag);
|
||||
Font::Table* glyf_table = font->FindTable(kGlyfTableTag);
|
||||
Font::Table* loca_table = font->FindTable(kLocaTableTag);
|
||||
if (head_table == NULL || loca_table == NULL || glyf_table == NULL) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
int index_fmt = head_table->data[51];
|
||||
int num_glyphs = NumGlyphs(*font);
|
||||
|
||||
// We need to allocate a bit more than its original length for the normalized
|
||||
// glyf table, since it can happen that the glyphs in the original table are
|
||||
// 2-byte aligned, while in the normalized table they are 4-byte aligned.
|
||||
// That gives a maximum of 2 bytes increase per glyph. However, there is no
|
||||
// theoretical guarantee that the total size of the flags plus the coordinates
|
||||
// is the smallest possible in the normalized version, so we have to allow
|
||||
// some general overhead.
|
||||
// TODO(user) Figure out some more precise upper bound on the size of
|
||||
// the overhead.
|
||||
size_t max_normalized_glyf_size = 1.1 * glyf_table->length + 2 * num_glyphs;
|
||||
|
||||
glyf_table->buffer.resize(max_normalized_glyf_size);
|
||||
loca_table->buffer.resize(Round4(loca_table->length));
|
||||
uint8_t* glyf_dst = &glyf_table->buffer[0];
|
||||
uint8_t* loca_dst = &loca_table->buffer[0];
|
||||
uint32_t glyf_offset = 0;
|
||||
size_t loca_offset = 0;
|
||||
|
||||
for (int i = 0; i < num_glyphs; ++i) {
|
||||
StoreLoca(index_fmt, glyf_offset, &loca_offset, loca_dst);
|
||||
Glyph glyph;
|
||||
const uint8_t* glyph_data;
|
||||
size_t glyph_size;
|
||||
if (!GetGlyphData(*font, i, &glyph_data, &glyph_size) ||
|
||||
(glyph_size > 0 && !ReadGlyph(glyph_data, glyph_size, &glyph))) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
NormalizeSimpleGlyphBoundingBox(&glyph);
|
||||
size_t glyf_dst_size = glyf_table->buffer.size() - glyf_offset;
|
||||
if (!StoreGlyph(glyph, glyf_dst + glyf_offset, &glyf_dst_size)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
glyf_dst_size = Round4(glyf_dst_size);
|
||||
if (glyf_dst_size > std::numeric_limits<uint32_t>::max() ||
|
||||
glyf_offset + static_cast<uint32_t>(glyf_dst_size) < glyf_offset ||
|
||||
(index_fmt == 0 && glyf_offset + glyf_dst_size >= (1UL << 17))) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
glyf_offset += glyf_dst_size;
|
||||
}
|
||||
StoreLoca(index_fmt, glyf_offset, &loca_offset, loca_dst);
|
||||
|
||||
glyf_table->buffer.resize(glyf_offset);
|
||||
glyf_table->data = &glyf_table->buffer[0];
|
||||
glyf_table->length = glyf_offset;
|
||||
loca_table->data = &loca_table->buffer[0];
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool NormalizeOffsets(Font* font) {
|
||||
uint32_t offset = 12 + 16 * font->num_tables;
|
||||
for (auto& i : font->tables) {
|
||||
i.second.offset = offset;
|
||||
offset += Round4(i.second.length);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
uint32_t ComputeChecksum(const uint8_t* buf, size_t size) {
|
||||
uint32_t checksum = 0;
|
||||
for (size_t i = 0; i < size; i += 4) {
|
||||
checksum += ((buf[i] << 24) |
|
||||
(buf[i + 1] << 16) |
|
||||
(buf[i + 2] << 8) |
|
||||
buf[i + 3]);
|
||||
}
|
||||
return checksum;
|
||||
}
|
||||
|
||||
uint32_t ComputeHeaderChecksum(const Font& font) {
|
||||
uint32_t checksum = font.flavor;
|
||||
uint16_t max_pow2 = font.num_tables ? Log2Floor(font.num_tables) : 0;
|
||||
uint16_t search_range = max_pow2 ? 1 << (max_pow2 + 4) : 0;
|
||||
uint16_t range_shift = (font.num_tables << 4) - search_range;
|
||||
checksum += (font.num_tables << 16 | search_range);
|
||||
checksum += (max_pow2 << 16 | range_shift);
|
||||
for (const auto& i : font.tables) {
|
||||
checksum += i.second.tag;
|
||||
checksum += i.second.checksum;
|
||||
checksum += i.second.offset;
|
||||
checksum += i.second.length;
|
||||
}
|
||||
return checksum;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
bool FixChecksums(Font* font) {
|
||||
Font::Table* head_table = font->FindTable(kHeadTableTag);
|
||||
if (head_table == NULL || head_table->length < 12) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
head_table->buffer.resize(Round4(head_table->length));
|
||||
uint8_t* head_buf = &head_table->buffer[0];
|
||||
memcpy(head_buf, head_table->data, Round4(head_table->length));
|
||||
head_table->data = head_buf;
|
||||
size_t offset = 8;
|
||||
StoreU32(0, &offset, head_buf);
|
||||
uint32_t file_checksum = 0;
|
||||
for (auto& i : font->tables) {
|
||||
Font::Table* table = &i.second;
|
||||
table->checksum = ComputeChecksum(table->data, table->length);
|
||||
file_checksum += table->checksum;
|
||||
}
|
||||
file_checksum += ComputeHeaderChecksum(*font);
|
||||
offset = 8;
|
||||
StoreU32(0xb1b0afba - file_checksum, &offset, head_buf);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool NormalizeFont(Font* font) {
|
||||
return (NormalizeGlyphs(font) &&
|
||||
NormalizeOffsets(font) &&
|
||||
FixChecksums(font));
|
||||
}
|
||||
|
||||
} // namespace woff2
|
||||
@@ -0,0 +1,45 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Functions for normalizing fonts. Since the WOFF 2.0 decoder creates font
|
||||
// files in normalized form, the WOFF 2.0 conversion is guaranteed to be
|
||||
// lossless (in a bitwise sense) only for normalized font files.
|
||||
|
||||
#ifndef BROTLI_WOFF2_NORMALIZE_H_
|
||||
#define BROTLI_WOFF2_NORMALIZE_H_
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
struct Font;
|
||||
|
||||
// Changes the offset fields of the table headers so that the data for the
|
||||
// tables will be written in order of increasing tag values, without any gaps
|
||||
// other than the 4-byte padding.
|
||||
bool NormalizeOffsets(Font* font);
|
||||
|
||||
// Changes the checksum fields of the table headers and the checksum field of
|
||||
// the head table so that it matches the current data.
|
||||
bool FixChecksums(Font* font);
|
||||
|
||||
// Parses each of the glyphs in the font and writes them again to the glyf
|
||||
// table in normalized form, as defined by the StoreGlyph() function. Changes
|
||||
// the loca table accordigly.
|
||||
bool NormalizeGlyphs(Font* font);
|
||||
|
||||
// Performs all of the normalization steps above.
|
||||
bool NormalizeFont(Font* font);
|
||||
|
||||
} // namespace woff2
|
||||
|
||||
#endif // BROTLI_WOFF2_NORMALIZE_H_
|
||||
+170
@@ -0,0 +1,170 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// The parts of ots.h & opentype-sanitiser.h that we need, taken from the
|
||||
// https://code.google.com/p/ots/ project.
|
||||
|
||||
#ifndef BROTLI_WOFF2_OTS_H_
|
||||
#define BROTLI_WOFF2_OTS_H_
|
||||
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <limits>
|
||||
|
||||
namespace ots {
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include <stdlib.h>
|
||||
typedef signed char int8_t;
|
||||
typedef unsigned char uint8_t;
|
||||
typedef short int16_t;
|
||||
typedef unsigned short uint16_t;
|
||||
typedef int int32_t;
|
||||
typedef unsigned int uint32_t;
|
||||
typedef __int64 int64_t;
|
||||
typedef unsigned __int64 uint64_t;
|
||||
#define ntohl(x) _byteswap_ulong (x)
|
||||
#define ntohs(x) _byteswap_ushort (x)
|
||||
#define htonl(x) _byteswap_ulong (x)
|
||||
#define htons(x) _byteswap_ushort (x)
|
||||
#else
|
||||
#include <arpa/inet.h>
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER) || !defined(OTS_DEBUG)
|
||||
#define OTS_FAILURE() false
|
||||
#else
|
||||
#define OTS_FAILURE() ots::Failure(__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||
inline bool Failure(const char *f, int l, const char *fn) {
|
||||
std::fprintf(stderr, "ERROR at %s:%d (%s)\n", f, l, fn);
|
||||
std::fflush(stderr);
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Buffer helper class
|
||||
//
|
||||
// This class perform some trival buffer operations while checking for
|
||||
// out-of-bounds errors. As a family they return false if anything is amiss,
|
||||
// updating the current offset otherwise.
|
||||
// -----------------------------------------------------------------------------
|
||||
class Buffer {
|
||||
public:
|
||||
Buffer(const uint8_t *buffer, size_t len)
|
||||
: buffer_(buffer),
|
||||
length_(len),
|
||||
offset_(0) { }
|
||||
|
||||
bool Skip(size_t n_bytes) {
|
||||
return Read(NULL, n_bytes);
|
||||
}
|
||||
|
||||
bool Read(uint8_t *buffer, size_t n_bytes) {
|
||||
if (n_bytes > 1024 * 1024 * 1024) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
if ((offset_ + n_bytes > length_) ||
|
||||
(offset_ > length_ - n_bytes)) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
if (buffer) {
|
||||
std::memcpy(buffer, buffer_ + offset_, n_bytes);
|
||||
}
|
||||
offset_ += n_bytes;
|
||||
return true;
|
||||
}
|
||||
|
||||
inline bool ReadU8(uint8_t *value) {
|
||||
if (offset_ + 1 > length_) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
*value = buffer_[offset_];
|
||||
++offset_;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ReadU16(uint16_t *value) {
|
||||
if (offset_ + 2 > length_) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
std::memcpy(value, buffer_ + offset_, sizeof(uint16_t));
|
||||
*value = ntohs(*value);
|
||||
offset_ += 2;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ReadS16(int16_t *value) {
|
||||
return ReadU16(reinterpret_cast<uint16_t*>(value));
|
||||
}
|
||||
|
||||
bool ReadU24(uint32_t *value) {
|
||||
if (offset_ + 3 > length_) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
*value = static_cast<uint32_t>(buffer_[offset_]) << 16 |
|
||||
static_cast<uint32_t>(buffer_[offset_ + 1]) << 8 |
|
||||
static_cast<uint32_t>(buffer_[offset_ + 2]);
|
||||
offset_ += 3;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ReadU32(uint32_t *value) {
|
||||
if (offset_ + 4 > length_) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
std::memcpy(value, buffer_ + offset_, sizeof(uint32_t));
|
||||
*value = ntohl(*value);
|
||||
offset_ += 4;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ReadS32(int32_t *value) {
|
||||
return ReadU32(reinterpret_cast<uint32_t*>(value));
|
||||
}
|
||||
|
||||
bool ReadTag(uint32_t *value) {
|
||||
if (offset_ + 4 > length_) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
std::memcpy(value, buffer_ + offset_, sizeof(uint32_t));
|
||||
offset_ += 4;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ReadR64(uint64_t *value) {
|
||||
if (offset_ + 8 > length_) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
std::memcpy(value, buffer_ + offset_, sizeof(uint64_t));
|
||||
offset_ += 8;
|
||||
return true;
|
||||
}
|
||||
|
||||
const uint8_t *buffer() const { return buffer_; }
|
||||
size_t offset() const { return offset_; }
|
||||
size_t length() const { return length_; }
|
||||
|
||||
void set_offset(size_t newoffset) { offset_ = newoffset; }
|
||||
|
||||
private:
|
||||
const uint8_t * const buffer_;
|
||||
const size_t length_;
|
||||
size_t offset_;
|
||||
};
|
||||
|
||||
} // namespace ots
|
||||
|
||||
#endif // BROTLI_WOFF2_OTS_H_
|
||||
@@ -0,0 +1,46 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Helper function for bit twiddling
|
||||
|
||||
#ifndef BROTLI_WOFF2_PORT_H_
|
||||
#define BROTLI_WOFF2_PORT_H_
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
typedef unsigned int uint32;
|
||||
|
||||
inline int Log2Floor(uint32 n) {
|
||||
#if defined(__GNUC__)
|
||||
return n == 0 ? -1 : 31 ^ __builtin_clz(n);
|
||||
#else
|
||||
if (n == 0)
|
||||
return -1;
|
||||
int log = 0;
|
||||
uint32 value = n;
|
||||
for (int i = 4; i >= 0; --i) {
|
||||
int shift = (1 << i);
|
||||
uint32 x = value >> shift;
|
||||
if (x != 0) {
|
||||
value = x;
|
||||
log += shift;
|
||||
}
|
||||
}
|
||||
assert(value == 1);
|
||||
return log;
|
||||
#endif
|
||||
}
|
||||
|
||||
} // namespace woff2
|
||||
#endif // BROTLI_WOFF2_PORT_H_
|
||||
@@ -0,0 +1,33 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Helper for rounding
|
||||
|
||||
#ifndef BROTLI_WOFF2_ROUND_H_
|
||||
#define BROTLI_WOFF2_ROUND_H_
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
// Round a value up to the nearest multiple of 4. Don't round the value in the
|
||||
// case that rounding up overflows.
|
||||
template<typename T> T Round4(T value) {
|
||||
if (std::numeric_limits<T>::max() - value < 3) {
|
||||
return value;
|
||||
}
|
||||
return (value + 3) & ~3;
|
||||
}
|
||||
|
||||
} // namespace woff2
|
||||
|
||||
#endif // BROTLI_WOFF2_ROUND_H_
|
||||
@@ -0,0 +1,61 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Helper functions for storing integer values into byte streams.
|
||||
// No bounds checking is performed, that is the responsibility of the caller.
|
||||
|
||||
#ifndef BROTLI_WOFF2_STORE_BYTES_H_
|
||||
#define BROTLI_WOFF2_STORE_BYTES_H_
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
inline size_t StoreU32(uint8_t* dst, size_t offset, uint32_t x) {
|
||||
dst[offset] = x >> 24;
|
||||
dst[offset + 1] = x >> 16;
|
||||
dst[offset + 2] = x >> 8;
|
||||
dst[offset + 3] = x;
|
||||
return offset + 4;
|
||||
}
|
||||
|
||||
inline size_t Store16(uint8_t* dst, size_t offset, int x) {
|
||||
dst[offset] = x >> 8;
|
||||
dst[offset + 1] = x;
|
||||
return offset + 2;
|
||||
}
|
||||
|
||||
inline void StoreU32(uint32_t val, size_t* offset, uint8_t* dst) {
|
||||
dst[(*offset)++] = val >> 24;
|
||||
dst[(*offset)++] = val >> 16;
|
||||
dst[(*offset)++] = val >> 8;
|
||||
dst[(*offset)++] = val;
|
||||
}
|
||||
|
||||
inline void Store16(int val, size_t* offset, uint8_t* dst) {
|
||||
dst[(*offset)++] = val >> 8;
|
||||
dst[(*offset)++] = val;
|
||||
}
|
||||
|
||||
inline void StoreBytes(const uint8_t* data, size_t len,
|
||||
size_t* offset, uint8_t* dst) {
|
||||
memcpy(&dst[*offset], data, len);
|
||||
*offset += len;
|
||||
}
|
||||
|
||||
} // namespace woff2
|
||||
|
||||
#endif // BROTLI_WOFF2_STORE_BYTES_H_
|
||||
@@ -0,0 +1,263 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Library for preprocessing fonts as part of the WOFF 2.0 conversion.
|
||||
|
||||
#include "./transform.h"
|
||||
|
||||
#include <complex> // for std::abs
|
||||
|
||||
#include "./ots.h"
|
||||
#include "./font.h"
|
||||
#include "./glyph.h"
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
namespace {
|
||||
|
||||
const int FLAG_ARG_1_AND_2_ARE_WORDS = 1 << 0;
|
||||
const int FLAG_WE_HAVE_INSTRUCTIONS = 1 << 8;
|
||||
|
||||
void WriteBytes(std::vector<uint8_t>* out, const uint8_t* data, size_t len) {
|
||||
if (len == 0) return;
|
||||
size_t offset = out->size();
|
||||
out->resize(offset + len);
|
||||
memcpy(&(*out)[offset], data, len);
|
||||
}
|
||||
|
||||
void WriteBytes(std::vector<uint8_t>* out, const std::vector<uint8_t>& in) {
|
||||
for (int i = 0; i < in.size(); ++i) {
|
||||
out->push_back(in[i]);
|
||||
}
|
||||
}
|
||||
|
||||
void WriteUShort(std::vector<uint8_t>* out, int value) {
|
||||
out->push_back(value >> 8);
|
||||
out->push_back(value & 255);
|
||||
}
|
||||
|
||||
void WriteLong(std::vector<uint8_t>* out, int value) {
|
||||
out->push_back((value >> 24) & 255);
|
||||
out->push_back((value >> 16) & 255);
|
||||
out->push_back((value >> 8) & 255);
|
||||
out->push_back(value & 255);
|
||||
}
|
||||
|
||||
void Write255UShort(std::vector<uint8_t>* out, int value) {
|
||||
if (value < 253) {
|
||||
out->push_back(value);
|
||||
} else if (value < 506) {
|
||||
out->push_back(255);
|
||||
out->push_back(value - 253);
|
||||
} else if (value < 762) {
|
||||
out->push_back(254);
|
||||
out->push_back(value - 506);
|
||||
} else {
|
||||
out->push_back(253);
|
||||
out->push_back(value >> 8);
|
||||
out->push_back(value & 0xff);
|
||||
}
|
||||
}
|
||||
|
||||
// Glyf table preprocessing, based on
|
||||
// GlyfEncoder.java
|
||||
// but only the "sbbox" and "cbbox" options are supported.
|
||||
class GlyfEncoder {
|
||||
public:
|
||||
explicit GlyfEncoder(int num_glyphs)
|
||||
: sbbox_(false), cbbox_(true), n_glyphs_(num_glyphs) {
|
||||
bbox_bitmap_.resize(((num_glyphs + 31) >> 5) << 2);
|
||||
}
|
||||
|
||||
bool Encode(int glyph_id, const Glyph& glyph) {
|
||||
if (glyph.composite_data_size > 0) {
|
||||
WriteCompositeGlyph(glyph_id, glyph);
|
||||
} else if (glyph.contours.size() > 0) {
|
||||
WriteSimpleGlyph(glyph_id, glyph);
|
||||
} else {
|
||||
WriteUShort(&n_contour_stream_, 0);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void GetTransformedGlyfBytes(std::vector<uint8_t>* result) {
|
||||
WriteLong(result, 0); // version
|
||||
WriteUShort(result, n_glyphs_);
|
||||
WriteUShort(result, 0); // index_format, will be set later
|
||||
WriteLong(result, n_contour_stream_.size());
|
||||
WriteLong(result, n_points_stream_.size());
|
||||
WriteLong(result, flag_byte_stream_.size());
|
||||
WriteLong(result, glyph_stream_.size());
|
||||
WriteLong(result, composite_stream_.size());
|
||||
WriteLong(result, bbox_bitmap_.size() + bbox_stream_.size());
|
||||
WriteLong(result, instruction_stream_.size());
|
||||
WriteBytes(result, n_contour_stream_);
|
||||
WriteBytes(result, n_points_stream_);
|
||||
WriteBytes(result, flag_byte_stream_);
|
||||
WriteBytes(result, glyph_stream_);
|
||||
WriteBytes(result, composite_stream_);
|
||||
WriteBytes(result, bbox_bitmap_);
|
||||
WriteBytes(result, bbox_stream_);
|
||||
WriteBytes(result, instruction_stream_);
|
||||
}
|
||||
|
||||
private:
|
||||
void WriteInstructions(const Glyph& glyph) {
|
||||
Write255UShort(&glyph_stream_, glyph.instructions_size);
|
||||
WriteBytes(&instruction_stream_,
|
||||
glyph.instructions_data, glyph.instructions_size);
|
||||
}
|
||||
|
||||
void WriteSimpleGlyph(int glyph_id, const Glyph& glyph) {
|
||||
int num_contours = glyph.contours.size();
|
||||
WriteUShort(&n_contour_stream_, num_contours);
|
||||
if (sbbox_) {
|
||||
WriteBbox(glyph_id, glyph);
|
||||
}
|
||||
// TODO: check that bbox matches, write bbox if not
|
||||
for (int i = 0; i < num_contours; i++) {
|
||||
Write255UShort(&n_points_stream_, glyph.contours[i].size());
|
||||
}
|
||||
int lastX = 0;
|
||||
int lastY = 0;
|
||||
for (int i = 0; i < num_contours; i++) {
|
||||
int num_points = glyph.contours[i].size();
|
||||
for (int j = 0; j < num_points; j++) {
|
||||
int x = glyph.contours[i][j].x;
|
||||
int y = glyph.contours[i][j].y;
|
||||
int dx = x - lastX;
|
||||
int dy = y - lastY;
|
||||
WriteTriplet(glyph.contours[i][j].on_curve, dx, dy);
|
||||
lastX = x;
|
||||
lastY = y;
|
||||
}
|
||||
}
|
||||
if (num_contours > 0) {
|
||||
WriteInstructions(glyph);
|
||||
}
|
||||
}
|
||||
|
||||
void WriteCompositeGlyph(int glyph_id, const Glyph& glyph) {
|
||||
WriteUShort(&n_contour_stream_, -1);
|
||||
if (cbbox_) {
|
||||
WriteBbox(glyph_id, glyph);
|
||||
}
|
||||
WriteBytes(&composite_stream_,
|
||||
glyph.composite_data,
|
||||
glyph.composite_data_size);
|
||||
if (glyph.have_instructions) {
|
||||
WriteInstructions(glyph);
|
||||
}
|
||||
}
|
||||
|
||||
void WriteBbox(int glyph_id, const Glyph& glyph) {
|
||||
bbox_bitmap_[glyph_id >> 3] |= 0x80 >> (glyph_id & 7);
|
||||
WriteUShort(&bbox_stream_, glyph.x_min);
|
||||
WriteUShort(&bbox_stream_, glyph.y_min);
|
||||
WriteUShort(&bbox_stream_, glyph.x_max);
|
||||
WriteUShort(&bbox_stream_, glyph.y_max);
|
||||
}
|
||||
|
||||
void WriteTriplet(bool on_curve, int x, int y) {
|
||||
int abs_x = std::abs(x);
|
||||
int abs_y = std::abs(y);
|
||||
int on_curve_bit = on_curve ? 0 : 128;
|
||||
int x_sign_bit = (x < 0) ? 0 : 1;
|
||||
int y_sign_bit = (y < 0) ? 0 : 1;
|
||||
int xy_sign_bits = x_sign_bit + 2 * y_sign_bit;
|
||||
if (x == 0 && abs_y < 1280) {
|
||||
flag_byte_stream_.push_back(on_curve_bit +
|
||||
((abs_y & 0xf00) >> 7) + y_sign_bit);
|
||||
glyph_stream_.push_back(abs_y & 0xff);
|
||||
} else if (y == 0 && abs_x < 1280) {
|
||||
flag_byte_stream_.push_back(on_curve_bit + 10 +
|
||||
((abs_x & 0xf00) >> 7) + x_sign_bit);
|
||||
glyph_stream_.push_back(abs_x & 0xff);
|
||||
} else if (abs_x < 65 && abs_y < 65) {
|
||||
flag_byte_stream_.push_back(on_curve_bit + 20 +
|
||||
((abs_x - 1) & 0x30) +
|
||||
(((abs_y - 1) & 0x30) >> 2) +
|
||||
xy_sign_bits);
|
||||
glyph_stream_.push_back((((abs_x - 1) & 0xf) << 4) | ((abs_y - 1) & 0xf));
|
||||
} else if (abs_x < 769 && abs_y < 769) {
|
||||
flag_byte_stream_.push_back(on_curve_bit + 84 +
|
||||
12 * (((abs_x - 1) & 0x300) >> 8) +
|
||||
(((abs_y - 1) & 0x300) >> 6) + xy_sign_bits);
|
||||
glyph_stream_.push_back((abs_x - 1) & 0xff);
|
||||
glyph_stream_.push_back((abs_y - 1) & 0xff);
|
||||
} else if (abs_x < 4096 && abs_y < 4096) {
|
||||
flag_byte_stream_.push_back(on_curve_bit + 120 + xy_sign_bits);
|
||||
glyph_stream_.push_back(abs_x >> 4);
|
||||
glyph_stream_.push_back(((abs_x & 0xf) << 4) | (abs_y >> 8));
|
||||
glyph_stream_.push_back(abs_y & 0xff);
|
||||
} else {
|
||||
flag_byte_stream_.push_back(on_curve_bit + 124 + xy_sign_bits);
|
||||
glyph_stream_.push_back(abs_x >> 8);
|
||||
glyph_stream_.push_back(abs_x & 0xff);
|
||||
glyph_stream_.push_back(abs_y >> 8);
|
||||
glyph_stream_.push_back(abs_y & 0xff);
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<uint8_t> n_contour_stream_;
|
||||
std::vector<uint8_t> n_points_stream_;
|
||||
std::vector<uint8_t> flag_byte_stream_;
|
||||
std::vector<uint8_t> composite_stream_;
|
||||
std::vector<uint8_t> bbox_bitmap_;
|
||||
std::vector<uint8_t> bbox_stream_;
|
||||
std::vector<uint8_t> glyph_stream_;
|
||||
std::vector<uint8_t> instruction_stream_;
|
||||
bool sbbox_;
|
||||
bool cbbox_;
|
||||
int n_glyphs_;
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
bool TransformGlyfAndLocaTables(Font* font) {
|
||||
Font::Table* transformed_glyf = &font->tables[kGlyfTableTag ^ 0x80808080];
|
||||
Font::Table* transformed_loca = &font->tables[kLocaTableTag ^ 0x80808080];
|
||||
|
||||
int num_glyphs = NumGlyphs(*font);
|
||||
GlyfEncoder encoder(num_glyphs);
|
||||
for (int i = 0; i < num_glyphs; ++i) {
|
||||
Glyph glyph;
|
||||
const uint8_t* glyph_data;
|
||||
size_t glyph_size;
|
||||
if (!GetGlyphData(*font, i, &glyph_data, &glyph_size) ||
|
||||
(glyph_size > 0 && !ReadGlyph(glyph_data, glyph_size, &glyph))) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
encoder.Encode(i, glyph);
|
||||
}
|
||||
encoder.GetTransformedGlyfBytes(&transformed_glyf->buffer);
|
||||
|
||||
const Font::Table* head_table = font->FindTable(kHeadTableTag);
|
||||
if (head_table == NULL || head_table->length < 52) {
|
||||
return OTS_FAILURE();
|
||||
}
|
||||
transformed_glyf->buffer[7] = head_table->data[51]; // index_format
|
||||
|
||||
transformed_glyf->tag = kGlyfTableTag ^ 0x80808080;
|
||||
transformed_glyf->length = transformed_glyf->buffer.size();
|
||||
transformed_glyf->data = transformed_glyf->buffer.data();
|
||||
|
||||
transformed_loca->tag = kLocaTableTag ^ 0x80808080;
|
||||
transformed_loca->length = 0;
|
||||
transformed_loca->data = NULL;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace woff2
|
||||
@@ -0,0 +1,31 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Library for preprocessing fonts as part of the WOFF 2.0 conversion.
|
||||
|
||||
#ifndef BROTLI_WOFF2_TRANSFORM_H_
|
||||
#define BROTLI_WOFF2_TRANSFORM_H_
|
||||
|
||||
#include "./font.h"
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
// Adds the transformed versions of the glyf and loca tables to the font. The
|
||||
// transformed loca table has zero length. The tag of the transformed tables is
|
||||
// derived from the original tag by flipping the MSBs of every byte.
|
||||
bool TransformGlyfAndLocaTables(Font* font);
|
||||
|
||||
} // namespace woff2
|
||||
|
||||
#endif // BROTLI_WOFF2_TRANSFORM_H_
|
||||
+1313
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,50 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// Library for converting WOFF2 format font files to their TTF versions.
|
||||
|
||||
#ifndef BROTLI_WOFF2_WOFF2_H_
|
||||
#define BROTLI_WOFF2_WOFF2_H_
|
||||
|
||||
#include <stddef.h>
|
||||
#include <inttypes.h>
|
||||
#include <string>
|
||||
|
||||
namespace woff2 {
|
||||
|
||||
using std::string;
|
||||
|
||||
// Compute the size of the final uncompressed font, or 0 on error.
|
||||
size_t ComputeWOFF2FinalSize(const uint8_t *data, size_t length);
|
||||
|
||||
// Decompresses the font into the target buffer. The result_length should
|
||||
// be the same as determined by ComputeFinalSize(). Returns true on successful
|
||||
// decompression.
|
||||
bool ConvertWOFF2ToTTF(uint8_t *result, size_t result_length,
|
||||
const uint8_t *data, size_t length);
|
||||
|
||||
// Returns an upper bound on the size of the compressed file.
|
||||
size_t MaxWOFF2CompressedSize(const uint8_t* data, size_t length);
|
||||
|
||||
// Compresses the font into the target buffer. *result_length should be at least
|
||||
// the value returned by MaxWOFF2CompressedSize(), upon return, it is set to the
|
||||
// actual compressed size. Returns true on successful compression.
|
||||
bool ConvertTTFToWOFF2(const uint8_t *data, size_t length,
|
||||
uint8_t *result, size_t *result_length);
|
||||
|
||||
|
||||
|
||||
} // namespace woff2
|
||||
|
||||
#endif // BROTLI_WOFF2_WOFF2_H_
|
||||
@@ -0,0 +1,52 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// A commandline tool for compressing ttf format files to woff2.
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "file.h"
|
||||
#include "./woff2.h"
|
||||
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
using std::string;
|
||||
|
||||
if (argc != 2) {
|
||||
fprintf(stderr, "One argument, the input filename, must be provided.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
string filename(argv[1]);
|
||||
string outfilename = filename.substr(0, filename.find_last_of(".")) + ".woff2";
|
||||
fprintf(stdout, "Processing %s => %s\n",
|
||||
filename.c_str(), outfilename.c_str());
|
||||
string input = woff2::GetFileContent(filename);
|
||||
|
||||
const uint8_t* input_data = reinterpret_cast<const uint8_t*>(input.data());
|
||||
size_t output_size = woff2::MaxWOFF2CompressedSize(input_data, input.size());
|
||||
string output(output_size, 0);
|
||||
uint8_t* output_data = reinterpret_cast<uint8_t*>(&output[0]);
|
||||
|
||||
if (!woff2::ConvertTTFToWOFF2(input_data, input.size(),
|
||||
output_data, &output_size)) {
|
||||
fprintf(stderr, "Compression failed.\n");
|
||||
return 1;
|
||||
}
|
||||
output.resize(output_size);
|
||||
|
||||
woff2::SetFileContents(outfilename, output);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
// Copyright 2013 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// A very simple commandline tool for decompressing woff2 format files to true
|
||||
// type font files.
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
#include "file.h"
|
||||
#include "./woff2.h"
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
using std::string;
|
||||
|
||||
if (argc != 2) {
|
||||
fprintf(stderr, "One argument, the input filename, must be provided.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
string filename(argv[1]);
|
||||
string outfilename = filename.substr(0, filename.find_last_of(".")) + ".ttf";
|
||||
fprintf(stdout, "Processing %s => %s\n",
|
||||
filename.c_str(), outfilename.c_str());
|
||||
string input = woff2::GetFileContent(filename);
|
||||
|
||||
size_t decompressed_size = woff2::ComputeWOFF2FinalSize(
|
||||
reinterpret_cast<const uint8_t*>(input.data()), input.size());
|
||||
string output(decompressed_size, 0);
|
||||
const bool ok = woff2::ConvertWOFF2ToTTF(
|
||||
reinterpret_cast<uint8_t*>(&output[0]), decompressed_size,
|
||||
reinterpret_cast<const uint8_t*>(input.data()), input.size());
|
||||
|
||||
if (!ok) {
|
||||
fprintf(stderr, "Decompression failed\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
woff2::SetFileContents(outfilename, output);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user