summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorChris Palmer <palmer@chromium.org>2017-06-22 10:10:17 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-06-22 17:41:45 +0000
commit7726a581626bbb72d6ab294ae1adbad4ca10dfb0 (patch)
treeb9ab95fb40d0f05ef1cc2e3010d5ee75830714f1 /samples
parent9a25eded6f4afe3f4815a00b34b31d3a0fbadb69 (diff)
downloadpdfium-chromium/3140.tar.xz
Add a |gGeneralPartitionAllocator| and use it in the |FX_*Alloc| wrappers.chromium/3142chromium/3141chromium/3140chromium/3139
BUG=pdfium:690 Change-Id: I922279e4bdc8b411f47f49798155e8f9118c1396 Reviewed-on: https://pdfium-review.googlesource.com/6552 Commit-Queue: Chris Palmer <palmer@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'samples')
-rw-r--r--samples/DEPS1
-rw-r--r--samples/image_diff.cc3
2 files changed, 4 insertions, 0 deletions
diff --git a/samples/DEPS b/samples/DEPS
index fb322dee20..0a426d6e9c 100644
--- a/samples/DEPS
+++ b/samples/DEPS
@@ -5,4 +5,5 @@ include_rules = [
'+third_party/zlib',
'+v8',
'+core/fdrm/crypto/fx_crypt.h',
+ '+core/fxcrt/fx_memory.h',
]
diff --git a/samples/image_diff.cc b/samples/image_diff.cc
index 70c74c951c..21460f5a62 100644
--- a/samples/image_diff.cc
+++ b/samples/image_diff.cc
@@ -19,6 +19,7 @@
#include <string>
#include <vector>
+#include "core/fxcrt/fx_memory.h"
#include "samples/image_diff_png.h"
#include "third_party/base/logging.h"
#include "third_party/base/numerics/safe_conversions.h"
@@ -312,6 +313,8 @@ int DiffImages(const std::string& file1,
}
int main(int argc, const char* argv[]) {
+ FXMEM_InitializePartitionAlloc();
+
bool histograms = false;
bool produce_diff_image = false;
std::string filename1;