From ca92b72944a246a1546cb3afe5396f8f4071ef45 Mon Sep 17 00:00:00 2001 From: Bilal Syed Date: Mon, 19 Mar 2018 13:51:13 +0300 Subject: [PATCH] Set _imageSize on load --- ios/Elements/RNSVGImage.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ios/Elements/RNSVGImage.m b/ios/Elements/RNSVGImage.m index ec45d90c..8a37ad10 100644 --- a/ios/Elements/RNSVGImage.m +++ b/ios/Elements/RNSVGImage.m @@ -27,12 +27,11 @@ } _src = src; CGImageRelease(_image); - _image = CGImageRetain([RCTConvert CGImage:src]); RCTImageSource *source = [RCTConvert RCTImageSource:src]; if (source.size.width != 0 && source.size.height != 0) { _imageSize = source.size; } else { - _imageSize = CGSizeMake(CGImageGetWidth(_image), CGImageGetHeight(_image)); + _imageSize = CGSizeMake(0, 0); } RCTImageLoaderCancellationBlock previousCancellationBlock = _reloadImageCancellationBlock; @@ -43,7 +42,8 @@ _reloadImageCancellationBlock = [self.bridge.imageLoader loadImageWithURLRequest:[RCTConvert NSURLRequest:src] callback:^(NSError *error, UIImage *image) { 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]; }); }];