fix

Share/ShareViewController.m

@@ -412,7 +412,7 @@
     else if (UTTypeConformsTo(fileUTI, kUTTypeImage)) {
         image = [UIImage imageWithContentsOfFile:[NSTemporaryDirectory() stringByAppendingString:fileName]];
         if (image) {
-            image = [image resizeImageWithSize:CGSizeMake(100, 100)];
+            image = [image resizeImageWithSize:CGSizeMake(100, 100) isAspectRation:false];
         } else {
             image = [UIImage imageNamed:@"file_photo"];
         }

iOSClient/PeekPop/CCPeekPop.m

@@ -61,7 +61,7 @@
     }
     
     self.view.backgroundColor = NCBrandColor.shared.backgroundForm;
-    self.imagePreview.image = [image resizeImageWithSize:CGSizeMake(self.view.bounds.size.width, self.view.bounds.size.height)];
+    self.imagePreview.image = [image resizeImageWithSize:CGSizeMake(self.view.bounds.size.width, self.view.bounds.size.height) isAspectRation:true];
     self.preferredContentSize = CGSizeMake(self.imagePreview.image.size.width,  self.imagePreview.image.size.height + highLabelFileName);
 }
 
@@ -106,7 +106,7 @@
     [[NCCommunication shared] downloadPreviewWithFileNamePathOrFileId:fileNamePath fileNamePreviewLocalPath:fileNamePreviewLocalPath widthPreview:NCBrandGlobal.shared.sizePreview heightPreview:NCBrandGlobal.shared.sizePreview fileNameIconLocalPath:fileNameIconLocalPath sizeIcon:NCBrandGlobal.shared.sizeIcon customUserAgent:nil addCustomHeaders:nil endpointTrashbin:false useInternalEndpoint:true completionHandler:^(NSString *account, UIImage *imagePreview, UIImage *imageIcon, NSInteger errorCode,  NSString *errorDescription) {
         
         if (errorCode == 0 && imagePreview != nil) {
-            self.imagePreview.image = [imagePreview resizeImageWithSize:CGSizeMake(self.view.bounds.size.width, self.view.bounds.size.height)];
+            self.imagePreview.image = [imagePreview resizeImageWithSize:CGSizeMake(self.view.bounds.size.width, self.view.bounds.size.height) isAspectRation:true];
             self.preferredContentSize = CGSizeMake(self.imagePreview.image.size.width, self.imagePreview.image.size.height + highLabelFileName);
         }
     }];

iOSClient/ScanDocument/ScanCollectionView.swift

@@ -403,7 +403,7 @@ extension DragDropViewController : UICollectionViewDataSource {
             
             // 72 DPI
             if imageWidthInPixels > 595 || imageHeightInPixels > 842  {
-                image = image.resizeImage(size: CGSize(width: 595, height: 842)) ?? image
+                image = image.resizeImage(size: CGSize(width: 595, height: 842), isAspectRation: true) ?? image
             }
             
             cell.customImageView?.image = image
@@ -422,7 +422,7 @@ extension DragDropViewController : UICollectionViewDataSource {
             
             // 72 DPI 
             if imageWidthInPixels > 595 || imageHeightInPixels > 842  {
-                image = image.resizeImage(size: CGSize(width: 595, height: 842)) ?? image
+                image = image.resizeImage(size: CGSize(width: 595, height: 842), isAspectRation: true) ?? image
             }
             
             cell.customImageView?.image = self.filter(image: image)

iOSClient/Settings/CCManageAccount.m

@@ -60,7 +60,7 @@
         UIImage *avatar = [UIImage imageWithContentsOfFile:fileNamePath];
         if (avatar) {
             
-            avatar = [avatar resizeImageWithSize:CGSizeMake(35, 35)];
+            avatar = [avatar resizeImageWithSize:CGSizeMake(35, 35) isAspectRation:false];
             NCAvatar *avatarImageView = [[NCAvatar alloc] initWithImage:avatar borderColor:[UIColor whiteColor] borderWidth:1];
                         
             CGSize imageSize = avatarImageView.bounds.size;
@@ -71,7 +71,7 @@
             UIGraphicsEndImageContext();
             
         } else {
-            avatar = [[UIImage imageNamed:@"avatarBN"] resizeImageWithSize:CGSizeMake(35, 35)];
+            avatar = [[UIImage imageNamed:@"avatarBN"] resizeImageWithSize:CGSizeMake(35, 35) isAspectRation:false];
         }
         
         row.cellConfigAtConfigure[@"backgroundColor"] = NCBrandColor.shared.backgroundCell;

iOSClient/Utility/NCUtility.swift

@@ -583,7 +583,7 @@ class NCUtility: NSObject {
             messageUserDefined = NSLocalizedString("_away_", comment: "")
         }
         if userStatus?.lowercased() == "dnd" {
-            onlineStatus = UIImage.init(named: "userStatusDnd")?.resizeImage(size: CGSize(width: 100, height: 100))
+            onlineStatus = UIImage.init(named: "userStatusDnd")?.resizeImage(size: CGSize(width: 100, height: 100), isAspectRation: false)
             messageUserDefined = NSLocalizedString("_dnd_", comment: "")
         }
         if userStatus?.lowercased() == "offline" || userStatus?.lowercased() == "invisible"  {

iOSClient/Utility/UIImage+Extensions.swift

@@ -26,19 +26,36 @@ import Accelerate
 
 extension UIImage {
     
-    @objc func resizeImage(size:CGSize) -> UIImage? {
+    @objc func resizeImage(size: CGSize, isAspectRation: Bool) -> UIImage? {
         
+        let originRatio = self.size.width / self.size.height
+        let newRatio = size.width / size.height
+        var newSize = size
         let cgImage = self.cgImage!
+
+        if isAspectRation {
+            if originRatio < newRatio {
+                newSize.height = size.height
+                newSize.width = size.height * originRatio
+            } else {
+                newSize.width = size.width;
+                newSize.height = size.width / originRatio
+            }
+        }
+        
         var format = vImage_CGImageFormat(bitsPerComponent: 8, bitsPerPixel: 32, colorSpace: nil, bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.first.rawValue), version: 0, decode: nil, renderingIntent: CGColorRenderingIntent.defaultIntent)
         var sourceBuffer = vImage_Buffer()
+        
         defer {
             free(sourceBuffer.data)
         }
+        
         var error = vImageBuffer_InitWithCGImage(&sourceBuffer, &format, nil, cgImage, numericCast(kvImageNoFlags))
         guard error == kvImageNoError else { return nil }
+        
         // create a destination buffer
-        let destWidth = Int(size.width)
-        let destHeight = Int(size.height)
+        let destWidth = Int(newSize.width)
+        let destHeight = Int(newSize.height)
         let bytesPerPixel = self.cgImage!.bitsPerPixel/8
         let destBytesPerRow = destWidth * bytesPerPixel
         let destData = UnsafeMutablePointer<UInt8>.allocate(capacity: destHeight * destBytesPerRow)
@@ -46,15 +63,19 @@ extension UIImage {
             destData.deallocate()
         }
         var destBuffer = vImage_Buffer(data: destData, height: vImagePixelCount(destHeight), width: vImagePixelCount(destWidth), rowBytes: destBytesPerRow)
+        
         // scale the image
         error = vImageScale_ARGB8888(&sourceBuffer, &destBuffer, nil, numericCast(kvImageHighQualityResampling))
         guard error == kvImageNoError else { return nil }
+        
         // create a CGImage from vImage_Buffer
         var destCGImage = vImageCreateCGImageFromBuffer(&destBuffer, &format, nil, nil, numericCast(kvImageNoFlags), &error)?.takeRetainedValue()
         guard error == kvImageNoError else { return nil }
+        
         // create a UIImage
         let resizedImage = destCGImage.flatMap { UIImage(cgImage: $0, scale: 0.0, orientation: self.imageOrientation) }
         destCGImage = nil
+        
         return resizedImage
     }