mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 01:05:45 +00:00
b12c4363fb
Differential Revision: https://phabricator.services.mozilla.com/D44703 --HG-- rename : gfx/ots/src/cff_type2_charstring.cc => gfx/ots/src/cff_charstring.cc rename : gfx/ots/src/cff_type2_charstring.h => gfx/ots/src/cff_charstring.h rename : gfx/ots/tests/cff_type2_charstring_test.cc => gfx/ots/tests/cff_charstring_test.cc extra : moz-landing-system : lando
75 lines
2.8 KiB
Diff
75 lines
2.8 KiB
Diff
diff --git a/gfx/ots/src/glat.cc b/gfx/ots/src/glat.cc
|
|
--- a/gfx/ots/src/glat.cc
|
|
+++ b/gfx/ots/src/glat.cc
|
|
@@ -4,9 +4,9 @@
|
|
|
|
#include "glat.h"
|
|
|
|
#include "gloc.h"
|
|
-#include "lz4.h"
|
|
+#include "mozilla/Compression.h"
|
|
#include <list>
|
|
|
|
namespace ots {
|
|
|
|
@@ -212,16 +212,17 @@ bool OpenTypeGLAT_v3::Parse(const uint8_
|
|
return DropGraphite("Decompressed size exceeds 30MB: %gMB",
|
|
decompressed_size / (1024.0 * 1024.0));
|
|
}
|
|
std::vector<uint8_t> decompressed(decompressed_size);
|
|
- int ret = LZ4_decompress_safe_partial(
|
|
+ size_t outputSize = 0;
|
|
+ bool ret = mozilla::Compression::LZ4::decompressPartial(
|
|
reinterpret_cast<const char*>(data + table.offset()),
|
|
- reinterpret_cast<char*>(decompressed.data()),
|
|
table.remaining(), // input buffer size (input size + padding)
|
|
+ reinterpret_cast<char*>(decompressed.data()),
|
|
decompressed.size(), // target output size
|
|
- decompressed.size()); // output buffer size
|
|
- if (ret < 0 || unsigned(ret) != decompressed.size()) {
|
|
- return DropGraphite("Decompression failed with error code %d", ret);
|
|
+ &outputSize); // return output size
|
|
+ if (!ret || outputSize != decompressed.size()) {
|
|
+ return DropGraphite("Decompression failed");
|
|
}
|
|
return this->Parse(decompressed.data(), decompressed.size(), true);
|
|
}
|
|
default:
|
|
diff --git a/gfx/ots/src/silf.cc b/gfx/ots/src/silf.cc
|
|
--- a/gfx/ots/src/silf.cc
|
|
+++ b/gfx/ots/src/silf.cc
|
|
@@ -4,9 +4,9 @@
|
|
|
|
#include "silf.h"
|
|
|
|
#include "name.h"
|
|
-#include "lz4.h"
|
|
+#include "mozilla/Compression.h"
|
|
#include <cmath>
|
|
|
|
namespace ots {
|
|
|
|
@@ -50,16 +50,17 @@ bool OpenTypeSILF::Parse(const uint8_t*
|
|
return DropGraphite("Decompressed size exceeds 30MB: %gMB",
|
|
decompressed_size / (1024.0 * 1024.0));
|
|
}
|
|
std::vector<uint8_t> decompressed(decompressed_size);
|
|
- int ret = LZ4_decompress_safe_partial(
|
|
+ size_t outputSize = 0;
|
|
+ bool ret = mozilla::Compression::LZ4::decompressPartial(
|
|
reinterpret_cast<const char*>(data + table.offset()),
|
|
- reinterpret_cast<char*>(decompressed.data()),
|
|
table.remaining(), // input buffer size (input size + padding)
|
|
+ reinterpret_cast<char*>(decompressed.data()),
|
|
decompressed.size(), // target output size
|
|
- decompressed.size()); // output buffer size
|
|
- if (ret < 0 || unsigned(ret) != decompressed.size()) {
|
|
- return DropGraphite("Decompression failed with error code %d", ret);
|
|
+ &outputSize); // return output size
|
|
+ if (!ret || outputSize != decompressed.size()) {
|
|
+ return DropGraphite("Decompression failed");
|
|
}
|
|
return this->Parse(decompressed.data(), decompressed.size(), true);
|
|
}
|
|
default:
|