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.

Sign up for GitHub

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

Jump to bottom

Image scale for @3x #1005

Closed
wants to merge 1 commit into from
Closed

Image scale for @3x #1005

wants to merge 1 commit into from

Conversation

imrazor
Copy link

@imrazor imrazor commented Jan 7, 2015

Image scale for @3x

Image scale for @3x
2f0d388 
Image scale for @3x
bpoplauschi added a commit that referenced this pull request Mar 19, 2015
@bpoplauschi
@3x support - replaced #1005
9620fff
@bpoplauschi
Copy link
Member

Replaced by 9620fff since this one can't be merged (git conflict).

@bpoplauschi bpoplauschi added this to the 4.0.0 milestone Mar 19, 2015
heroims pushed a commit to heroims/SDWebImage that referenced this pull request May 28, 2015
@bpoplauschi @heroims
@3x support - replaced SDWebImage#1005
cab15d5
@bpoplauschi bpoplauschi modified the milestones: 3.7.3, 4.0.0 Jun 24, 2015
heroims pushed a commit to heroims/SDWebImage that referenced this pull request Nov 11, 2015
Squashed commit of the following:
16ec1e2 
commit 30e9e0b
Merge: a090531 11c7efb
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Fri Oct 30 20:36:28 2015 +0200

    Merge pull request SDWebImage#1358 from hoseking/master

    Add CocoaPods support for tvOS

commit 11c7efb
Author: hoseking <steviehosking@gmail.com>
Date:   Fri Oct 30 09:36:10 2015 -0700

    Add CocoaPods support for tvOS

commit a090531
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Oct 29 22:02:22 2015 +0200

    Updated Readme

commit f9abff8
Merge: 8dcc5b5 92e3816
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Tue Oct 27 15:32:00 2015 +0200

    Merge pull request SDWebImage#1350 from eikemeier/master

    Fix compilation error introduced in commit 6406d8e

commit 92e3816
Author: Oliver Eikemeier <oliver.eikemeier@zalando.de>
Date:   Tue Oct 27 13:44:19 2015 +0100

    Fix compilation error introduced in commit 6406d8e

commit 8dcc5b5
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Mon Oct 26 11:39:19 2015 +0200

    Updated Readme - fixed type

commit 6b5f323
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Sun Oct 25 20:44:35 2015 +0200

    Updated .gitignore

commit c8c0081
Merge: 5b05d6c 04a0431
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Sun Oct 25 19:37:13 2015 +0200

    Merge pull request SDWebImage#1221 from harishkashyap/master

commit 04a0431
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Sun Oct 25 19:35:26 2015 +0200

    Making sure all access to self.runningOperations is synchronized

commit ac98896
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Sun Oct 25 19:32:31 2015 +0200

    Code style

commit 6406d8e
Author: Harish Krishnamurthy <hkrishnamurthy@wayfair.com>
Date:   Wed Jan 21 13:27:18 2015 -0500

    Modifies SDWebImagePrefetcher prefetching logic.
    - Removes recursive calls to startPrefetchingAtIndex.
    - Uses dispatch_apply with striding to optimize the performance.

commit 5b05d6c
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Sun Oct 25 19:24:50 2015 +0200

    Replaced SDWebImage#1258 - Removing "and" from method names per https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/CodingGuidelines/Articles/NamingMethods.html

commit 53ef2dc
Merge: 0e4dbe1 65fbc3b
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Sun Oct 25 19:19:45 2015 +0200

    Merge pull request SDWebImage#1340 from lagapollo/lagapollo-patch-1

    Memory usage upgrade

commit 0e4dbe1
Merge: 32923fa 07fe1f0
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Sun Oct 25 16:05:45 2015 +0200

    Merge pull request SDWebImage#1327 from hoseking/tvOS

    Add support for tvOS

commit 32923fa
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Sun Oct 25 15:58:45 2015 +0200

    Xcode 7.1 updates

commit dcb7985
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Sun Oct 25 15:57:52 2015 +0200

    Replaced SDWebImage#1345 - Added urlCredential property to SDWebImageDownloader

commit 3b9c091
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Sat Oct 24 14:08:56 2015 +0300

    Updated Readme

commit 07fe1f0
Author: hoseking <steviehosking@gmail.com>
Date:   Tue Oct 6 16:14:27 2015 -0700

    Update project settings for Xcode 7

commit 4068b93
Author: hoseking <steviehosking@gmail.com>
Date:   Tue Oct 6 15:58:23 2015 -0700

    Add tvOS Framework target

commit 0ecd136
Merge: bf899e2 7ba8208
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Thu Oct 15 18:12:19 2015 +0300

    Merge pull request SDWebImage#1341 from mihaiserban/master

    iOS 9 App Transport Security Demo Target

commit 7ba8208
Author: Serban Mihai <mihaiserban2@gmail.com>
Date:   Thu Oct 15 16:46:40 2015 +0300

    iOS 9 App Transport Security Demo Target

    fixed ios 9 load images caused by new App Transport Security feature

commit bf899e2
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Tue Oct 13 14:38:15 2015 +0300

    Fixed the error that was causing the Travis builds to fail

    The issue was: since CocoaPods 0.38.0, the way pod headers are created on disk changed (see for example core-plot/core-plot#204). This caused the webp/decode.h file to be unaccessible from CocoaPods installations. We could not change the import to libwebp/webp/decode.h since our git clone installation would then fail (as the path for that is Vendors/libwebp/src/webp). The solution was to rely on the COCOAPODS macro to make 2 different imports for Cocoapods and the other installation type.

commit c1f6aec
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Tue Oct 13 12:01:22 2015 +0300

    Added CHANGELOG.md

commit 782c682
Merge: eec1b67 233b6c2
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Oct 8 13:33:28 2015 +0300

    Merge pull request SDWebImage#1331 from 102errors/master

    spelling

commit 233b6c2
Author: 102errors <102errors@sina.com>
Date:   Fri Oct 9 18:21:44 2015 +0800

    spelling

commit 65fbc3b
Author: lagapollo <lagapollo@users.noreply.github.com>
Date:   Wed Oct 7 17:20:45 2015 +0200

    Memory usage upgrade

    autorelease the bitmap context for clearing cache when memory warnings

commit eec1b67
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Tue Oct 6 16:59:48 2015 +0300

    Updated Readme (subspecs)

commit a16d007
Author: Bogdan Poplauschi <bogdan.poplauschi@yardi.com>
Date:   Wed Sep 30 18:56:33 2015 +0300

    Updated SDWebImage#976 according to comments via review

commit 577fefa
Merge: 7a48ca6 9af7460
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Wed Sep 30 18:51:06 2015 +0300

    Merge pull request SDWebImage#976 from ghazel/file-extension

    append the original path extension to the hash filename. closes SDWebImage#967

commit 7a48ca6
Merge: 2d748f1 20c77af
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Sep 30 08:39:19 2015 +0300

    Merge pull request SDWebImage#1323 from initlifeinc/master

    don't to perform download if url is "" but not nil

commit 20c77af
Merge: 2d748f1 5f0594f
Author: initlife <initlife.inc@gmail.com>
Date:   Wed Sep 30 10:59:02 2015 +0800

    Merge pull request SDWebImage#1 from initlifeinc/initlifeinc-patch-1

    don't to perform download if url is "" but not nil

commit 5f0594f
Author: initlife <initlife.inc@gmail.com>
Date:   Wed Sep 30 10:58:17 2015 +0800

    don't to perform download if url is "" but not nil

    sometimes user may pass @"" as url to sdwebimage to download, now it will also run NSURLConnection and try to download, actually there is no need to do this. I think maybe use url.absoluteString.length == 0 to avoid that url is not nil but a empty string will be better

commit 2d748f1
Merge: 3af1a30 944fd77
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Tue Sep 29 10:27:51 2015 +0300

    Merge pull request SDWebImage#1321 from mythodeia/master

    Added a new constructor to SDWebImagePrefetcher

commit 944fd77
Author: KonstantinosK <aqurance.developers@aqurance.com>
Date:   Tue Sep 29 10:27:09 2015 +0300

    Added a new constructor to SDWebImagePrefetcher

    that allows it to be instantiated with any image manager

commit 3af1a30
Merge: 996fea9 46c5918
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Tue Sep 29 09:18:33 2015 +0300

    Merge pull request SDWebImage#1280 from atsusy/fix-uiimage-gif

    ```UIGraphicsBeginImageContextWithOptions``` and ```UIGraphicsEndImageContext``` should be inside the loop for each image

commit 996fea9
Merge: 6a28dc7 4786e98
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Tue Sep 29 08:41:49 2015 +0300

    Merge pull request SDWebImage#1308 from adrianmacneil/patch-2

    Add Swift installation tips

commit 6a28dc7
Merge: 7e6bd60 6814af4
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Tue Sep 29 08:38:33 2015 +0300

    Merge pull request SDWebImage#1276 from arielelkin/patch-2

    SDWebImagePrefetcher: remove logging

commit 7e6bd60
Merge: b185621 60cab8b
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Tue Sep 29 08:38:13 2015 +0300

    Merge pull request SDWebImage#1297 from mythodeia/master

    cleaner implementation of failedUrl error handling

commit b185621
Merge: 14842f6 05ce156
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Sep 23 09:01:54 2015 +0300

    Merge pull request SDWebImage#1310 from xzenon/patch

    Added support for SDWebImageAvoidAutoSetImage option to UIButton and highlighted UIImageView categories

commit 05ce156
Author: Xenon <xzenon@gmail.com>
Date:   Wed Sep 23 04:23:11 2015 +0300

    Added support for SDWebImageAvoidAutoSetImage option to UIButton and highlighted UIImageView

commit 4786e98
Author: Adrian Macneil <adrian.macneil@gmail.com>
Date:   Mon Sep 21 20:10:14 2015 -0700

    Add Swift installation tips

    Refs SDWebImage#993

commit 60cab8b
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Sep 16 23:26:45 2015 +0300

    cleaner implementation of failedUrl error handling

commit 14842f6
Merge: 5a5c65d 4d1abff
Author: Olivier Poitrey <rs@rhapsodyk.net>
Date:   Fri Sep 11 12:08:07 2015 -0700

    Merge pull request SDWebImage#1290 from adrianmacneil/patch-1

    Fix typo

commit 4d1abff
Author: Adrian Macneil <adrian.macneil@gmail.com>
Date:   Fri Sep 11 11:59:51 2015 -0700

    Fix typo

commit 46c5918
Author: Atsushi Kataoka <atsushi.kataoka@msmc.jp>
Date:   Wed Sep 2 11:12:59 2015 +0900

    Fix sd_animatedImageByScalingAndCroppingToSize:

commit 6814af4
Author: Ariel Elkin <arielelkin@gmail.com>
Date:   Mon Aug 31 10:49:33 2015 +0200

    SDWebImagePrefetcher: remove logging

    Remove macro that checks for DEBUG, SD_VERBOSE, and SD_LOG_NONE
    Remove calls to NSLog

commit 5a5c65d
Merge: 49f6e53 d00d368
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Fri Aug 21 18:53:35 2015 +0300

    Merge pull request SDWebImage#1268 from izackp/patch-1

    Fix unsupported colorspace issue.

commit d00d368
Author: Isaac Paul <izackp@gmail.com>
Date:   Fri Aug 21 10:59:07 2015 -0400

    Fix unsupported colorspace issue.

    Without this fix, this url: https://abs.twimg.com/sticky/default_profile_images/default_profile_3_normal.png isn't correctly decoded and the method returns a nil image.. perhaps there should be a failsafe that checks the return value and returns the input image instead if the return value is nil.

commit 49f6e53
Merge: 5f6287e c011d1a
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Sun Aug 16 18:29:54 2015 +0300

    Merge pull request SDWebImage#1257 from Coeur/spelling

    spelling

commit 5f6287e
Merge: 0df58e4 6edface
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Sun Aug 16 18:29:44 2015 +0300

    Merge pull request SDWebImage#1256 from esteluk/patch-1

    Fix typo "timeElasped" -> "timeElapsed"

commit c011d1a
Author: Antoine Cœur <coeur@gmx.fr>
Date:   Sun Aug 16 22:09:08 2015 +0800

    spelling

commit 6edface
Author: Nathan Wong <nathan.random@gmail.com>
Date:   Fri Aug 14 15:45:32 2015 +0100

    Fix typo "timeElasped" -> "timeElapsed"

commit 0df58e4
Merge: a45c722 fb62c3f
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Fri Jul 31 09:54:49 2015 +0300

    Merge pull request SDWebImage#1236 from mythodeia/master

    better handling of colorspace models

commit fb62c3f
Author: mythodeia <mythodeia@users.noreply.github.com>
Date:   Fri Jul 17 00:11:54 2015 +0300

    better handling of colorspace models

commit a45c722
Merge: be560a4 25b4c17
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Jul 16 00:11:12 2015 +0300

    Merge pull request SDWebImage#1218 from mythodeia/master

    progress callbacks now report on main thread

commit 25b4c17
Author: mythodeia <mythodeia@users.noreply.github.com>
Date:   Wed Jul 15 23:56:05 2015 +0300

    progress reports on main thread

commit be560a4
Merge: ae11cf7 df751e7
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Wed Jul 15 23:42:00 2015 +0300

    Merge pull request SDWebImage#1217 from mythodeia/master

    Import fixes from @mythodeia 's fork

commit df751e7
Author: mythodeia <mythodeia@users.noreply.github.com>
Date:   Wed Jul 15 11:35:03 2015 +0300

    added option to disable memory cache

    use this:
    ```shouldDisableMemoryCache``` to toggle memory cache

commit a9ea132
Author: mythodeia <mythodeia@users.noreply.github.com>
Date:   Wed Jul 15 11:04:44 2015 +0300

    disable iCloud backup

commit c68d585
Author: mythodeia <mythodeia@users.noreply.github.com>
Date:   Wed Jul 15 10:50:04 2015 +0300

    activity indicator added

    ```
    [cell.imageView setShowActivityIndicatorView:YES];
    [cell.imageView setIndicatorStyle:UIActivityIndicatorViewStyleGray];
    ```

commit 4cfb12c
Author: mythodeia <mythodeia@users.noreply.github.com>
Date:   Wed Jul 15 10:45:31 2015 +0300

    fix unsupported parameter combination issues

    when CGBitmapContextCreate is called

commit dcde40f
Author: mythodeia <mythodeia@users.noreply.github.com>
Date:   Wed Jul 15 10:43:29 2015 +0300

    set as default the device's screen scale

commit ae11cf7
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Jul 15 09:39:25 2015 +0300

    Update README.md

commit 0373b97
Merge: 5c7dc8c 79eb6e7
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Tue Jul 14 16:39:47 2015 +0300

    Merge pull request SDWebImage#1125 from pauruiz/CacheTests

    Cache tests

commit 5c7dc8c
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Mon Jul 13 23:02:15 2015 +0300

    Bumped podspec version

commit ba335fc
Merge: f611d5e 33c13e7
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Mon Jul 13 22:18:55 2015 +0300

    Merge pull request SDWebImage#1153 from LukeDurrant/CustomDiskCachePath
    Custom disk cache path

commit 33c13e7
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Mon Jul 13 22:18:33 2015 +0300

    Coding style updates

commit f611d5e
Merge: ef57824 4d6693c
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Jul 2 18:07:44 2015 +0300

    Merge pull request SDWebImage#1188 from bill350/master

    Add an option called "SDWebImageAvoidAutoImageFill" to avoid automati…

commit 4d6693c
Author: Jean-Charles SORIN <jean-charles@smartnsoft.com>
Date:   Wed Jul 1 10:11:35 2015 +0200

    Rename SDWebImageAvoidAutoImageFill option to SDWebImageAvoidAutoSetImage

commit ef57824
Merge: b111d62 d107a80
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Mon Jun 29 14:36:09 2015 +0300

    Merge pull request SDWebImage#1199 from keslcod/master

    A minor thing: Avoid compiler warning about the missing new line at the end of the file

commit d107a80
Author: Florian Buerger <flo@keslcod.com>
Date:   Mon Jun 29 11:48:49 2015 +0200

    Add newline to avoid compiler warning

commit b111d62
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Mon Jun 29 11:41:32 2015 +0300

    Revert "Fixing casing for #import "webp/decode.h" (#import "WebP/decode.h") not"

    This reverts commit 48d4adc.

commit 511ce99
Merge: 7e160e3 48d4adc
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Jun 25 10:38:04 2015 +0300

    Merge pull request SDWebImage#1196 from unlucio/webp-case

    Fixing casing for #import "webp/decode.h"

commit 48d4adc
Author: unLucio <unlucio@gmail.com>
Date:   Thu Jun 25 11:04:55 2015 +0400

    Fixing casing for #import "webp/decode.h" (#import "WebP/decode.h") not
    working on case sensitive HDs

commit 7e160e3
Merge: 466e401 8f309e1
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Jun 25 01:33:39 2015 +0300

    Merge pull request SDWebImage#1158 from akmarinov/master

    Fixed an issue that causes URLs with trailing parameters to be assign…

commit 466e401
Merge: 08e9962 9f719ca
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Jun 25 01:15:01 2015 +0300

    Merge pull request SDWebImage#1138 from KoCMoHaBTa/KoCMoHaBTa-patch-1074

    Applied patch for issue SDWebImage#1074

commit 08e9962
Merge: 7692bd2 be07912
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Jun 24 19:34:50 2015 +0300

    Merge pull request SDWebImage#1167 from jiangmingz/patch-2

    fix ImageIO: CGImageSourceCreateWithData data parameter is nil

commit 7692bd2
Merge: 2ee4bfe e622b29
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Jun 24 19:24:47 2015 +0300

    Merge pull request SDWebImage#1178 from marciomeschini/marco/fix_accept_header

    add webp accepted content type only if WebP enabled

commit 2ee4bfe
Merge: 8021ddd db4f3fc
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Jun 24 19:12:09 2015 +0300

    Merge pull request SDWebImage#1159 from stephanecopin/errorCodeFailedURLs

    Add handling for additional error codes that shouldn't be considered a permanent failure

commit 8021ddd
Merge: 0e761f4 38a6edb
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Jun 24 19:10:02 2015 +0300

    Merge pull request SDWebImage#1121 from archfear/transparancy_fix

    Fix for transparency being lost in transformed images.

commit db4f3fc
Author: stephane-fueled <stephane@fueled.com>
Date:   Wed Jun 24 10:57:16 2015 -0400

    fix(): simplify logic for failed URLs error code on iOS6/7

commit 4499441
Author: stephane-fueled <stephane@fueled.com>
Date:   Tue May 26 17:47:02 2015 +0100

    feat(failedURLs): add additional error codes that shouldn't be considered as a permanent failure

commit e622b29
Author: Marco Meschini <marciomeschini@gmail.com>
Date:   Wed Jun 24 09:58:19 2015 +0100

    fix directive

    apologies. yeah, #elseif was quite inappropriate for this case

commit 0e761f4
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Jun 24 10:37:31 2015 +0300

    404 image url was causing the test to fail

commit 43115af
Merge: 01a5cfb 1f65ca7
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Jun 24 09:56:35 2015 +0300

    Merge pull request SDWebImage#1177 from aschuch/master

    libwebp submodule moved to another location

commit 01a5cfb
Merge: 48d10c1 ef1a1c3
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Wed Jun 24 09:52:53 2015 +0300

    Merge pull request SDWebImage#1193 from rs/revert-1175-master

    Revert "Fixes http://git.chromium.org/webm/libwebp.git/info/refs not …

commit ef1a1c3
Author: Konstantinos K <mythodeia@users.noreply.github.com>
Date:   Wed Jun 24 09:47:14 2015 +0300

    Revert "Fixes http://git.chromium.org/webm/libwebp.git/info/refs not valid"

commit 5d2963a
Author: Jean-Charles SORIN <jean-charles@smartnsoft.com>
Date:   Thu Jun 18 19:18:45 2015 +0200

    Add an option called "SDWebImageAvoidAutoImageFill" to avoid automatic image addition in UIImageView and let developer to do it himself

commit 26698f9
Author: Marco Meschini <marciomeschini@gmail.com>
Date:   Fri Jun 12 16:58:04 2015 +0100

    add webp accepted content type only if WebP enabled

    Send WebP as accepted content type only if it is enabled. In case it's not, stick with the standard formats in order to avoid the server sending us back WebP images.

commit 48d10c1
Merge: 8f3b5e9 dfc57ac
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Fri Jun 12 18:13:56 2015 +0300

    Merge pull request SDWebImage#1175 from joelchen/master

    Fixes http://git.chromium.org/webm/libwebp.git/info/refs not valid

commit 1f65ca7
Author: Alexander Schuch <acc@schuch.me>
Date:   Fri Jun 12 16:48:10 2015 +0200

    Update .gitmodules

commit dfc57ac
Author: Joel <joel@leappmobile.com>
Date:   Thu Jun 11 15:14:23 2015 +0800

    Fix http://git.chromium.org/webm/libwebp.git/info/refs not valid

commit 8f3b5e9
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Mon Jun 8 10:05:58 2015 +0300

    fixed typ in method description

    should say asynchronously in methods ```removeImageForKey...```

commit be07912
Author: 拔萝卜的☂Tank <zhaojiangming@gmail.com>
Date:   Tue Jun 2 20:23:40 2015 +0800

    Update UIImage+MultiFormat.m

    fix <Error>: ImageIO: CGImageSourceCreateWithData data parameter is nil bug

commit 8f309e1
Author: Andrey Marinov <akmarinov@gmail.com>
Date:   Mon May 25 19:48:23 2015 +0300

    Fixed an issue that causes URLs with trailing parameters to be assigned an incorrect image scale value

commit d7bc2c0
Author: Luke Durrant <contact@lukedurrant.com>
Date:   Wed May 20 17:30:23 2015 +1000

    Improved by using makeDiskCachePath

commit 737140d
Author: Luke Durrant <contact@lukedurrant.com>
Date:   Wed May 20 17:28:06 2015 +1000

    Added support for custom disk cache folder with fall back for caches directory

commit 91b4251
Merge: 393d4f1 a897811
Author: Olivier Poitrey <rs@rhapsodyk.net>
Date:   Sun May 17 21:06:19 2015 -0700

    Merge pull request SDWebImage#1085 from flovilmart/AppExtensionSafe

    Determines at runtime is UIApplication is available as per SDWebImage#1082

commit 393d4f1
Merge: a516881 78be42e
Author: Olivier Poitrey <rs@rhapsodyk.net>
Date:   Wed May 13 12:14:50 2015 -0700

    Merge pull request SDWebImage#1143 from rromanchuk/feature/auto-purge-on-memory-event

    Purge nscache on system memory notifications

commit 78be42e
Author: Ryan Romanchuk <rromanchuk@gmail.com>
Date:   Wed May 13 11:03:13 2015 -0700

    Use subclassed NSCache

commit 4756d5d
Author: Ryan Romanchuk <rromanchuk@gmail.com>
Date:   Tue May 12 16:24:23 2015 -0700

    Purge nscache on system memory notifications

commit a516881
Merge: 98989d9 9ae8f97
Author: Konstantinos K. <mythodeia@users.noreply.github.com>
Date:   Tue May 12 08:37:14 2015 +0300

    Merge pull request SDWebImage#1111 from molon/master

    failedURLs can be removed at the appropriate time.

commit 98989d9
Merge: 704c630 f72f4c1
Author: Olivier Poitrey <rs@rhapsodyk.net>
Date:   Mon May 11 12:48:37 2015 -0700

    Merge pull request SDWebImage#1140 from rromanchuk/feature/add-count-limits

    Add NSCache countLimit property

commit f72f4c1
Author: Ryan Romanchuk <rromanchuk@gmail.com>
Date:   Mon May 11 11:02:33 2015 -0700

    Add NSCache countLimit property in attempts to get better control of cache eviction.

commit 9f719ca
Author: Milen Halachev <milenski88@gmail.com>
Date:   Fri May 8 02:56:08 2015 +0300

    Applied patch for issue SDWebImage#1074

    When the code is copied within a swift module, or when a target is linked against the static library or when using from cocoapods - the debugger not longer gets broken.

commit 79eb6e7
Author: Pau Ruiz <pau@fazerbcn.org>
Date:   Sun Apr 19 10:01:35 2015 +0100

    Added all methods of the cache module, almost all directly and some of them indirectly used
    Unable to test sync call to diskImageExistsWithKey, hoped due to problems with the file manager and the test bundle being different from the main bundle

commit 66ddb23
Author: Pau Ruiz <pau@fazerbcn.org>
Date:   Sun Apr 19 09:24:34 2015 +0100

    Added image for testing cache

commit 9ae8f97
Author: molon <dudl@qq.com>
Date:   Wed Apr 8 18:24:52 2015 +0800

    failedURLs can be removed at the appropriate time.

commit 38a6edb
Author: Dan Dofter <dan@dofter.com>
Date:   Thu Apr 2 17:50:20 2015 -0700

    Only store an image with unknown format as PNG if it has an alpha channel.

commit 7e50d78
Author: Pete Callaway <pete@dativestudios.com>
Date:   Thu Aug 14 11:48:38 2014 +0100

    Don’t pass the original image data to be cached if the image has been transformed as transparency may have been added

commit 704c630
Merge: 6690de8 4dd5a66
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Tue Mar 31 12:32:37 2015 +0300

    Merge pull request SDWebImage#1104 from pollarm/master

    Fix parenthesis to avoid crashes

commit 4dd5a66
Author: Mike Pollard <mikepollard@Mikes-MacBook-Pro.local>
Date:   Mon Mar 30 21:30:16 2015 +0100

    Fix parenthesis to avoid crashes

commit 6690de8
Merge: 70dfe15 9c00f5c
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Mon Mar 30 12:04:02 2015 +0300

    Merge pull request SDWebImage#1101 from samritchie/master

    Carthage build fails in Xcode 6.2

commit 9c00f5c
Author: Sam Ritchie <sam@codesplice.com.au>
Date:   Sun Mar 29 12:29:25 2015 +0800

    Changed deployment target to 8.0

commit a897811
Author: Florent Vilmart <florentvilmart@me.com>
Date:   Sun Mar 22 16:40:44 2015 -0400

    Lowers deployment target to 8.0

commit a66a790
Author: Florent Vilmart <florentvilmart@me.com>
Date:   Fri Mar 20 18:37:55 2015 -0400

    Replaces direct calls to UIApplication by peformSelector

commit 17a4803
Author: Florent Vilmart <florentvilmart@me.com>
Date:   Fri Mar 20 15:29:28 2015 -0400

    Determines at runtime is UIApplication is available as per SDWebImage#1082

commit 70dfe15
Merge: 9620fff f2252b3
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Fri Mar 20 08:28:49 2015 +0200

    Merge pull request SDWebImage#1081 from flovilmart/Carthage

    Adds shared scheme for WebImage in SDWebImage.xcodeproj

commit f2252b3
Author: Florent Vilmart <florentvilmart@me.com>
Date:   Thu Mar 19 21:15:53 2015 -0400

    Adds shared scheme for WebImage in SDWebImage.xcodeproj

commit 9620fff
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Thu Mar 19 23:44:25 2015 +0200

    @3x support - replaced SDWebImage#1005

commit 4f97897
Merge: cd0c57f 4445bb2
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Mar 19 23:38:13 2015 +0200

    Merge pull request SDWebImage#1045 from mariusschulz/patch-1

    Updates Podfile entry to v3.7

commit cd0c57f
Merge: 2b68869 c0c5e0d
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Mar 19 23:33:06 2015 +0200

    Merge pull request SDWebImage#1071 from flovilmart/Carthage

    Adds support for iOS 8+ Framework and Carthage

commit c0c5e0d
Author: Florent Vilmart <florentvilmart@me.com>
Date:   Thu Mar 19 14:14:11 2015 -0400

    Adds Carthage WebImage scheme to workspace

commit 2b68869
Merge: d56c4f3 021607a
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Mar 19 14:23:33 2015 +0200

    Merge pull request SDWebImage#1075 from ikesyo/refactor-image-cache-cost

    [Refactor] Implement cache cost calculation as a inline function

commit d56c4f3
Merge: eac0b81 f83abb5
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Mar 19 14:19:58 2015 +0200

    Merge pull request SDWebImage#1054 from heistings/develop

    Use __typeof(self) when assigning weak reference for block.

commit eac0b81
Merge: 85dde52 6468a92
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Mar 19 14:13:34 2015 +0200

    Merge pull request SDWebImage#1041 from john-07/master

    allow override diskCachePath

commit 85dde52
Merge: 88ee3c6 dadb740
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Mar 19 14:10:13 2015 +0200

    Merge pull request SDWebImage#1038 from rounak/patch-1

    fixed typo

commit 88ee3c6
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Thu Mar 19 13:52:44 2015 +0200

    Replacing SDWebImage#1018 - avoid warning "<Error>: ImageIO: CGImageSourceCreateWithData data parameter is nil" if imageData is nil

commit 6e94724
Merge: 7f99c01 0e04794
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Mar 19 13:47:17 2015 +0200

    Merge pull request SDWebImage#1017 from warld-limited/prefetcher_patch

    [Memory Issue] Clear SDWebImagePrefetcher progressBlock when it has completed

commit 7f99c01
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Thu Mar 19 12:10:59 2015 +0200

    Replaces SDWebImage#1016

commit 72ed897
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Thu Mar 19 12:09:45 2015 +0200

    Formatting in the readme.md

commit 8431481
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Thu Mar 19 12:06:55 2015 +0200

    Added some files to the workspace so they are easier to edit

commit fb20630
Merge: beabb18 dad2a92
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Mar 19 11:57:15 2015 +0200

    Merge pull request SDWebImage#985 from songfrank/master

    Bug fix:Collection <__NSArrayM: > was mutated while being enumerated

commit beabb18
Merge: 0ef0e07 ce73619
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Mar 19 11:54:01 2015 +0200

    Merge pull request SDWebImage#988 from wantedly/improve-operation-behavior

    Improve operation behavior

commit 0ef0e07
Merge: 27e3038 761b005
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Thu Mar 19 10:55:59 2015 +0200

    Merge pull request SDWebImage#1011 from mattjgalloway/error_domain

    Make a constant for the error domain

commit 27e3038
Merge: d41bfaf 210c13d
Author: Bogdan Poplauschi <bpoplauschi@users.noreply.github.com>
Date:   Wed Mar 18 11:24:55 2015 +0200

    Merge pull request SDWebImage#1076 from ikesyo/faild-urls-nsset

    [Refactor] Use NSMutableSet for failed URLs' storage instead of array

commit 210c13d
Author: Syo Ikeda <suicaicoca@gmail.com>
Date:   Wed Mar 18 12:33:28 2015 +0900

    [Refactor] Use NSMutableSet for failed URLs' storage instead of array

commit 021607a
Author: Syo Ikeda <suicaicoca@gmail.com>
Date:   Wed Mar 18 12:27:23 2015 +0900

    [Refactor] Implement cache cost calculation as a inline function

commit d41bfaf
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Tue Mar 17 16:53:00 2015 +0200

    Fix: xcodebuild: error: -destination implies architecture, -arch must not also be specified.

commit 6c29c8b
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Tue Mar 17 16:36:50 2015 +0200

    Another try to fix the travis builds

commit b3ad18e
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Tue Mar 17 16:14:33 2015 +0200

    Updated travis.yml

commit fd34a9a
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Tue Mar 17 15:55:16 2015 +0200

    Revert "Fixed SDWebImage#774 - remove deprecated methods. Since 4.0 is a major release, we don't need the backwards compatible methods"

    This reverts commit 62a8ee1.

commit 36f5b1e
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Tue Mar 17 15:43:11 2015 +0200

    The latest libwebp library has some warnings that cause our pod spec lint to fail

commit 76ed376
Author: Bogdan Poplauschi <bpoplauschi@gmail.com>
Date:   Tue Mar 17 15:29:07 2015 +0200

    Updated libwebp submodule hash to 0.4.3

commit 9ee8947
Author: Florent Vilmart <florentvilmart@me.com>
Date:   Sat Mar 14 15:06:39 2015 -0400

    Adds support for iOS 8+ Framework and Carthage
    Adds Instructions for Carthage installation

commit f83abb5
Author: 庞博 <bopang@sohu-inc.com>
Date:   Fri Mar 6 16:37:38 2015 +0800

    Use __typeof(self) when assigning weak reference for block.

    Signed-off-by: 庞博 <bopang@sohu-inc.com>

commit 4445bb2
Author: Marius Schulz <marius.schulz@me.com>
Date:   Tue Feb 24 10:49:22 2015 +0100

    Updates Podfile entry to v3.7

commit 6468a92
Author: Evgeny Petrov <john07.ru@gmail.com>
Date:   Mon Feb 16 15:56:30 2015 +0300

    allow override diskCachePath

commit dadb740
Author: Rounak <rounak91@gmail.com>
Date:   Tue Feb 10 17:54:33 2015 +0530

    fixed typo

    aync -> async

commit ce73619
Merge: 22750a1 feca1e8
Author: Naoki Morita <namorit@gmail.com>
Date:   Sat Jan 31 22:34:54 2015 +0900

    Merge branch 'master' of github.com:rs/SDWebImage

commit 0e04794
Author: Katsuma Ito <katsumai@gmail.com>
Date:   Tue Jan 20 18:31:07 2015 +0800

    Clear SDWebImagePrefetcher progressBlock when it has completed

    If progressblock captures objects, captured objects remain until next SDWebImagePrefetcher works.
    So, nil clear progressBlock as well as completionBlock.

commit 761b005
Author: Matt Galloway <mattjgalloway@fb.com>
Date:   Tue Jan 13 19:32:43 2015 +0000

    Make a constant for the error domain

commit 22750a1
Merge: 327c444 f7a2321
Author: Naoki Morita <naoki@wantedly.com>
Date:   Tue Dec 16 12:35:44 2014 +0900

    Merge branch 'improve-operation-behavior'

commit f7a2321
Author: Naoki Morita <naoki@wantedly.com>
Date:   Tue Dec 16 12:35:17 2014 +0900

    Fix typo.

commit d90d115
Author: Naoki Morita <naoki@wantedly.com>
Date:   Tue Dec 16 12:24:57 2014 +0900

    Fix notification name.

commit 327c444
Author: Naoki Morita <naoki@wantedly.com>
Date:   Tue Dec 16 12:23:41 2014 +0900

    Fix notification name.

commit cd977d7
Author: Naoki Morita <naoki@wantedly.com>
Date:   Tue Dec 16 11:48:26 2014 +0900

    Improve operation behavior to get more information of it.

commit dad2a92
Author: sfeng <ylsongfeng@gmail.com>
Date:   Mon Dec 15 03:20:39 2014 +0800

    Bug fix:Collection <__NSArrayM: > was mutated while being enumerated

commit 9af7460
Author: Greg Hazel <ghazel@gmail.com>
Date:   Sat Dec 6 13:06:29 2014 -0800

    append the original path extension to the hash filename. closes SDWebImage#967
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.7.3
Development

Successfully merging this pull request may close these issues.
2 participants
@imrazor @bpoplauschi