diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-03-31 16:45:04 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 16:45:09 +0000 |
| commit | 1d1165ca6575e082b892c5460492c411618783ad (patch) | |
| tree | d0c8be9303b4033e2eac559a104a9c1129430dbd /fuzz/fuzz.cpp | |
| parent | 43e5fd3e2095aa47630ff3a8b6da4139968d0492 (diff) | |
Revert "clean up (partially) colortable api"
This reverts commit 2e491a6a113c5e16a3b7bede5fa6f588deeb928d.
Reason for revert: Windows unit tests failing?
Original change's description:
> clean up (partially) colortable api
>
> Needs this to land: https://codereview.chromium.org/2789853002/
>
> Bug: skia:
> Change-Id: I38d916a546b7fa64d000d973e695ddda24a589e7
> Reviewed-on: https://skia-review.googlesource.com/10600
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Matt Sarett <msarett@google.com>
>
TBR=msarett@google.com,scroggo@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I626e7edfcea82576a440dcaa851a04cedee6233f
Reviewed-on: https://skia-review.googlesource.com/10966
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'fuzz/fuzz.cpp')
| -rw-r--r-- | fuzz/fuzz.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fuzz/fuzz.cpp b/fuzz/fuzz.cpp index 6764a62e44..d156680718 100644 --- a/fuzz/fuzz.cpp +++ b/fuzz/fuzz.cpp @@ -224,10 +224,11 @@ static void fuzz_img(sk_sp<SkData> bytes, uint8_t scale, uint8_t mode) { } SkBitmap bitmap; + SkMallocPixelRef::ZeroedPRFactory zeroFactory; SkCodec::Options options; options.fZeroInitialized = SkCodec::kYes_ZeroInitialized; - if (!bitmap.tryAllocPixels(decodeInfo, colorTable, SkBitmap::kZeroPixels_AllocFlag)) { + if (!bitmap.tryAllocPixels(decodeInfo, &zeroFactory, colorTable.get())) { SkDebugf("[terminated] Could not allocate memory. Image might be too large (%d x %d)", decodeInfo.width(), decodeInfo.height()); return; |