From e060f02f8e4e9a20d8da4b4590a6609c8b8bbd1e Mon Sep 17 00:00:00 2001 From: zhoulisheng <635547767@qq.com> Date: Fri, 25 Mar 2022 12:29:47 +0800 Subject: [PATCH] 1.image.createImageSource input parameter arraybuffer need to transform upwards to 'any' Signed-off-by: zhoulisheng <635547767@qq.com> --- entry/src/main/ets/MainAbility/glide/compress/Engine.ets | 6 +++--- entry/src/main/ets/MainAbility/glide/crop/Crop.ets | 2 +- entry/src/main/ets/MainAbility/glide/pngj/Pngj.ets | 2 +- .../MainAbility/glide/transform/BlurTransformation.ets | 2 +- .../glide/transform/BrightnessFilterTransformation.ets | 2 +- .../glide/transform/ContrastFilterTransformation.ets | 2 +- .../glide/transform/CropCircleTransformation.ets | 2 +- .../transform/CropCircleWithBorderTransformation.ets | 2 +- .../glide/transform/CropSquareTransformation.ets | 2 +- .../MainAbility/glide/transform/CropTransformation.ets | 2 +- .../glide/transform/GrayscaleTransformation.ets | 2 +- .../glide/transform/InvertFilterTransformation.ets | 2 +- .../glide/transform/PixelationFilterTransformation.ets | 2 +- .../glide/transform/RotateImageTransformation.ets | 2 +- .../glide/transform/RoundedCornersTransformation.ets | 2 +- .../glide/transform/SepiaFilterTransformation.ets | 2 +- .../glide/transform/SketchFilterTransformation.ets | 2 +- .../ets/MainAbility/glide/transform/TransformUtils.ets | 8 ++++---- .../main/ets/MainAbility/glide/utils/ParseImageUtil.ets | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/entry/src/main/ets/MainAbility/glide/compress/Engine.ets b/entry/src/main/ets/MainAbility/glide/compress/Engine.ets index 291d26a..13f1a7d 100644 --- a/entry/src/main/ets/MainAbility/glide/compress/Engine.ets +++ b/entry/src/main/ets/MainAbility/glide/compress/Engine.ets @@ -84,7 +84,7 @@ export class Engine { return; } - var imageResource = image.createImageSource(buffer); + var imageResource = image.createImageSource(buffer as any); imageResource.getImageInfo() .then(info => { var height = info.size.height; @@ -123,7 +123,7 @@ export class Engine { if (!this.checkNeedCompress(buffer)) { return; } - var imageResource = image.createImageSource(buffer); + var imageResource = image.createImageSource(buffer as any); imageResource.getImageInfo() .then(info => { var height = info.size.height; @@ -165,7 +165,7 @@ export class Engine { } private handResult(buffer: ArrayBuffer, path: string) { - var imageRes = image.createImageSource(buffer); + var imageRes = image.createImageSource(buffer as any); let a={ editable: true, } diff --git a/entry/src/main/ets/MainAbility/glide/crop/Crop.ets b/entry/src/main/ets/MainAbility/glide/crop/Crop.ets index 2b87ec3..c171b4c 100644 --- a/entry/src/main/ets/MainAbility/glide/crop/Crop.ets +++ b/entry/src/main/ets/MainAbility/glide/crop/Crop.ets @@ -27,7 +27,7 @@ export namespace Crop { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); TransformUtils.getPixelMapSize(imageSource, (error, size: { width: number, height: number diff --git a/entry/src/main/ets/MainAbility/glide/pngj/Pngj.ets b/entry/src/main/ets/MainAbility/glide/pngj/Pngj.ets index 7fb3eb0..d97bb18 100644 --- a/entry/src/main/ets/MainAbility/glide/pngj/Pngj.ets +++ b/entry/src/main/ets/MainAbility/glide/pngj/Pngj.ets @@ -7,7 +7,7 @@ import ArkWorker from '@ohos.worker' export class Pngj { readPngImageInfo(arraybuffer: ArrayBuffer, callback:PngCallback) { - let imageSource = image.createImageSource(arraybuffer); + let imageSource = image.createImageSource(arraybuffer as any); imageSource.getImageInfo((err, value) => { if (err) { return; diff --git a/entry/src/main/ets/MainAbility/glide/transform/BlurTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/BlurTransformation.ets index d479d2e..22337b5 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/BlurTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/BlurTransformation.ets @@ -41,7 +41,7 @@ export class BlurTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); TransformUtils.getPixelMapSize(imageSource, (error, size: { width: number, height: number diff --git a/entry/src/main/ets/MainAbility/glide/transform/BrightnessFilterTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/BrightnessFilterTransformation.ets index d72a1cc..3c8d9a5 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/BrightnessFilterTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/BrightnessFilterTransformation.ets @@ -43,7 +43,7 @@ export class BrightnessFilterTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); let imageInfo = await imageSource.getImageInfo(); let size = { diff --git a/entry/src/main/ets/MainAbility/glide/transform/ContrastFilterTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/ContrastFilterTransformation.ets index 108ddff..acf3b77 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/ContrastFilterTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/ContrastFilterTransformation.ets @@ -54,7 +54,7 @@ export class ContrastFilterTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); let imageInfo = await imageSource.getImageInfo(); let size = { diff --git a/entry/src/main/ets/MainAbility/glide/transform/CropCircleTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/CropCircleTransformation.ets index 800c552..4e05865 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/CropCircleTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/CropCircleTransformation.ets @@ -42,7 +42,7 @@ export class CropCircleTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); var that = this; TransformUtils.getPixelMapSize(imageSource, (error, size: { width: number, diff --git a/entry/src/main/ets/MainAbility/glide/transform/CropCircleWithBorderTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/CropCircleWithBorderTransformation.ets index 4c2dcd8..20541eb 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/CropCircleWithBorderTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/CropCircleWithBorderTransformation.ets @@ -60,7 +60,7 @@ export class CropCircleWithBorderTransformation implements BaseTransform { } squareCrop(buf: ArrayBuffer, request: RequestOption, func?: AsyncTransform) { - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); imageSource.getImageInfo() .then((p) => { var pw = p.size.width; diff --git a/entry/src/main/ets/MainAbility/glide/transform/CropTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/CropTransformation.ets index d52098d..4a4bffa 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/CropTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/CropTransformation.ets @@ -47,7 +47,7 @@ export class CropTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); TransformUtils.getPixelMapSize(imageSource, (error, size: { width: number, height: number diff --git a/entry/src/main/ets/MainAbility/glide/transform/GrayscaleTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/GrayscaleTransformation.ets index 5bc0ca6..e31885a 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/GrayscaleTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/GrayscaleTransformation.ets @@ -34,7 +34,7 @@ export class GrayscaleTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); let imageInfo = await imageSource.getImageInfo(); let size = { diff --git a/entry/src/main/ets/MainAbility/glide/transform/InvertFilterTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/InvertFilterTransformation.ets index 747323c..7585c8d 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/InvertFilterTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/InvertFilterTransformation.ets @@ -40,7 +40,7 @@ export class InvertFilterTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); let imageInfo = await imageSource.getImageInfo(); let size = { diff --git a/entry/src/main/ets/MainAbility/glide/transform/PixelationFilterTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/PixelationFilterTransformation.ets index fcdb152..db482d3 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/PixelationFilterTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/PixelationFilterTransformation.ets @@ -46,7 +46,7 @@ export class PixelationFilterTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); TransformUtils.getPixelMapSize(imageSource, (error, size: { width: number, height: number diff --git a/entry/src/main/ets/MainAbility/glide/transform/RotateImageTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/RotateImageTransformation.ets index 7fccd0f..0f53c92 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/RotateImageTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/RotateImageTransformation.ets @@ -39,7 +39,7 @@ export class RotateImageTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); TransformUtils.getPixelMapSize(imageSource, (error, size: { width: number, height: number diff --git a/entry/src/main/ets/MainAbility/glide/transform/RoundedCornersTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/RoundedCornersTransformation.ets index a4dbca2..e7c36c7 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/RoundedCornersTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/RoundedCornersTransformation.ets @@ -56,7 +56,7 @@ export class RoundedCornersTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); var that = this; TransformUtils.getPixelMapSize(imageSource, (error, size: { width: number, diff --git a/entry/src/main/ets/MainAbility/glide/transform/SepiaFilterTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/SepiaFilterTransformation.ets index 8132e7c..7492726 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/SepiaFilterTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/SepiaFilterTransformation.ets @@ -37,7 +37,7 @@ export class SepiaFilterTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); let imageInfo = await imageSource.getImageInfo(); let size = { diff --git a/entry/src/main/ets/MainAbility/glide/transform/SketchFilterTransformation.ets b/entry/src/main/ets/MainAbility/glide/transform/SketchFilterTransformation.ets index e450025..824ce93 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/SketchFilterTransformation.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/SketchFilterTransformation.ets @@ -34,7 +34,7 @@ export class SketchFilterTransformation implements BaseTransform { } return; } - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); TransformUtils.getPixelMapSize(imageSource, (error, size: { width: number, height: number diff --git a/entry/src/main/ets/MainAbility/glide/transform/TransformUtils.ets b/entry/src/main/ets/MainAbility/glide/transform/TransformUtils.ets index 4eaf7b4..14653b9 100644 --- a/entry/src/main/ets/MainAbility/glide/transform/TransformUtils.ets +++ b/entry/src/main/ets/MainAbility/glide/transform/TransformUtils.ets @@ -18,7 +18,7 @@ import image from '@ohos.multimedia.image' export class TransformUtils { static centerCrop(buf: ArrayBuffer, outWidth: number, outHeihgt: number, callback?: AsyncTransform>) { - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); imageSource.getImageInfo() .then((p) => { var sw; @@ -57,7 +57,7 @@ export class TransformUtils { } static rotateImage(buf: ArrayBuffer, degreesToRotate: number): Promise{ - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); var options = { editable: true, rotate: degreesToRotate @@ -67,7 +67,7 @@ export class TransformUtils { static centerInside(buf: ArrayBuffer, outWidth: number, outHeihgt: number, callback?: AsyncTransform>) { - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); imageSource.getImageInfo() .then((p) => { var pw = p.size.width; @@ -86,7 +86,7 @@ export class TransformUtils { static fitCenter(buf: ArrayBuffer, outWidth: number, outHeihgt: number , callback?: AsyncTransform>) { - var imageSource = image.createImageSource(buf); + var imageSource = image.createImageSource(buf as any); imageSource.getImageInfo() .then((p) => { var pw = p.size.width; diff --git a/entry/src/main/ets/MainAbility/glide/utils/ParseImageUtil.ets b/entry/src/main/ets/MainAbility/glide/utils/ParseImageUtil.ets index da14e16..3438bfe 100644 --- a/entry/src/main/ets/MainAbility/glide/utils/ParseImageUtil.ets +++ b/entry/src/main/ets/MainAbility/glide/utils/ParseImageUtil.ets @@ -23,7 +23,7 @@ export class ParseImageUtil implements IParseImage { // scale(0,1) parseImageThumbnail(scale: number, imageinfo: ArrayBuffer, onCompleteFunction, onErrorFunction) { - let imageSource = image.createImageSource(imageinfo); // 步骤一:文件转为pixelMap 然后变换 给Image组件 + let imageSource = image.createImageSource(imageinfo as any); // 步骤一:文件转为pixelMap 然后变换 给Image组件 imageSource.getImageInfo((err, value) => { if (err) { onErrorFunction(err);