From 2d61e7170067129ca5dbf8fead23d9f2ae5947b5 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Fri, 7 Apr 2017 10:20:53 -0400 Subject: 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 Commit-Queue: Leon Scroggins --- third_party/gif/SkGifImageReader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/gif') 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; } -- cgit v1.2.3