Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the duplicated process to force decode (draw on bitmap context) in Image/IO's progressive decoding. #2314

Merged

Conversation

@dreampiggy
Copy link
Contributor

dreampiggy commented May 4, 2018

New Pull Request Checklist

  • I have read and understood the CONTRIBUTING guide

  • I have read the Documentation

  • I have searched for a similar pull request in the project and found none

  • I have updated this branch with the latest master to avoid conflicts (via merge from master or rebase)

  • I have added the required tests to prove the fix/feature I am adding

  • I have updated the documentation (if necessary)

  • I have run the tests and they pass

  • I have run the lint and it passes (pod lib lint)

This merge request fixes / reffers to the following issues: #2303 #2309

Pull Request Description

This PR is cherry-picked from #2303 which is merged in 5.x. This fix the extra draw during progressive decoding for JPEG/PNG images by Image/IO coder.

Tested with iOS 7 Real device, that fix is also works. So we should merge this into 4.x branch as well.

…) in Image/IO's progressive decoding.
@dreampiggy dreampiggy added this to the 4.3.4 milestone May 4, 2018
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented May 4, 2018

Codecov Report

Merging #2314 into master will decrease coverage by 0.17%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2314      +/-   ##
==========================================
- Coverage   75.81%   75.64%   -0.18%     
==========================================
  Files          36       36              
  Lines        3751     3736      -15     
==========================================
- Hits         2844     2826      -18     
- Misses        907      910       +3
Impacted Files Coverage Δ
SDWebImage/SDWebImageImageIOCoder.m 81.04% <ø> (+0.04%) ⬆️
SDWebImage/SDWebImageDownloaderOperation.m 85.76% <0%> (-1.62%) ⬇️
SDWebImage/SDWebImageManager.m 73.45% <0%> (-1.43%) ⬇️
SDWebImage/SDImageCache.m 65.57% <0%> (+0.43%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 22e532c...ab854e3. Read the comment docs.

@dreampiggy

This comment has been minimized.

Copy link
Contributor Author

dreampiggy commented May 7, 2018

So, I just merge it. I test it using iPhone 5S (IOS 7) and it works. This can also avoid draw bitmap cause OOM.

@dreampiggy dreampiggy merged commit e9c824c into SDWebImage:master May 7, 2018
2 of 3 checks passed
2 of 3 checks passed
codecov/project 75.64% (-0.18%) compared to 22e532c
Details
codecov/patch Coverage not affected when comparing 22e532c...ab854e3
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@bpoplauschi bpoplauschi deleted the dreampiggy:fix_duplicated_force_decode_imageIO branch May 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.