aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/gif
diff options
context:
space:
mode:
authorGravatar Leon Scroggins III <scroggo@google.com>2017-04-07 10:20:53 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-04-07 15:04:33 +0000
commit2d61e7170067129ca5dbf8fead23d9f2ae5947b5 (patch)
tree899bec6cb1e3503bb40b82de128c4c9f67ce18b7 /third_party/gif
parent28f5b779a3852227b6acea530d322ec721681534 (diff)
Simplify subset computation in SkGifImageReader
If xOffset or yOffset was not zero, these computations would not be evaluated anyway, so no need to add zero for these comparisons. (Split off from CL 9810) Change-Id: I8481eb257d96766696945cef4eafaff4281fb7d9 Reviewed-on: https://skia-review.googlesource.com/11782 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'third_party/gif')
-rw-r--r--third_party/gif/SkGifImageReader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/gif/SkGifImageReader.cpp b/third_party/gif/SkGifImageReader.cpp
index f617ccdc2a..f8a454a630 100644
--- a/third_party/gif/SkGifImageReader.cpp
+++ b/third_party/gif/SkGifImageReader.cpp
@@ -760,8 +760,8 @@ bool SkGifImageReader::parse(SkGifImageReader::SkGIFParseQuery query)
m_firstFrameSupportsIndex8 = true;
} else {
const bool frameIsSubset = xOffset > 0 || yOffset > 0
- || xOffset + width < m_screenWidth
- || yOffset + height < m_screenHeight;
+ || width < m_screenWidth
+ || height < m_screenHeight;
m_firstFrameHasAlpha = frameIsSubset;
m_firstFrameSupportsIndex8 = !frameIsSubset;
}