降采样适配SVG图片

library/src/main/ets/components/imageknife/Downsampling/Downsampler.ets

@@ -5,13 +5,14 @@ import { FileTypeUtil } from '../utils/FileTypeUtil';
 import { CenterOutside, FitCenter, SampleSizeRounding } from './DownsampleStartegy';
 
 let TAG = 'downsampling'
+
 export class Downsampler {
   calculateScaling(
     imageType: ArrayBuffer,
-    sourceHeight:number,
+    sourceHeight: number,
-    sourceWidth:number,
+    sourceWidth: number,
     request?: RequestOption
-  ):ESObject {
+  ): ESObject {
     const fileType: string | null = new FileTypeUtil().getFileType(imageType)
     let powerOfTwoWidth: number | null = null;
     let powerOfTwoHeight: number | null = null;
@@ -50,8 +51,12 @@ export class Downsampler {
     let widthScaleFactor = Math.floor(orientedSourceWidth / outWidth);
     let heightScaleFactor = Math.floor(orientedSourceHeight / outHeight);
     let scaleFactor = rounding == SampleSizeRounding.MEMORY ? Math.max(widthScaleFactor, heightScaleFactor) : Math.min(widthScaleFactor, heightScaleFactor)
+    // 将整型的缩放因子转换为2的次幂采样大小
     let powerOfTwoSampleSize: number;
-      powerOfTwoSampleSize = Math.max(1, this.highestOneBit(scaleFactor));
+    if (rounding == SampleSizeRounding.MEMORY && powerOfTwoSampleSize < (1 / exactScaleFactor)) {
+      powerOfTwoSampleSize = powerOfTwoSampleSize << 1;
+    }
+    // 基于上一步得出的采样大小,根据不同的图片类型，计算采样后的图片尺寸
     if (fileType == "JPEG") {
       let nativeScaling = Math.min(powerOfTwoSampleSize, 8);
       powerOfTwoWidth = Math.ceil(orientedSourceWidth / nativeScaling);
@@ -95,6 +100,7 @@ export class Downsampler {
     let a: ESObject = { "targetWidth": powerOfTwoWidth, "targetHeight": powerOfTwoHeight }
     return a
   }
+
   //decodeStream(imageReader:ImageReader, options: ESObject, callbacks: DecodeCallbacks, bitmapPool: ESObject) {
   //if (!options.inJustDecodeBounds){
   // callbacks.onObtainBounds();
@@ -109,7 +115,7 @@ export class Downsampler {
   //
   // }
 
-    highestOneBit(i: number): number{
+  highestOneBit(i: number): number {
     i |= (i >> 1);
     i |= (i >> 2);
     i |= (i >> 4);
@@ -117,25 +123,29 @@ export class Downsampler {
     i |= (i >> 16);
     return i - (i >>> 1);
   }
+
   round(value: number): number {
-      return Math.floor(value +0.5);
+    return Math.floor(value + 0.5);
   }
+
   isRotationRequired(degreesToRotate: number): boolean {
     return degreesToRotate == 90 || degreesToRotate == 270;
   }
+
   // isScaling(options: ESObject): boolean {
   //	return options.inTargetDensity >0
   //	&& options.inDensity>0
   //	&& options.inTargetDensity != options.inDensity;
   //}
-      getDensityMultiplier(adjustedScaleFactor: number):number{
+  getDensityMultiplier(adjustedScaleFactor: number): number {
     return Math.round(Number.MAX_VALUE * (adjustedScaleFactor <= 1 ? adjustedScaleFactor : 1 / adjustedScaleFactor));
   }
-      adjustTargetDensityForError(adjustedScaleFactor:number):number{
+
+  adjustTargetDensityForError(adjustedScaleFactor: number): number {
     let densityMultiplier = this.getDensityMultiplier(adjustedScaleFactor);
     let targetDensity = this.round(densityMultiplier * adjustedScaleFactor);
     let scaleFactorWithError = targetDensity / densityMultiplier;
     let difference = adjustedScaleFactor / scaleFactorWithError;
     return this.round(difference * targetDensity);
   }
-  }
+}

library/src/main/ets/components/imageknife/utils/ParseImageUtil.ets

@@ -20,7 +20,12 @@ import { RequestOption } from '../RequestOption';
 import { Downsampler } from '../Downsampling/Downsampler';
 
 export class ParseImageUtil implements IParseImage<PixelMap> {
-  parseImage(imageinfo: ArrayBuffer, onCompleteFunction: (value: PixelMap) => void | PromiseLike<PixelMap>, onErrorFunction: (reason?: BusinessError | string) => void,request?:RequestOption) {
+  parseImage(
+    imageinfo: ArrayBuffer,
+    onCompleteFunction: (value: PixelMap) => void | PromiseLike<PixelMap>,
+    onErrorFunction: (reason?: BusinessError | string) => void,
+    request?:RequestOption
+  ) {
     this.parseImageThumbnail(1, imageinfo, onCompleteFunction, onErrorFunction,request)
   }
 

library/src/main/ets/components/imageknife/utils/svg/SVGParseImpl.ets

@@ -34,6 +34,29 @@ export class SVGParseImpl implements IParseSvg {
       editable: true,
       desiredSize: defaultSize
     };
+    imageSource.getInageInfo().then((value) => {
+      let hValue = Math.round(value.size.height);
+      let wValue = Math.round(value.size.width);
+      let defaultSize: image.size = {
+        height: hValue,
+        width: wValue
+      };
+      let opts: image.DecodingOptions = {
+        editable: true,
+        desiredSize: defaultSize
+      };
+      if (option?.downsampType.getName() !== 'DownsampleNone') {
+        const b: ESObject = new Downsampler().calculateScaling(imageInfo, hValue, wValue, option)
+        console.log("bbb-----", JSON.stringify(b))
+        opts = {
+          editable: true,
+          desiredSize: {
+            width: b.targetWidth,
+            height: b.targetHeight
+          }
+        }
+      }
+    })
     imageSource.createPixelMap(opts).then((pixelMap: image.PixelMap) => {
       let imageKnifeData = ImageKnifeData.createImagePixelMap(ImageKnifeType.PIXELMAP, pixelMap)
       onComplete(imageKnifeData?.drawPixelMap?.imagePixelMap as PixelMap);