fix: simplify ratio computation

Author: farfromrefug

src/image-common.ts

@@ -133,7 +133,7 @@ export class ImageBase extends View {
     public static lowerResSrcProperty = new Property<ImageBase, string>({ name: 'lowerResSrc' });
     public static placeholderImageUriProperty = new Property<ImageBase, string>({ name: 'placeholderImageUri' });
     public static failureImageUriProperty = new Property<ImageBase, string>({ name: 'failureImageUri' });
-    public static stretchProperty = new Property<ImageBase, string>({ name: 'stretch', defaultValue:'aspectFit' });
+    public static stretchProperty = new Property<ImageBase, string>({ name: 'stretch', defaultValue: 'aspectFit' });
     public static backgroundUriProperty = new Property<ImageBase, string>({ name: 'backgroundUri' });
     public static progressiveRenderingEnabledProperty = new Property<ImageBase, boolean>({ name: 'progressiveRenderingEnabled', valueConverter: booleanConverter });
     public static localThumbnailPreviewsEnabledProperty = new Property<ImageBase, boolean>({ name: 'localThumbnailPreviewsEnabled', valueConverter: booleanConverter });
@@ -157,8 +157,7 @@ export class ImageBase extends View {
     public static fadeDurationProperty = new Property<ImageBase, number>({ name: 'fadeDuration', valueConverter: (v) => parseFloat(v) });
     public static noCacheProperty = new Property<ImageBase, boolean>({ name: 'noCache', defaultValue: false, valueConverter: booleanConverter });
 
-    protected handleImageProgress(value: number, totalSize?: number) {
-    }
+    protected handleImageProgress(value: number, totalSize?: number) {}
     private static needsSizeAdjustment(scaleType: ScaleType) {
         if (scaleType === undefined) {
             return true;
@@ -193,13 +192,14 @@ export class ImageBase extends View {
             scaleW = nativeWidth > 0 ? measureWidth / nativeWidth : 1;
             scaleH = nativeHeight > 0 ? measureHeight / nativeHeight : 1;
 
+            CLog(CLogTypes.info, 'computeScaleFactor', measureWidth, measureHeight, nativeWidth, nativeHeight, widthIsFinite, heightIsFinite, aspectRatio, nativeScale, measureScale);
             if (aspectRatio > 0) {
                 if (!widthIsFinite) {
                     scaleH = 1;
                     scaleW = aspectRatio;
                 } else if (!heightIsFinite) {
                     scaleW = 1;
-                    scaleH = aspectRatio;
+                    scaleH = 1 / aspectRatio;
                 }
             } else {
                 if (!widthIsFinite) {

src/image.android.ts

@@ -355,18 +355,17 @@ function initializeDraweeView() {
             if (aspectRatio > 0) {
                 const finiteWidth: boolean = widthMode === Utils.layout.EXACTLY;
                 const finiteHeight: boolean = heightMode === Utils.layout.EXACTLY;
-                let scale: { width; height };
+                // let scale: { width; height };
                 if ((this as any).imageWidth && (this as any).imageHeight) {
-                    scale = this.owner.computeScaleFactor(width, height, finiteWidth, finiteHeight, (this as any).imageWidth, (this as any).imageHeight, aspectRatio);
+                    // scale = this.owner.computeScaleFactor(width, height, finiteWidth, finiteHeight, (this as any).imageWidth, (this as any).imageHeight, aspectRatio);
                     if (!finiteWidth) {
-                        widthMeasureSpec = Utils.layout.makeMeasureSpec(height / scale.width, Utils.layout.EXACTLY);
+                        widthMeasureSpec = Utils.layout.makeMeasureSpec(height * aspectRatio, Utils.layout.EXACTLY);
                     }
                     if (!finiteHeight) {
-                        heightMeasureSpec = Utils.layout.makeMeasureSpec(width * scale.height, Utils.layout.EXACTLY);
+                        heightMeasureSpec = Utils.layout.makeMeasureSpec(width / aspectRatio, Utils.layout.EXACTLY);
                     }
-                } else {
                 }
-                CLog(CLogTypes.info, 'onMeasure scale', this.owner.src, aspectRatio, finiteWidth, finiteHeight, width, height, (this as any).imageWidth, (this as any).imageHeight, scale);
+                CLog(CLogTypes.info, 'onMeasure scale', this.owner.src, aspectRatio, finiteWidth, finiteHeight, width, height, (this as any).imageWidth, (this as any).imageHeight);
             }
             super.onMeasure(widthMeasureSpec, heightMeasureSpec);
         }

src/image.ios.ts

@@ -298,21 +298,22 @@ export class Img extends ImageBase {
         const finiteWidth: boolean = widthMode === layout.EXACTLY;
         const finiteHeight: boolean = heightMode === layout.EXACTLY;
         this._imageSourceAffectsLayout = !finiteWidth || !finiteHeight;
-        const imgRatio = finiteHeight ? nativeWidth/nativeHeight : nativeHeight/nativeWidth;
+        const imgRatio = nativeWidth / nativeHeight;
         CLog(CLogTypes.info, 'onMeasure', this.src, widthMeasureSpec, heightMeasureSpec, width, height, this.aspectRatio, image && image.imageOrientation);
         if (image || this.aspectRatio > 0) {
-            const scale = this.computeScaleFactor(width, height, finiteWidth, finiteHeight, nativeWidth, nativeHeight, this.aspectRatio || imgRatio );
+            const ratio = this.aspectRatio || imgRatio;
+            // const scale = this.computeScaleFactor(width, height, finiteWidth, finiteHeight, nativeWidth, nativeHeight, this.aspectRatio || imgRatio );
 
             if (!finiteWidth) {
-                measureWidth = Math.round(height * scale.width);
+                measureWidth = Math.round(height * ratio);
             } else {
 
             }
             if (!finiteHeight) {
-                measureHeight = Math.round(width * scale.height);
+                measureHeight = Math.round(width / ratio);
             }
 
-            CLog(CLogTypes.info, 'onMeasure scale', this.src, this.aspectRatio, finiteWidth, finiteHeight, width, height, nativeWidth, nativeHeight, scale);
+            CLog(CLogTypes.info, 'onMeasure scale', this.src, this.aspectRatio, finiteWidth, finiteHeight, width, height, nativeWidth, nativeHeight);
         }
         const widthAndState = Img.resolveSizeAndState(measureWidth, width, widthMode, 0);
         const heightAndState = Img.resolveSizeAndState(measureHeight, height, heightMode, 0);