diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-11-07 12:45:47 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-11-07 12:45:47 +0900 |
| commit | 990be44d9887a3c6fadf4507ec946c12fa845da0 (patch) | |
| tree | 9563a72f91481aa2777d42acb4737b65cc6aeeb2 /packages/frontend/src | |
| parent | fix type (diff) | |
| download | misskey-990be44d9887a3c6fadf4507ec946c12fa845da0.tar.gz misskey-990be44d9887a3c6fadf4507ec946c12fa845da0.tar.bz2 misskey-990be44d9887a3c6fadf4507ec946c12fa845da0.zip | |
fix type
Diffstat (limited to 'packages/frontend/src')
| -rw-r--r-- | packages/frontend/src/lib/ImageCompositor.ts | 4 | ||||
| -rw-r--r-- | packages/frontend/src/utility/image-effector/ImageEffector.ts | 2 | ||||
| -rw-r--r-- | packages/frontend/src/utility/watermark/watermark.ts | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/frontend/src/lib/ImageCompositor.ts b/packages/frontend/src/lib/ImageCompositor.ts index a26302af77..3725f94c4d 100644 --- a/packages/frontend/src/lib/ImageCompositor.ts +++ b/packages/frontend/src/lib/ImageCompositor.ts @@ -20,7 +20,7 @@ export type ImageCompositorFunction<PS extends ImageCompositorFunctionParams = I }) => void; }; -export type ImageCompositorLayer<FNS extends Record<string, ImageCompositorFunction> = any> = { +export type ImageCompositorLayer<FNS extends Record<string, ImageCompositorFunction> = Record<string, ImageCompositorFunction>> = { [K in keyof FNS]: { id: string; functionId: K; @@ -219,7 +219,7 @@ export class ImageCompositor<FNS extends Record<string, ImageCompositorFunction< gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, resultTexture, 0); } - this.renderLayer(layer, preTexture, isLast); + this.renderLayer(layer as ImageCompositorLayer, preTexture, isLast); preTexture = resultTexture; } diff --git a/packages/frontend/src/utility/image-effector/ImageEffector.ts b/packages/frontend/src/utility/image-effector/ImageEffector.ts index b4295c4637..9d5b961416 100644 --- a/packages/frontend/src/utility/image-effector/ImageEffector.ts +++ b/packages/frontend/src/utility/image-effector/ImageEffector.ts @@ -4,7 +4,7 @@ */ import { FXS } from './fxs.js'; -import type { ImageCompositorFunction, ImageCompositorLayer } from '@/lib/ImageCompositor.js'; +import type { ImageCompositorFunction } from '@/lib/ImageCompositor.js'; import { ImageCompositor } from '@/lib/ImageCompositor.js'; export type ImageEffectorRGB = [r: number, g: number, b: number]; diff --git a/packages/frontend/src/utility/watermark/watermark.ts b/packages/frontend/src/utility/watermark/watermark.ts index 62efcd12b6..68c80824fc 100644 --- a/packages/frontend/src/utility/watermark/watermark.ts +++ b/packages/frontend/src/utility/watermark/watermark.ts @@ -33,7 +33,7 @@ export const fn = defineImageCompositorFunction<Partial<{ gl.uniform1i(u.noBBoxExpansion, params.noBoundingBoxExpansion ? 1 : 0); // ウォーターマークテクスチャ - const wm = textures.get(params.watermark); + const wm = params.watermark ? textures.get(params.watermark) : null; if (wm) { gl.activeTexture(gl.TEXTURE1); gl.bindTexture(gl.TEXTURE_2D, wm.texture); |