bumping the version to 0.9.3

Stop using spinlocks
Apple engineers have pointed out that OSSpinLocks are vulnerable to live locking on iOS in cases of priority inversion: . http://mjtsai.com/blog/2015/12/16/osspinlock-is-unsafe/ . https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20151214/000372.html
2016-01-18 00:11:47 +08:00 · 2016-01-15 15:42:36 +08:00 · 2016-01-14 18:48:39 +08:00 · 2016-01-06 21:18:10 +08:00 · 2016-01-06 17:02:41 +08:00 · 2015-12-28 23:42:40 +08:00
10 changed files with 137 additions and 101 deletions
@@ -0,0 +1,7 @@
+language: objective-c
+osx_image: xcode7
+xcode_project: Framework/YYImage.xcodeproj
+xcode_scheme: YYImage
+
+script:
+- xctool -project Framework/YYImage.xcodeproj -scheme YYImage build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
@@ -572,7 +572,7 @@ static inline void YYBenchmark(void (^block)(void), void (^complete)(double ms))
    CoverDecodeBlock yyCoverDecoder = ^(NSData *data) {
        @autoreleasepool {
            YYImageDecoder *decoder = [YYImageDecoder decoderWithData:data scale:1];
-            [decoder frameAtIndex:0 decodeForDisplay:YES];;
+            [decoder frameAtIndex:0 decodeForDisplay:YES];
        }
    };
    
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.0</string>
+	<string>0.9.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -2,9 +2,10 @@ YYImage <a href="#中文介绍">中文介绍</a>
 ==============
 [![License MIT](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://raw.githubusercontent.com/ibireme/YYImage/master/LICENSE)&nbsp;
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)&nbsp;
-[![Cocoapods](http://img.shields.io/cocoapods/v/YYImage.svg?style=flat)](http://cocoapods.org/?q= YYImage)&nbsp;
-[![Cocoapods](http://img.shields.io/cocoapods/p/YYImage.svg?style=flat)](http://cocoapods.org/?q= YYImage)&nbsp;
-[![Support](https://img.shields.io/badge/support-iOS%206%2B%20-blue.svg?style=flat)](https://www.apple.com/nl/ios/)
+[![CocoaPods](http://img.shields.io/cocoapods/v/YYImage.svg?style=flat)](http://cocoapods.org/?q= YYImage)&nbsp;
+[![CocoaPods](http://img.shields.io/cocoapods/p/YYImage.svg?style=flat)](http://cocoapods.org/?q= YYImage)&nbsp;
+[![Support](https://img.shields.io/badge/support-iOS%206%2B%20-blue.svg?style=flat)](https://www.apple.com/nl/ios/)&nbsp;
+[![Build Status](https://travis-ci.org/ibireme/YYImage.svg?branch=master)](https://travis-ci.org/ibireme/YYImage)

 Image framework for iOS to display/encode/decode animated WebP, APNG, GIF, and more.<br/>
 (It's a component of [YYKit](https://github.com/ibireme/YYKit))
@@ -21,6 +22,7 @@ Features
 - Fully compatible with UIImage and UIImageView class.
 - Extendable protocol for custom image animation.
 - Dynamic memory buffer for lower memory usage.
+- Fully documented.

 Usage
 ==============
@@ -128,7 +130,7 @@ Usage
 Installation
 ==============

-### Cocoapods
+### CocoaPods

 1. Update cocoapods to the latest version.
 1. Add `pod "YYImage"` to your Podfile.
@@ -148,21 +150,27 @@ Installation
 1. Download all the files in the YYImage subdirectory.
 2. Add the source files to your Xcode project.
 3. Link with required frameworks:
-	* UIKit.framework
-	* CoreFoundation.framework
-	* QuartzCore.framework
-	* AssetsLibrary.framework
-	* ImageIO.framework
-	* Accelerate.framework
-	* MobileCoreServices.framework
+	* UIKit
+	* CoreFoundation
+	* QuartzCore
+	* AssetsLibrary
+	* ImageIO
+	* Accelerate
+	* MobileCoreServices
 	* libz
 4. Add `Vendor/WebP.framework`(static library) to your Xcode project if you want to support webp.
 5. Import `YYImage.h`.


-About
+Documentation
 ==============
-This library supports iOS 6.0 and later.
+Full API documentation is available on [CocoaDocs](http://cocoadocs.org/docsets/YYImage/).<br/>
+You can also install documentation locally using [appledoc](https://github.com/tomaz/appledoc).
+
+
+Requirements
+==============
+This library requires a deployment target of iOS 6.0 or greater.


 License
@@ -177,6 +185,8 @@ YYImage is provided under the MIT license. See LICENSE file for details.
 YYImage: 功能强大的 iOS 图像框架。<br/>
 (该项目是 [YYKit](https://github.com/ibireme/YYKit) 组件之一)

+![niconiconi~](https://raw.github.com/ibireme/YYImage/master/Demo/YYImageDemo/niconiconi@2x.gif
+)

 特性
 ==============
@@ -190,7 +200,7 @@ YYImage: 功能强大的 iOS 图像框架。<br/>
 - 完全兼容 UIImage 和 UIImageView，使用方便。
 - 保留可扩展的接口，以支持自定义动画。
 - 高效的动态内存缓存管理，以保证高性能低内存的动画播放。
- 利用 ImageIO 与 Accelerate 实现高性能的图片编码解码。
+- 每个类和方法都有完善的文档注释。


 用法
@@ -300,7 +310,7 @@ YYImage: 功能强大的 iOS 图像框架。<br/>
 安装
 ==============

-### Cocoapods
+### CocoaPods

 1. 将 cocoapods 更新至最新版本.
 1. 在 Podfile 中添加 `pod "YYImage"`。
@@ -313,24 +323,28 @@ YYImage: 功能强大的 iOS 图像框架。<br/>
 1. 在 Cartfile 中添加 `github "ibireme/YYImage"`。
 2. 执行 `carthage update --platform ios` 并将生成的 framework 添加到你的工程。
 3. 导入 \<YYImage/YYImage.h\>。
-4. 注意: carthage framework 并没有包含 webp 组件。如果你需要支持 webp，可以用 Cocoapods 安装，或者手动安装。
+4. 注意: carthage framework 并没有包含 webp 组件。如果你需要支持 webp，可以用 CocoaPods 安装，或者手动安装。

 ### 手动安装

 1. 下载 YYImage 文件夹内的所有内容。
 2. 将 YYModel 内的源文件添加(拖放)到你的工程。
 3. 链接以下 frameworks:
-	* UIKit.framework
-	* CoreFoundation.framework
-	* QuartzCore.framework
-	* AssetsLibrary.framework
-	* ImageIO.framework
-	* Accelerate.framework
-	* MobileCoreServices.framework
+	* UIKit
+	* CoreFoundation
+	* QuartzCore
+	* AssetsLibrary
+	* ImageIO
+	* Accelerate
+	* MobileCoreServices
 	* libz
 4. 如果你需要支持 webp，可以将 `Vendor/WebP.framework`(静态库) 加入你的工程。
 5. 导入 `YYImage.h`。

+文档
+==============
+你可以在 [CocoaDocs](http://cocoadocs.org/docsets/YYImage/) 查看在线 API 文档，也可以用 [appledoc](https://github.com/tomaz/appledoc) 本地生成文档。
+

 关于
 ==============
@@ -340,3 +354,10 @@ YYImage: 功能强大的 iOS 图像框架。<br/>
 许可证
 ==============
 YYModel 使用 MIT 许可证，详情见 LICENSE 文件。
+
+
+相关链接
+==============
+[移动端图片格式调研](http://blog.ibireme.com/2015/11/02/mobile_image_benchmark/)<br/>
+
+[iOS 处理图片的一些小 Tip](http://blog.ibireme.com/2015/11/02/ios_image_tips/)
@@ -72,13 +72,13 @@
 #define PACKAGE "libwebp"

 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://code.google.com/p/webp/issues"
+#define PACKAGE_BUGREPORT "https://bugs.chromium.org/p/webp"

 /* Define to the full name of this package. */
 #define PACKAGE_NAME "libwebp"

 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libwebp 0.4.3"
+#define PACKAGE_STRING "libwebp 0.4.4"

 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libwebp"
@@ -87,7 +87,7 @@
 #define PACKAGE_URL "http://developers.google.com/speed/webp"

 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.4.3"
+#define PACKAGE_VERSION "0.4.4"

 /* Define to necessary symbol if this constant uses a non-standard name on
   your system. */
@@ -97,7 +97,7 @@
 #define STDC_HEADERS 1

 /* Version number of package */
-#define VERSION "0.4.3"
+#define VERSION "0.4.4"

 /* Enable experimental code */
 /* #undef WEBP_EXPERIMENTAL_FEATURES */
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
  s.name         = 'YYImage'
  s.summary      = 'Image framework for iOS to display/encode/decode animated WebP, APNG, GIF, and more.'
-  s.version      = '0.9.0'
+  s.version      = '0.9.3'
  s.license      = { :type => 'MIT', :file => 'LICENSE' }
  s.authors      = { 'ibireme' => 'ibireme@gmail.com' }
  s.social_media_url = 'http://blog.ibireme.com'
@@ -12,19 +12,18 @@
 #import "YYAnimatedImageView.h"
 #import "YYImageCoder.h"
 #import <pthread.h>
-#import <libkern/OSAtomic.h>
 #import <mach/mach.h>


 #define BUFFER_SIZE (10 * 1024 * 1024) // 10MB (minimum memory buffer size)

-#define LOCK(...) OSSpinLockLock(&self->_lock); \
+#define LOCK(...) dispatch_semaphore_wait(self->_lock, DISPATCH_TIME_FOREVER); \
 __VA_ARGS__; \
-OSSpinLockUnlock(&self->_lock);
+dispatch_semaphore_signal(self->_lock);

-#define LOCK_VIEW(...) OSSpinLockLock(&view->_lock); \
+#define LOCK_VIEW(...) dispatch_semaphore_wait(view->_lock, DISPATCH_TIME_FOREVER); \
 __VA_ARGS__; \
-OSSpinLockUnlock(&view->_lock);
+dispatch_semaphore_signal(view->_lock);


 static int64_t _YYDeviceMemoryTotal() {
@@ -113,12 +112,12 @@ static int64_t _YYDeviceMemoryFree() {



-typedef NS_ENUM(NSUInteger, YYAnimagedImageType) {
-    YYAnimagedImageTypeNone = 0,
-    YYAnimagedImageTypeImage,
-    YYAnimagedImageTypeHighlightedImage,
-    YYAnimagedImageTypeImages,
-    YYAnimagedImageTypeHighlightedImages,
+typedef NS_ENUM(NSUInteger, YYAnimatedImageType) {
+    YYAnimatedImageTypeNone = 0,
+    YYAnimatedImageTypeImage,
+    YYAnimatedImageTypeHighlightedImage,
+    YYAnimatedImageTypeImages,
+    YYAnimatedImageTypeHighlightedImages,
 };

@interface YYAnimatedImageView() {
@@ -126,7 +125,7 @@ typedef NS_ENUM(NSUInteger, YYAnimagedImageType) {
    UIImage <YYAnimatedImage> *_curAnimatedImage;
    
    dispatch_once_t _onceToken;
-    OSSpinLock _lock; ///< lock for _buffer
+    dispatch_semaphore_t _lock; ///< lock for _buffer
    NSOperationQueue *_requestQueue; ///< image request queue, serial
    
    CADisplayLink *_link; ///< ticker for change frame
@@ -197,6 +196,13 @@ typedef NS_ENUM(NSUInteger, YYAnimagedImageType) {
    return self;
 }

+- (instancetype)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    _runloopMode = NSRunLoopCommonModes;
+    _autoPlayAnimatedImage = YES;
+    return self;
+}
+
 - (instancetype)initWithImage:(UIImage *)image {
    self = [super init];
    _runloopMode = NSRunLoopCommonModes;
@@ -220,7 +226,7 @@ typedef NS_ENUM(NSUInteger, YYAnimagedImageType) {
 // init the animated params.
 - (void)resetAnimated {
    dispatch_once(&_onceToken, ^{
-        _lock = OS_SPINLOCK_INIT;
+        _lock = dispatch_semaphore_create(1);
        _buffer = [NSMutableDictionary new];
        _requestQueue = [[NSOperationQueue alloc] init];
        _requestQueue.maxConcurrentOperationCount = 1;
@@ -265,22 +271,22 @@ typedef NS_ENUM(NSUInteger, YYAnimagedImageType) {

 - (void)setImage:(UIImage *)image {
    if (self.image == image) return;
-    [self setImage:image withType:YYAnimagedImageTypeImage];
+    [self setImage:image withType:YYAnimatedImageTypeImage];
 }

 - (void)setHighlightedImage:(UIImage *)highlightedImage {
    if (self.highlightedImage == highlightedImage) return;
-    [self setImage:highlightedImage withType:YYAnimagedImageTypeHighlightedImage];
+    [self setImage:highlightedImage withType:YYAnimatedImageTypeHighlightedImage];
 }

 - (void)setAnimationImages:(NSArray *)animationImages {
    if (self.animationImages == animationImages) return;
-    [self setImage:animationImages withType:YYAnimagedImageTypeImages];
+    [self setImage:animationImages withType:YYAnimatedImageTypeImages];
 }

 - (void)setHighlightedAnimationImages:(NSArray *)highlightedAnimationImages {
    if (self.highlightedAnimationImages == highlightedAnimationImages) return;
-    [self setImage:highlightedAnimationImages withType:YYAnimagedImageTypeHighlightedImages];
+    [self setImage:highlightedAnimationImages withType:YYAnimatedImageTypeHighlightedImages];
 }

 - (void)setHighlighted:(BOOL)highlighted {
@@ -289,46 +295,46 @@ typedef NS_ENUM(NSUInteger, YYAnimagedImageType) {
    [self imageChanged];
 }

- (id)imageForType:(YYAnimagedImageType)type {
+- (id)imageForType:(YYAnimatedImageType)type {
    switch (type) {
-        case YYAnimagedImageTypeNone: return nil;
-        case YYAnimagedImageTypeImage: return self.image;
-        case YYAnimagedImageTypeHighlightedImage: return self.highlightedImage;
-        case YYAnimagedImageTypeImages: return self.animationImages;
-        case YYAnimagedImageTypeHighlightedImages: return self.highlightedAnimationImages;
+        case YYAnimatedImageTypeNone: return nil;
+        case YYAnimatedImageTypeImage: return self.image;
+        case YYAnimatedImageTypeHighlightedImage: return self.highlightedImage;
+        case YYAnimatedImageTypeImages: return self.animationImages;
+        case YYAnimatedImageTypeHighlightedImages: return self.highlightedAnimationImages;
    }
    return nil;
 }

- (YYAnimagedImageType)currentImageType {
-    YYAnimagedImageType curType = YYAnimagedImageTypeNone;
+- (YYAnimatedImageType)currentImageType {
+    YYAnimatedImageType curType = YYAnimatedImageTypeNone;
    if (self.highlighted) {
-        if (self.highlightedAnimationImages.count) curType = YYAnimagedImageTypeHighlightedImages;
-        else if (self.highlightedImage) curType = YYAnimagedImageTypeHighlightedImage;
+        if (self.highlightedAnimationImages.count) curType = YYAnimatedImageTypeHighlightedImages;
+        else if (self.highlightedImage) curType = YYAnimatedImageTypeHighlightedImage;
    }
-    if (curType == YYAnimagedImageTypeNone) {
-        if (self.animationImages.count) curType = YYAnimagedImageTypeImages;
-        else if (self.image) curType = YYAnimagedImageTypeImage;
+    if (curType == YYAnimatedImageTypeNone) {
+        if (self.animationImages.count) curType = YYAnimatedImageTypeImages;
+        else if (self.image) curType = YYAnimatedImageTypeImage;
    }
    return curType;
 }

- (void)setImage:(id)image withType:(YYAnimagedImageType)type {
+- (void)setImage:(id)image withType:(YYAnimatedImageType)type {
    [self stopAnimating];
    if (_link) [self resetAnimated];
    _curFrame = nil;
    switch (type) {
-        case YYAnimagedImageTypeNone: break;
-        case YYAnimagedImageTypeImage: super.image = image; break;
-        case YYAnimagedImageTypeHighlightedImage: super.highlightedImage = image; break;
-        case YYAnimagedImageTypeImages: super.animationImages = image; break;
-        case YYAnimagedImageTypeHighlightedImages: super.highlightedAnimationImages = image; break;
+        case YYAnimatedImageTypeNone: break;
+        case YYAnimatedImageTypeImage: super.image = image; break;
+        case YYAnimatedImageTypeHighlightedImage: super.highlightedImage = image; break;
+        case YYAnimatedImageTypeImages: super.animationImages = image; break;
+        case YYAnimatedImageTypeHighlightedImages: super.highlightedAnimationImages = image; break;
    }
    [self imageChanged];
 }

 - (void)imageChanged {
-    YYAnimagedImageType newType = [self currentImageType];
+    YYAnimatedImageType newType = [self currentImageType];
    id newVisibleImage = [self imageForType:newType];
    NSUInteger newImageFrameCount = 0;
    BOOL hasContentsRect = NO;
@@ -397,8 +403,8 @@ typedef NS_ENUM(NSUInteger, YYAnimagedImageType) {
 }

 - (void)startAnimating {
-    YYAnimagedImageType type = [self currentImageType];
-    if (type == YYAnimagedImageTypeImages || type == YYAnimagedImageTypeHighlightedImages) {
+    YYAnimatedImageType type = [self currentImageType];
+    if (type == YYAnimatedImageTypeImages || type == YYAnimatedImageTypeHighlightedImages) {
        NSArray *images = [self imageForType:type];
        if (images.count > 0) {
            [super startAnimating];
@@ -620,17 +626,21 @@ typedef NS_ENUM(NSUInteger, YYAnimagedImageType) {
    self = [super initWithCoder:aDecoder];
    _runloopMode = [aDecoder decodeObjectForKey:@"runloopMode"];
    if (_runloopMode.length == 0) _runloopMode = NSRunLoopCommonModes;
-    _autoPlayAnimatedImage = [aDecoder decodeBoolForKey:@"autoPlayAnimatedImage"];
+    if ([aDecoder containsValueForKey:@"autoPlayAnimatedImage"]) {
+        _autoPlayAnimatedImage = [aDecoder decodeBoolForKey:@"autoPlayAnimatedImage"];
+    } else {
+        _autoPlayAnimatedImage = YES;
+    }
    
    UIImage *image = [aDecoder decodeObjectForKey:@"YYAnimatedImage"];
    UIImage *highlightedImage = [aDecoder decodeObjectForKey:@"YYHighlightedAnimatedImage"];
    if (image) {
        self.image = image;
-        [self setImage:image withType:YYAnimagedImageTypeImage];
+        [self setImage:image withType:YYAnimatedImageTypeImage];
    }
    if (highlightedImage) {
        self.highlightedImage = highlightedImage;
-        [self setImage:highlightedImage withType:YYAnimagedImageTypeHighlightedImage];
+        [self setImage:highlightedImage withType:YYAnimatedImageTypeHighlightedImage];
    }
    return self;
 }
@@ -10,7 +10,6 @@
 //

 #import "YYImage.h"
-#import <libkern/OSAtomic.h>

 /**
 An array of NSNumber objects, shows the best order for path scale search.
@@ -88,7 +87,7 @@ static CGFloat _NSStringPathScale(NSString *string) {
@implementation YYImage {
    YYImageDecoder *_decoder;
    NSArray *_preloadedFrames;
-    OSSpinLock _preloadedLock;
+    dispatch_semaphore_t _preloadedLock;
    NSUInteger _bytesPerFrame;
 }

@@ -101,12 +100,12 @@ static CGFloat _NSStringPathScale(NSString *string) {
    NSString *path = nil;
    CGFloat scale = 1;
    
+    // If no extension, guess by system supported (same as UIImage).
+    NSArray *exts = ext.length > 0 ? @[ext] : @[@"", @"png", @"jpeg", @"jpg", @"gif", @"webp", @"apng"];
    NSArray *scales = _NSBundlePreferredScales();
    for (int s = 0; s < scales.count; s++) {
        scale = ((NSNumber *)scales[s]).floatValue;
        NSString *scaledName = _NSStringByAppendingNameScale(res, scale);
-        // If no extension, guess by system supported (same as UIImage).
-        NSArray *exts = ext.length > 0 ? @[ext] : @[@"", @"png", @"jpeg", @"jpg", @"gif", @"webp"];
        for (NSString *e in exts) {
            path = [[NSBundle mainBundle] pathForResource:scaledName ofType:e];
            if (path) break;
@@ -144,8 +143,8 @@ static CGFloat _NSStringPathScale(NSString *string) {

 - (instancetype)initWithData:(NSData *)data scale:(CGFloat)scale {
    if (data.length == 0) return nil;
-    if (scale <= 0) scale = 1;
-    _preloadedLock = OS_SPINLOCK_INIT;
+    if (scale <= 0) scale = [UIScreen mainScreen].scale;
+    _preloadedLock = dispatch_semaphore_create(1);
    @autoreleasepool {
        YYImageDecoder *decoder = [YYImageDecoder decoderWithData:data scale:scale];
        YYImageFrame *frame = [decoder frameAtIndex:0 decodeForDisplay:YES];
@@ -180,13 +179,13 @@ static CGFloat _NSStringPathScale(NSString *string) {
                    [frames addObject:[NSNull null]];
                }
            }
-            OSSpinLockLock(&_preloadedLock);
+            dispatch_semaphore_wait(_preloadedLock, DISPATCH_TIME_FOREVER);
            _preloadedFrames = frames;
-            OSSpinLockUnlock(&_preloadedLock);
+            dispatch_semaphore_signal(_preloadedLock);
        } else {
-            OSSpinLockLock(&_preloadedLock);
+            dispatch_semaphore_wait(_preloadedLock, DISPATCH_TIME_FOREVER);
            _preloadedFrames = nil;
-            OSSpinLockUnlock(&_preloadedLock);
+            dispatch_semaphore_signal(_preloadedLock);
        }
    }
 }
@@ -229,9 +228,9 @@ static CGFloat _NSStringPathScale(NSString *string) {

 - (UIImage *)animatedImageFrameAtIndex:(NSUInteger)index {
    if (index >= _decoder.frameCount) return nil;
-    OSSpinLockLock(&_preloadedLock);
+    dispatch_semaphore_wait(_preloadedLock, DISPATCH_TIME_FOREVER);
    UIImage *image = _preloadedFrames[index];
-    OSSpinLockUnlock(&_preloadedLock);
+    dispatch_semaphore_signal(_preloadedLock);
    if (image) return image == (id)[NSNull null] ? nil : image;
    return [_decoder frameAtIndex:index decodeForDisplay:YES].image;
 }
@@ -19,7 +19,6 @@
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <objc/runtime.h>
 #import <pthread.h>
-#import <libkern/OSAtomic.h>
 #import <zlib.h>


@@ -924,7 +923,7 @@ CGImageRef YYCGImageCreateAffineTransformCopy(CGImageRef imageRef, CGAffineTrans
    if (srcWidth == 0 || srcHeight == 0 || destWidth == 0 || destHeight == 0) return NULL;
    
    CGDataProviderRef tmpProvider = NULL, destProvider = NULL;
-    CGImageRef tmpImage = NULL, destImage = NULL;;
+    CGImageRef tmpImage = NULL, destImage = NULL;
    vImage_Buffer src = {0}, tmp = {0}, dest = {0};
    if(!YYCGImageDecodeToBitmapBufferWith32BitFormat(imageRef, &src, kCGImageAlphaFirst | kCGBitmapByteOrderDefault)) return NULL;
    
@@ -1506,7 +1505,7 @@ CGImageRef YYCGImageCreateWithWebPData(CFDataRef webpData,


@implementation YYImageDecoder {
-    pthread_mutex_t _lock;
+    pthread_mutex_t _lock; // recursive lock
    
    BOOL _sourceTypeDetected;
    CGImageSourceRef _source;
@@ -1516,7 +1515,7 @@ CGImageRef YYCGImageCreateWithWebPData(CFDataRef webpData,
 #endif
    
    UIImageOrientation _orientation;
-    OSSpinLock _framesLock;
+    dispatch_semaphore_t _framesLock;
    NSArray *_frames; ///< Array<GGImageDecoderFrame>, without image
    BOOL _needBlend;
    NSUInteger _blendFrameIndex;
@@ -1548,7 +1547,7 @@ CGImageRef YYCGImageCreateWithWebPData(CFDataRef webpData,
    self = [super init];
    if (scale <= 0) scale = 1;
    _scale = scale;
-    _framesLock = OS_SPINLOCK_INIT;
+    _framesLock = dispatch_semaphore_create(1);
    
    pthread_mutexattr_t attr;
    pthread_mutexattr_init (&attr);
@@ -1577,11 +1576,11 @@ CGImageRef YYCGImageCreateWithWebPData(CFDataRef webpData,

 - (NSTimeInterval)frameDurationAtIndex:(NSUInteger)index {
    NSTimeInterval result = 0;
-    OSSpinLockLock(&_framesLock); // for better performance when play animation...
+    dispatch_semaphore_wait(_framesLock, DISPATCH_TIME_FOREVER);
    if (index < _frames.count) {
        result = ((_YYImageDecoderFrame *)_frames[index]).duration;
    }
-    OSSpinLockUnlock(&_framesLock);
+    dispatch_semaphore_signal(_framesLock);
    return result;
 }

@@ -1746,9 +1745,9 @@ CGImageRef YYCGImageCreateWithWebPData(CFDataRef webpData,
    _loopCount = 0;
    if (_webpSource) WebPDemuxDelete(_webpSource);
    _webpSource = NULL;
-    OSSpinLockLock(&_framesLock);
+    dispatch_semaphore_wait(_framesLock, DISPATCH_TIME_FOREVER);
    _frames = nil;
-    OSSpinLockUnlock(&_framesLock);
+    dispatch_semaphore_signal(_framesLock);
    
    /*
     https://developers.google.com/speed/webp/docs/api
@@ -1832,9 +1831,9 @@ CGImageRef YYCGImageCreateWithWebPData(CFDataRef webpData,
    _loopCount = webpLoopCount;
    _needBlend = needBlend;
    _webpSource = demuxer;
-    OSSpinLockLock(&_framesLock);
+    dispatch_semaphore_wait(_framesLock, DISPATCH_TIME_FOREVER);
    _frames = frames;
-    OSSpinLockUnlock(&_framesLock);
+    dispatch_semaphore_signal(_framesLock);
 #endif
 }

@@ -1930,9 +1929,9 @@ CGImageRef YYCGImageCreateWithWebPData(CFDataRef webpData,
    _loopCount = apng->apng_loop_num;
    _needBlend = needBlend;
    _apngSource = apng;
-    OSSpinLockLock(&_framesLock);
+    dispatch_semaphore_wait(_framesLock, DISPATCH_TIME_FOREVER);
    _frames = frames;
-    OSSpinLockUnlock(&_framesLock);
+    dispatch_semaphore_signal(_framesLock);
 }

 - (void)_updateSourceImageIO {
@@ -1940,9 +1939,9 @@ CGImageRef YYCGImageCreateWithWebPData(CFDataRef webpData,
    _height = 0;
    _orientation = UIImageOrientationUp;
    _loopCount = 0;
-    OSSpinLockLock(&_framesLock);
+    dispatch_semaphore_wait(_framesLock, DISPATCH_TIME_FOREVER);
    _frames = nil;
-    OSSpinLockUnlock(&_framesLock);
+    dispatch_semaphore_signal(_framesLock);
    
    if (!_source) {
        if (_finalized) {
@@ -2026,9 +2025,9 @@ CGImageRef YYCGImageCreateWithWebPData(CFDataRef webpData,
            CFRelease(properties);
        }
    }
-    OSSpinLockLock(&_framesLock);
+    dispatch_semaphore_wait(_framesLock, DISPATCH_TIME_FOREVER);
    _frames = frames;
-    OSSpinLockUnlock(&_framesLock);
+    dispatch_semaphore_signal(_framesLock);
 }

 - (CGImageRef)_newUnblendedImageAtIndex:(NSUInteger)index
Author	SHA1	Message	Date
ibireme	30704ca61a	bumping the version to 0.9.3	2016-01-18 00:11:47 +08:00
ibireme	e6b0a5133f	Stop using spinlocks Apple engineers have pointed out that OSSpinLocks are vulnerable to live locking on iOS in cases of priority inversion: . http://mjtsai.com/blog/2015/12/16/osspinlock-is-unsafe/ . https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20151214/000372.html	2016-01-15 15:42:36 +08:00
ibireme	f64128caa6	bugfix: YYAnimatedImageView.autoPlayAnimatedImage is NO when created from xib	2016-01-14 18:48:39 +08:00
Yaoyuan	8f49e73c7d	Merge pull request #9 from SergioChan/master Missed extension support for apng	2016-01-06 21:18:10 +08:00
Sergio Chan	43caa9750b	Missed extension support for apng Missed extension support for apng file like ‘xx.apng’	2016-01-06 17:02:41 +08:00
ibireme	9dbf057ee2	code optimising	2015-12-28 23:42:40 +08:00
ibireme	2712c6a356	Fix typo	2015-12-24 13:37:10 +08:00
ibireme	684394255f	bumping the version to 0.9.2	2015-12-01 02:01:45 +08:00
ibireme	9122a8ccd9	improved compatibility	2015-11-25 10:00:37 +08:00
ibireme	19ef4290a9	updated readme	2015-11-15 21:42:43 +08:00
ibireme	970838c6c1	updated readme, add niconiconi~	2015-11-13 11:50:37 +08:00
ibireme	77f4318300	change image scale's default value	2015-11-10 11:23:09 +08:00
ibireme	0f875c6de9	updated readme	2015-11-07 14:36:36 +08:00
ibireme	0f95266e96	updated readme	2015-11-05 21:10:16 +08:00
ibireme	bdc088abf1	Updated Travis CI Config	2015-11-04 14:50:06 +08:00
ibireme	2dd7540f62	Add Travis CI	2015-11-04 13:51:33 +08:00
ibireme	91f04aa02b	update readme	2015-11-02 02:19:46 +08:00
ibireme	627be90f71	update readme	2015-10-30 21:31:11 +08:00
ibireme	a4c5009703	update WebP.framework to version 0.4.4	2015-10-30 17:53:13 +08:00