diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-14 10:02:36 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-14 10:02:36 +0100 |
commit | 36975f3865948f3faa959fe386e58b22783bd379 (patch) | |
tree | 890182161b3e522f45f966574425d85972bff4a5 /modules/woff2/src/woff2_decompress.cc | |
parent | 787b4fe586456565c2dda457ad81f1dd420e9249 (diff) | |
download | UXP-36975f3865948f3faa959fe386e58b22783bd379.tar UXP-36975f3865948f3faa959fe386e58b22783bd379.tar.gz UXP-36975f3865948f3faa959fe386e58b22783bd379.tar.lz UXP-36975f3865948f3faa959fe386e58b22783bd379.tar.xz UXP-36975f3865948f3faa959fe386e58b22783bd379.zip |
Issue #1288 - Part 3: Update woff2 component to 1.0.2
Diffstat (limited to 'modules/woff2/src/woff2_decompress.cc')
-rw-r--r-- | modules/woff2/src/woff2_decompress.cc | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/modules/woff2/src/woff2_decompress.cc b/modules/woff2/src/woff2_decompress.cc index f29c797cb..de088b9ec 100644 --- a/modules/woff2/src/woff2_decompress.cc +++ b/modules/woff2/src/woff2_decompress.cc @@ -1,24 +1,16 @@ -// 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. +/* Copyright 2013 Google Inc. All Rights Reserved. + + Distributed under MIT license. + See file LICENSE for detail or copy at https://opensource.org/licenses/MIT +*/ + +/* A very simple commandline tool for decompressing woff2 format files to true + type font files. */ #include <string> #include "./file.h" -#include "./woff2_dec.h" +#include <woff2/decode.h> int main(int argc, char **argv) { @@ -32,6 +24,7 @@ int main(int argc, char **argv) { string filename(argv[1]); string outfilename = filename.substr(0, filename.find_last_of(".")) + ".ttf"; + // Note: update woff2_dec_fuzzer_new_entry.cc if this pattern changes. string input = woff2::GetFileContent(filename); const uint8_t* raw_input = reinterpret_cast<const uint8_t*>(input.data()); string output(std::min(woff2::ComputeWOFF2FinalSize(raw_input, input.size()), |