зеркало из https://github.com/mozilla/gecko-dev.git
75 строки
2.8 KiB
Diff
75 строки
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 {
|
|
|
|
@@ -200,16 +200,17 @@ bool OpenTypeGLAT_v3::Parse(const uint8_
|
|
if (prevent_decompression) {
|
|
return DropGraphite("Illegal nested compression");
|
|
}
|
|
std::vector<uint8_t> decompressed(this->compHead & FULL_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 {
|
|
|
|
@@ -38,16 +38,17 @@ bool OpenTypeSILF::Parse(const uint8_t*
|
|
if (prevent_decompression) {
|
|
return DropGraphite("Illegal nested compression");
|
|
}
|
|
std::vector<uint8_t> decompressed(this->compHead & FULL_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:
|