diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-12 01:25:43 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-12 01:25:43 +0100 |
| commit | 263d8500ce68b279a2d055c322f0ab3eab634989 (patch) | |
| tree | 9f258c3d6186346dc4435427ce6565ec376efd5d /image/ImageOps.cpp | |
| parent | b06821da15b7ab2573cd18aea8048b94266e3a97 (diff) | |
| parent | 8beab28bfff78ccefc8677c5bdddd6f60c544600 (diff) | |
| download | uxp-263d8500ce68b279a2d055c322f0ab3eab634989.tar.gz | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/components/preferences/advanced.xul
# application/palemoon/config/version.txt
# modules/libpref/init/all.js
Diffstat (limited to 'image/ImageOps.cpp')
| -rw-r--r-- | image/ImageOps.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/image/ImageOps.cpp b/image/ImageOps.cpp index addee7f155..ddd2f200e5 100644 --- a/image/ImageOps.cpp +++ b/image/ImageOps.cpp @@ -126,7 +126,7 @@ ImageOps::DecodeToSurface(nsIInputStream* aInputStream, } // Run the decoder synchronously. - RefPtr<IDecodingTask> task = new AnonymousDecodingTask(WrapNotNull(decoder)); + RefPtr<IDecodingTask> task = new AnonymousDecodingTask(WrapNotNull(decoder), /* aResumable */ false); task->Run(); if (!decoder->GetDecodeDone() || decoder->HasError()) { return nullptr; |