mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-04 21:41:45 +00:00
Merge commit 'f4f446a708745e714f0ab6fd21cb474e62238357'
This commit is contained in:
commit
ff34583575
@ -699,7 +699,7 @@
|
||||
|
||||
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)
|
||||
{
|
||||
if (hasImageAdjustments)
|
||||
|
||||
@ -267,11 +267,14 @@ UIImage *TGPhotoEditorVideoExtCrop(UIImage *inputImage, UIImage *paintingImage,
|
||||
|
||||
if (skipImageTransform) {
|
||||
imageSize = CGSizeMake(image.size.width * fittedOriginalSize.width / rect.size.width, image.size.height * fittedOriginalSize.height / rect.size.height);
|
||||
} else {
|
||||
imageSize = image.size;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
image = inputImage;
|
||||
imageSize = image.size;
|
||||
}
|
||||
|
||||
if (skipImageTransform) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user