Skip to content

Commit fad587a

Browse files
committed
Fix some uses of UIIimage
1 parent c283c73 commit fad587a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

packages/react-native/Libraries/Image/RCTImageLoader.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ static RCTImageLoaderCancellationBlock RCTLoadImageURLFromLoader(
380380
resizeMode:resizeMode
381381
progressHandler:progressHandler
382382
partialLoadHandler:partialLoadHandler
383-
completionHandlerWithMetadata:^(NSError *error, UIImage *image, id metadata) {
383+
completionHandlerWithMetadata:^(NSError *error, RCTPlatformImage *image, id metadata) { // [macOS]
384384
completionHandler(error, image, metadata);
385385
}];
386386
} else {
@@ -390,7 +390,7 @@ static RCTImageLoaderCancellationBlock RCTLoadImageURLFromLoader(
390390
resizeMode:resizeMode
391391
progressHandler:progressHandler
392392
partialLoadHandler:partialLoadHandler
393-
completionHandler:^(NSError *error, UIImage *image) {
393+
completionHandler:^(NSError *error, RCTPlatformImage *image) { // [macOS]
394394
completionHandler(error, image, nil);
395395
}];
396396
}
@@ -660,7 +660,7 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
660660
resizeMode,
661661
progressHandler,
662662
partialLoadHandler,
663-
^(NSError *error, UIImage *image, id metadata) {
663+
^(NSError *error, RCTPlatformImage *image, id metadata) {
664664
completionHandler(error, image, metadata, nil);
665665
});
666666
return [[RCTImageURLLoaderRequest alloc] initWithRequestId:nil imageURL:request.URL cancellationBlock:cb];
@@ -704,7 +704,7 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
704704
resizeMode,
705705
progressHandler,
706706
partialLoadHandler,
707-
^(NSError *error, UIImage *image, id metadata) {
707+
^(NSError *error, RCTPlatformImage *image, id metadata) { // [macOS]
708708
completionHandler(error, image, metadata, nil);
709709
});
710710
}

packages/react-native/Libraries/Image/RCTUIImageViewAnimated.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ - (void)resetAnimatedImage
9090

9191
- (void)setImage:(RCTPlatformImage *)image // [macOS]
9292
{
93-
UIImage *thisImage = self.animatedImage != nil ? self.animatedImage : super.image;
93+
RCTPlatformImage *thisImage = self.animatedImage != nil ? self.animatedImage : super.image; // [macOS]
9494
if (image == thisImage) {
9595
return;
9696
}

0 commit comments

Comments
 (0)