projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
skia
/
src
/
images
/
SkImageDecoder_libjpeg.cpp
diff --git
a/src/third_party/skia/src/images/SkImageDecoder_libjpeg.cpp
b/src/third_party/skia/src/images/SkImageDecoder_libjpeg.cpp
index
9b93716
..
99401e6
100644
(file)
--- a/
src/third_party/skia/src/images/SkImageDecoder_libjpeg.cpp
+++ b/
src/third_party/skia/src/images/SkImageDecoder_libjpeg.cpp
@@
-852,7
+852,7
@@
bool SkJPEGImageDecoder::onDecodeSubset(SkBitmap* bm, const SkIRect& region) {
return return_false(*cinfo, bitmap, "allocPixelRef");
}
} else {
- if (!bitmap.
a
llocPixels()) {
+ if (!bitmap.
tryA
llocPixels()) {
return return_false(*cinfo, bitmap, "allocPixels");
}
}