zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-03 15:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #632 from uxbert/6.3.0-fix-ios-load-image-from-url

Browse Source 
6.3.0 [iOS] Fix Load Image from URL
This commit is contained in:
Mikael Sand
2018-03-19 13:17:55 +02:00
committed by GitHub
parent 28235ea137 ca92b72944
commit fefd145053
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/Elements/RNSVGImage.m
+3 -3
View File
@@ -27,12 +27,11 @@
} }
_src = src; _src = src;
CGImageRelease(_image); CGImageRelease(_image);
_image = CGImageRetain([RCTConvert CGImage:src]);
RCTImageSource *source = [RCTConvert RCTImageSource:src]; RCTImageSource *source = [RCTConvert RCTImageSource:src];
if (source.size.width != 0 && source.size.height != 0) { if (source.size.width != 0 && source.size.height != 0) {
_imageSize = source.size; _imageSize = source.size;
} else { } else {
_imageSize = CGSizeMake(CGImageGetWidth(_image), CGImageGetHeight(_image)); _imageSize = CGSizeMake(0, 0);
} }
RCTImageLoaderCancellationBlock previousCancellationBlock = _reloadImageCancellationBlock; RCTImageLoaderCancellationBlock previousCancellationBlock = _reloadImageCancellationBlock;
@@ -43,7 +42,8 @@
_reloadImageCancellationBlock = [self.bridge.imageLoader loadImageWithURLRequest:[RCTConvert NSURLRequest:src] callback:^(NSError *error, UIImage *image) { _reloadImageCancellationBlock = [self.bridge.imageLoader loadImageWithURLRequest:[RCTConvert NSURLRequest:src] callback:^(NSError *error, UIImage *image) {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
_image = CGImageRetain(image.CGImage); self->_image = CGImageRetain(image.CGImage);
self->_imageSize = CGSizeMake(CGImageGetWidth(self->_image), CGImageGetHeight(self->_image));
[self invalidate]; [self invalidate];
}); });
}]; }];