Merge commit 'f4f446a708745e714f0ab6fd21cb474e62238357'

This commit is contained in:
Ali 2020-05-29 20:11:39 +04:00
commit ff34583575
2 changed files with 4 additions and 1 deletions

View File

@ -699,7 +699,7 @@
SSignal *renderedImageSignal = [[imageSignal mapToSignal:^SSignal *(UIImage *image) SSignal *renderedImageSignal = [[imageSignal mapToSignal:^SSignal *(UIImage *image)
{ {
return [imageCropSignal(image, !hasImageAdjustments || hasPainting) startOn:_queue]; return [imageCropSignal(image, !hasImageAdjustments || hasPainting || MAX(image.size.width, image.size.height) > 4096) startOn:_queue];
}] mapToSignal:^SSignal *(UIImage *image) }] mapToSignal:^SSignal *(UIImage *image)
{ {
if (hasImageAdjustments) if (hasImageAdjustments)

View File

@ -267,11 +267,14 @@ UIImage *TGPhotoEditorVideoExtCrop(UIImage *inputImage, UIImage *paintingImage,
if (skipImageTransform) { if (skipImageTransform) {
imageSize = CGSizeMake(image.size.width * fittedOriginalSize.width / rect.size.width, image.size.height * fittedOriginalSize.height / rect.size.height); imageSize = CGSizeMake(image.size.width * fittedOriginalSize.width / rect.size.width, image.size.height * fittedOriginalSize.height / rect.size.height);
} else {
imageSize = image.size;
} }
} }
else else
{ {
image = inputImage; image = inputImage;
imageSize = image.size;
} }
if (skipImageTransform) { if (skipImageTransform) {