diff --git a/api/common/@internal/viewmodel.d.ts b/api/common/@internal/viewmodel.d.ts index 149e18bb6e9a29450e68f5da0a8acd7b2731c4cf..a9a2e73c9518f0761737344b9b45492a99f032d1 100644 --- a/api/common/@internal/viewmodel.d.ts +++ b/api/common/@internal/viewmodel.d.ts @@ -16,6 +16,7 @@ import { Image, ImageData } from "./global"; import { WebGLContextAttributes, WebGLRenderingContext } from "../webgl/webgl"; import { WebGL2RenderingContext } from "../webgl/webgl2"; +import { PixelMap } from "../@ohos.multimedia.image"; /** * @devices tv, phone, tablet, wearable @@ -1069,7 +1070,7 @@ export interface OffscreenCanvasRenderingContext2D { * @param dw Image The width drawn on the target canvas. * @param dh Image The height drawn on the target canvas. */ - drawImage(image: Image, dx: number, dy: number, dw: number, dh: number): void; + drawImage(image: Image | PixelMap, dx: number, dy: number, dw: number, dh: number): void; /** * Draw an Image object. @@ -1083,7 +1084,7 @@ export interface OffscreenCanvasRenderingContext2D { * @param sw The width of the image's rectangular (clipped) selection box that needs to be drawn into the target context. * @param sh The height of the image's rectangular (clipped) selection box that needs to be drawn into the target context. */ - drawImage(image: Image, sx: number, sy: number, sw: number, sh: number,dx: number, dy: number, dw: number, dh: number): void; + drawImage(image: Image | PixelMap, sx: number, sy: number, sw: number, sh: number,dx: number, dy: number, dw: number, dh: number): void; /** * Creates a drawing path. @@ -1215,6 +1216,16 @@ export interface OffscreenCanvasRenderingContext2D { */ getImageData(sx: number, sy: number, sw: number, sh: number): ImageData; + /** + * Get an PixelMap object. + * @param sx The upper-left x-coordinate of the rectangular area of the image data to be extracted. + * @param sy The upper-left y coordinate of the rectangular region of the image data to be extracted. + * @param sw The width of the rectangular area of the image data to be extracted. + * @param sh The height of the rectangular area of the image data to be extracted. + * @returns getPixelMap An getPixelMap object that contains the rectangular ImageData given by the canvas. + */ + getPixelMap(sx: number, sy: number, sw: number, sh: number): PixelMap + /** * Draws the specified ImageData object to the canvas. * @param imagedata An array object containing pixel values. @@ -1872,7 +1883,7 @@ export interface CanvasRenderingContext2D { * @devices tv, phone, tablet, wearable */ drawImage( - image: Image, + image: Image | PixelMap, dx: number, dy: number, dWidth: number, @@ -1893,7 +1904,7 @@ export interface CanvasRenderingContext2D { * @devices tv, phone, tablet, wearable */ drawImage( - image: Image, + image: Image | PixelMap, sx: number, sy: number, sWidth: number, @@ -1943,6 +1954,16 @@ export interface CanvasRenderingContext2D { */ getImageData(sx: number, sy: number, sw: number, sh: number): ImageData; + /** + * Get an PixelMap object. + * @param sx The upper-left x-coordinate of the rectangular area of the image data to be extracted. + * @param sy The upper-left y coordinate of the rectangular region of the image data to be extracted. + * @param sw The width of the rectangular area of the image data to be extracted. + * @param sh The height of the rectangular area of the image data to be extracted. + * @returns getPixelMap An getPixelMap object that contains the rectangular ImageData given by the canvas. + */ + getPixelMap(sx: number, sy: number, sw: number, sh: number): PixelMap + /** * Puts the ImageData onto a rectangular area on the canvas. * @param imageData ImageData object with pixels to put onto the canvas.