pixel-data-js 0.27.0 → 0.29.0

package/src/PixelData/applyBinaryMaskToPixelData.ts

@@ -1,4 +1,6 @@
-import { type ApplyMaskToPixelDataOptions, type BinaryMask, type IPixelData32 } from '../_types'
+import { type ApplyMaskToPixelDataOptions } from '../_types'
+import type { BinaryMask } from '../Mask/_mask-types'
+import type { PixelData32 } from './_pixelData-types'
 
 /**
  * Directly applies a mask to a region of PixelData,
@@ -6,14 +8,14 @@ import { type ApplyMaskToPixelDataOptions, type BinaryMask, type IPixelData32 }
  * @returns true if any pixels were actually modified.
  */
 export function applyBinaryMaskToPixelData(
-  target: IPixelData32,
+  target: PixelData32,
   mask: BinaryMask,
   opts?: ApplyMaskToPixelDataOptions,
 ): boolean {
   const targetX = opts?.x ?? 0
   const targetY = opts?.y ?? 0
-  const width = opts?.w ?? target.width
-  const height = opts?.h ?? target.height
+  const width = opts?.w ?? target.w
+  const height = opts?.h ?? target.h
   const globalAlpha = opts?.alpha ?? 255
   const mx = opts?.mx ?? 0
   const my = opts?.my ?? 0
@@ -36,8 +38,8 @@ export function applyBinaryMaskToPixelData(
     y = 0
   }
 
-  w = Math.min(w, target.width - x)
-  h = Math.min(h, target.height - y)
+  w = Math.min(w, target.w - x)
+  h = Math.min(h, target.h - y)
 
   if (w <= 0 || h <= 0) return false
 
@@ -67,8 +69,8 @@ export function applyBinaryMaskToPixelData(
   const xShift = sX0 - startX
   const yShift = sY0 - startY
 
-  const dst32 = target.data32
-  const dw = target.width
+  const dst32 = target.data
+  const dw = target.w
   const dStride = dw - finalW
   const mStride = mPitch - finalW
   const maskData = mask.data

package/src/PixelData/applyMaskToPixelData.ts

@@ -1,16 +1,11 @@
-import {
-  type AlphaMask,
-  type ApplyMaskToPixelDataOptions,
-  type BinaryMask,
-  type IPixelData32,
-  type Mask,
-  MaskType,
-} from '../_types'
+import { type ApplyMaskToPixelDataOptions } from '../_types'
+import { type AlphaMask, type BinaryMask, type Mask, MaskType } from '../Mask/_mask-types'
+import type { PixelData32 } from './_pixelData-types'
 import { applyAlphaMaskToPixelData } from './applyAlphaMaskToPixelData'
 import { applyBinaryMaskToPixelData } from './applyBinaryMaskToPixelData'
 
 export function applyMaskToPixelData(
-  dst: IPixelData32,
+  dst: PixelData32,
   mask: Mask,
   opts?: ApplyMaskToPixelDataOptions,
 ): boolean {

package/src/PixelData/blendColorPixelData.ts

@@ -1,19 +1,20 @@
-import { type Color32, type ColorBlendOptions, type IPixelData32 } from '../_types'
+import { type Color32, type ColorBlendOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { PixelData32 } from './_pixelData-types'
 
 /**
  * Blends a solid color into a target pixel buffer.
  * @returns true if any pixels were actually modified.
  */
 export function blendColorPixelData(
-  target: IPixelData32,
+  target: PixelData32,
   color: Color32,
   opts?: ColorBlendOptions,
 ): boolean {
   const targetX = opts?.x ?? 0
   const targetY = opts?.y ?? 0
-  const width = opts?.w ?? target.width
-  const height = opts?.h ?? target.height
+  const width = opts?.w ?? target.w
+  const height = opts?.h ?? target.h
   const globalAlpha = opts?.alpha ?? 255
   const blendFn = opts?.blendFn ?? sourceOverPerfect
   if (globalAlpha === 0) return false
@@ -39,8 +40,8 @@ export function blendColorPixelData(
     y = 0
   }
 
-  const actualW = Math.min(w, target.width - x)
-  const actualH = Math.min(h, target.height - y)
+  const actualW = Math.min(w, target.w - x)
+  const actualH = Math.min(h, target.h - y)
 
   if (actualW <= 0 || actualH <= 0) return false
 
@@ -53,8 +54,8 @@ export function blendColorPixelData(
     finalSrcColor = ((color & 0x00ffffff) | (a << 24)) >>> 0 as Color32
   }
 
-  const dst32 = target.data32
-  const dw = target.width
+  const dst32 = target.data
+  const dw = target.w
   let dIdx = (y * dw + x) | 0
   const dStride = (dw - actualW) | 0
   let didChange = false

package/src/PixelData/blendColorPixelDataAlphaMask.ts

@@ -1,5 +1,7 @@
-import type { AlphaMask, Color32, ColorBlendMaskOptions, IPixelData32 } from '../_types'
+import type { Color32, ColorBlendMaskOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { AlphaMask } from '../Mask/_mask-types'
+import type { PixelData32 } from './_pixelData-types'
 
 /**
  * Blends a solid color into a target pixel buffer using an alpha mask.
@@ -8,14 +10,14 @@ import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
  * If the width (`w`) or height (`h`) are omitted from the options, they will safely
  * default to the dimensions of the provided mask to prevent out-of-bounds memory access.
  *
- * @param target - The destination {@link IPixelData32} buffer to modify.
+ * @param target - The destination {@link PixelData32} buffer to modify.
  * @param color - The solid color to apply.
  * @param mask - The mask defining the per-pixel opacity of the target area.
  * @param opts - Configuration options including placement coordinates, bounds, global alpha, and mask offsets.
  * @returns true if any pixels were actually modified.
  */
 export function blendColorPixelDataAlphaMask(
-  target: IPixelData32,
+  target: PixelData32,
   color: Color32,
   mask: AlphaMask,
   opts?: ColorBlendMaskOptions,
@@ -52,16 +54,16 @@ export function blendColorPixelDataAlphaMask(
     y = 0
   }
 
-  actualW = Math.min(actualW, target.width - x)
-  actualH = Math.min(actualH, target.height - y)
+  actualW = Math.min(actualW, target.w - x)
+  actualH = Math.min(actualH, target.h - y)
 
   if (actualW <= 0 || actualH <= 0) return false
 
   const dx = (x - targetX) | 0
   const dy = (y - targetY) | 0
 
-  const dst32 = target.data32
-  const dw = target.width
+  const dst32 = target.data
+  const dw = target.w
   const mPitch = mask.w
   const maskData = mask.data
 

package/src/PixelData/blendColorPixelDataBinaryMask.ts

@@ -1,5 +1,7 @@
-import type { BinaryMask, Color32, ColorBlendMaskOptions, IPixelData32 } from '../_types'
+import type { Color32, ColorBlendMaskOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { BinaryMask } from '../Mask/_mask-types'
+import type { PixelData32 } from './_pixelData-types'
 
 /**
  * Blends a solid color into a target pixel buffer using a binary mask.
@@ -8,14 +10,14 @@ import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
  * If the width (`w`) or height (`h`) are omitted from the options, they will safely
  * default to the dimensions of the provided mask to prevent out-of-bounds memory access.
  *
- * @param target - The destination {@link IPixelData32} buffer to modify.
+ * @param target - The destination {@link PixelData32} buffer to modify.
  * @param color - The solid color to apply.
  * @param mask - The mask defining the per-pixel opacity of the target area.
  * @param opts - Configuration options including placement coordinates, bounds, global alpha, and mask offsets.
  * @returns true if any pixels were actually modified.
  */
 export function blendColorPixelDataBinaryMask(
-  target: IPixelData32,
+  target: PixelData32,
   color: Color32,
   mask: BinaryMask,
   opts?: ColorBlendMaskOptions,
@@ -50,8 +52,8 @@ export function blendColorPixelDataBinaryMask(
     y = 0
   }
 
-  const actualW = Math.min(w, target.width - x)
-  const actualH = Math.min(h, target.height - y)
+  const actualW = Math.min(w, target.w - x)
+  const actualH = Math.min(h, target.h - y)
 
   if (actualW <= 0 || actualH <= 0) return false
 
@@ -65,8 +67,8 @@ export function blendColorPixelDataBinaryMask(
 
   const dx = (x - targetX) | 0
   const dy = (y - targetY) | 0
-  const dst32 = target.data32
-  const dw = target.width
+  const dst32 = target.data
+  const dw = target.w
   const mPitch = mask.w
   const maskData = mask.data
   let dIdx = (y * dw + x) | 0

package/src/PixelData/blendColorPixelDataMask.ts

@@ -1,9 +1,11 @@
-import { type Color32, type ColorBlendMaskOptions, type IPixelData32, type Mask, MaskType } from '../_types'
+import { type Color32, type ColorBlendMaskOptions } from '../_types'
+import { type Mask, MaskType } from '../Mask/_mask-types'
+import type { PixelData32 } from './_pixelData-types'
 import { blendColorPixelDataAlphaMask } from './blendColorPixelDataAlphaMask'
 import { blendColorPixelDataBinaryMask } from './blendColorPixelDataBinaryMask'
 
 export function blendColorPixelDataMask(
-  dst: IPixelData32,
+  dst: PixelData32,
   color: Color32,
   mask: Mask,
   opts?: ColorBlendMaskOptions,

package/src/PixelData/blendColorPixelDataPaintAlphaMask.ts

@@ -1,5 +1,7 @@
-import { type Color32, type IPixelData32, type PaintAlphaMask } from '../_types'
+import { type Color32 } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { PaintAlphaMask } from '../Paint/_paint-types'
+import type { PixelData32 } from './_pixelData-types'
 import { blendColorPixelDataAlphaMask } from './blendColorPixelDataAlphaMask'
 
 const SCRATCH_OPTS = {
@@ -10,7 +12,7 @@ const SCRATCH_OPTS = {
 }
 
 export function blendColorPixelDataPaintAlphaMask(
-  dst: IPixelData32,
+  dst: PixelData32,
   color: Color32,
   mask: PaintAlphaMask,
   x: number,

package/src/PixelData/blendColorPixelDataPaintBinaryMask.ts

@@ -1,5 +1,7 @@
-import { type Color32, type IPixelData32, type PaintBinaryMask } from '../_types'
+import { type Color32 } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { PaintBinaryMask } from '../Paint/_paint-types'
+import type { PixelData32 } from './_pixelData-types'
 import { blendColorPixelDataBinaryMask } from './blendColorPixelDataBinaryMask'
 
 const SCRATCH_OPTS = {
@@ -10,7 +12,7 @@ const SCRATCH_OPTS = {
 }
 
 export function blendColorPixelDataPaintBinaryMask(
-  dst: IPixelData32,
+  dst: PixelData32,
   color: Color32,
   mask: PaintBinaryMask,
   x: number,

package/src/PixelData/blendColorPixelDataPaintMask.ts

@@ -1,5 +1,8 @@
-import { type Color32, type IPixelData32, MaskType, type PaintMask } from '../_types'
+import { type Color32 } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import { MaskType } from '../Mask/_mask-types'
+import type { PaintMask } from '../Paint/_paint-types'
+import type { PixelData32 } from './_pixelData-types'
 import { blendColorPixelDataAlphaMask } from './blendColorPixelDataAlphaMask'
 import { blendColorPixelDataBinaryMask } from './blendColorPixelDataBinaryMask'
 
@@ -11,7 +14,7 @@ const SCRATCH_OPTS = {
 }
 
 export function blendColorPixelDataPaintMask(
-  dst: IPixelData32,
+  dst: PixelData32,
   color: Color32,
   mask: PaintMask,
   x: number,

package/src/PixelData/blendPixel.ts

@@ -1,8 +1,9 @@
-import type { BlendColor32, Color32, IPixelData32 } from '../_types'
+import type { BlendColor32, Color32 } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { PixelData32 } from './_pixelData-types'
 
 export function blendPixel(
-  target: IPixelData32,
+  target: PixelData32,
   x: number,
   y: number,
   color: Color32,
@@ -11,8 +12,8 @@ export function blendPixel(
 ): boolean {
   if (alpha === 0) return false
 
-  let width = target.width
-  let height = target.height
+  let width = target.w
+  let height = target.h
 
   if (x < 0 || x >= width || y < 0 || y >= height) return false
 
@@ -22,7 +23,7 @@ export function blendPixel(
   // Early exit for transparent source unless we are in an overwrite mode
   if (srcAlpha === 0 && !isOverwrite) return false
 
-  let dst32 = target.data32
+  let dst32 = target.data
   let index = y * width + x
   let finalColor = color
 

package/src/PixelData/blendPixelData.ts

@@ -1,5 +1,6 @@
-import { type Color32, type IPixelData32, type PixelBlendOptions } from '../_types'
+import { type Color32, type PixelBlendOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { PixelData32 } from './_pixelData-types'
 
 /**
  * Blits source PixelData into a destination PixelData using 32-bit integer bitwise blending.
@@ -16,16 +17,16 @@ import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
  * });
  */
 export function blendPixelData(
-  target: IPixelData32,
-  src: IPixelData32,
+  target: PixelData32,
+  src: PixelData32,
   opts?: PixelBlendOptions,
 ): boolean {
   const targetX = opts?.x ?? 0
   const targetY = opts?.y ?? 0
   const sourceX = opts?.sx ?? 0
   const sourceY = opts?.sy ?? 0
-  const width = opts?.w ?? src.width
-  const height = opts?.h ?? src.height
+  const width = opts?.w ?? src.w
+  const height = opts?.h ?? src.h
   const globalAlpha = opts?.alpha ?? 255
   const blendFn = opts?.blendFn ?? sourceOverPerfect
 
@@ -48,8 +49,8 @@ export function blendPixelData(
     h += sy
     sy = 0
   }
-  w = Math.min(w, src.width - sx)
-  h = Math.min(h, src.height - sy)
+  w = Math.min(w, src.w - sx)
+  h = Math.min(h, src.h - sy)
   if (x < 0) {
     sx -= x
     w += x
@@ -61,14 +62,14 @@ export function blendPixelData(
     y = 0
   }
 
-  const actualW = Math.min(w, target.width - x)
-  const actualH = Math.min(h, target.height - y)
+  const actualW = Math.min(w, target.w - x)
+  const actualH = Math.min(h, target.h - y)
   if (actualW <= 0 || actualH <= 0) return false
 
-  const dst32 = target.data32
-  const src32 = src.data32
-  const dw = target.width
-  const sw = src.width
+  const dst32 = target.data
+  const src32 = src.data
+  const dw = target.w
+  const sw = src.w
 
   let dIdx = (y * dw + x) | 0
   let sIdx = (sy * sw + sx) | 0

package/src/PixelData/blendPixelDataAlphaMask.ts

@@ -1,9 +1,11 @@
-import { type AlphaMask, type Color32, type IPixelData32, type PixelBlendMaskOptions } from '../_types'
+import { type Color32, type PixelBlendMaskOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { AlphaMask } from '../Mask/_mask-types'
+import type { PixelData32 } from './_pixelData-types'
 
 export function blendPixelDataAlphaMask(
-  target: IPixelData32,
-  src: IPixelData32,
+  target: PixelData32,
+  src: PixelData32,
   alphaMask: AlphaMask,
   opts?: PixelBlendMaskOptions,
 ): boolean {
@@ -11,8 +13,8 @@ export function blendPixelDataAlphaMask(
   const targetY = opts?.y ?? 0
   const sourceX = opts?.sx ?? 0
   const sourceY = opts?.sy ?? 0
-  const width = opts?.w ?? src.width
-  const height = opts?.h ?? src.height
+  const width = opts?.w ?? src.w
+  const height = opts?.h ?? src.h
   const globalAlpha = opts?.alpha ?? 255
   const blendFn = opts?.blendFn ?? sourceOverPerfect
   const mx = opts?.mx ?? 0
@@ -39,8 +41,8 @@ export function blendPixelDataAlphaMask(
     h += sy
     sy = 0
   }
-  w = Math.min(w, src.width - sx)
-  h = Math.min(h, src.height - sy)
+  w = Math.min(w, src.w - sx)
+  h = Math.min(h, src.h - sy)
   if (x < 0) {
     sx -= x
     w += x
@@ -52,13 +54,13 @@ export function blendPixelDataAlphaMask(
     y = 0
   }
 
-  const actualW = Math.min(w, target.width - x)
-  const actualH = Math.min(h, target.height - y)
+  const actualW = Math.min(w, target.w - x)
+  const actualH = Math.min(h, target.h - y)
   if (actualW <= 0 || actualH <= 0) return false
 
   // 2. Index Setup
-  const dw = target.width
-  const sw = src.width
+  const dw = target.w
+  const sw = src.w
   const mPitch = alphaMask.w
   const maskData = alphaMask.data
 
@@ -67,8 +69,8 @@ export function blendPixelDataAlphaMask(
   const dx = (x - targetX) | 0
   const dy = (y - targetY) | 0
 
-  const dst32 = target.data32
-  const src32 = src.data32
+  const dst32 = target.data
+  const src32 = src.data
 
   let dIdx = (y * dw + x) | 0
   let sIdx = (sy * sw + sx) | 0

package/src/PixelData/blendPixelDataBinaryMask.ts

@@ -1,9 +1,11 @@
-import type { BinaryMask, Color32, IPixelData32, PixelBlendMaskOptions } from '../_types'
+import type { Color32, PixelBlendMaskOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { BinaryMask } from '../Mask/_mask-types'
+import type { PixelData32 } from './_pixelData-types'
 
 export function blendPixelDataBinaryMask(
-  target: IPixelData32,
-  src: IPixelData32,
+  target: PixelData32,
+  src: PixelData32,
   binaryMask: BinaryMask,
   opts?: PixelBlendMaskOptions,
 ): boolean {
@@ -11,8 +13,8 @@ export function blendPixelDataBinaryMask(
   const targetY = opts?.y ?? 0
   const sourceX = opts?.sx ?? 0
   const sourceY = opts?.sy ?? 0
-  const width = opts?.w ?? src.width
-  const height = opts?.h ?? src.height
+  const width = opts?.w ?? src.w
+  const height = opts?.h ?? src.h
   const globalAlpha = opts?.alpha ?? 255
   const blendFn = opts?.blendFn ?? sourceOverPerfect
   const mx = opts?.mx ?? 0
@@ -39,8 +41,8 @@ export function blendPixelDataBinaryMask(
     h += sy
     sy = 0
   }
-  w = Math.min(w, src.width - sx)
-  h = Math.min(h, src.height - sy)
+  w = Math.min(w, src.w - sx)
+  h = Math.min(h, src.h - sy)
 
   // 2. Destination Clipping
   if (x < 0) {
@@ -54,8 +56,8 @@ export function blendPixelDataBinaryMask(
     y = 0
   }
 
-  const actualW = Math.min(w, target.width - x)
-  const actualH = Math.min(h, target.height - y)
+  const actualW = Math.min(w, target.w - x)
+  const actualH = Math.min(h, target.h - y)
 
   if (actualW <= 0 || actualH <= 0) return false
 
@@ -65,10 +67,10 @@ export function blendPixelDataBinaryMask(
   const dx = (x - targetX) | 0
   const dy = (y - targetY) | 0
 
-  const dst32 = target.data32
-  const src32 = src.data32
-  const dw = target.width
-  const sw = src.width
+  const dst32 = target.data
+  const src32 = src.data
+  const dw = target.w
+  const sw = src.w
   const mPitch = binaryMask.w
   const maskData = binaryMask.data
 

package/src/PixelData/blendPixelDataMask.ts

@@ -1,10 +1,12 @@
-import { type IPixelData32, type Mask, MaskType, type PixelBlendMaskOptions } from '../_types'
+import { type PixelBlendMaskOptions } from '../_types'
+import { type Mask, MaskType } from '../Mask/_mask-types'
+import type { PixelData32 } from './_pixelData-types'
 import { blendPixelDataAlphaMask } from './blendPixelDataAlphaMask'
 import { blendPixelDataBinaryMask } from './blendPixelDataBinaryMask'
 
 export function blendPixelDataMask(
-  target: IPixelData32,
-  src: IPixelData32,
+  target: PixelData32,
+  src: PixelData32,
   mask: Mask,
   opts?: PixelBlendMaskOptions,
 ): boolean {

package/src/PixelData/blendPixelDataPaintBuffer.ts

@@ -1,6 +1,7 @@
-import type { BlendColor32, IPixelData32 } from '../_types'
+import type { BlendColor32 } from '../_types'
+import type { ColorPaintBuffer } from '../Paint/ColorPaintBuffer'
+import type { PixelData32 } from './_pixelData-types'
 import { blendPixelData } from './blendPixelData'
-import type { PaintBuffer } from '../Paint/PaintBuffer'
 
 const SCRATCH_OPTS = {
   x: 0,
@@ -10,8 +11,8 @@ const SCRATCH_OPTS = {
 }
 
 export function blendPixelDataPaintBuffer(
-  target: IPixelData32,
-  paintBuffer: PaintBuffer,
+  target: PixelData32,
+  paintBuffer: ColorPaintBuffer,
   alpha = 255,
   blendFn?: BlendColor32,
   blendPixelDataFn = blendPixelData,

package/src/PixelData/clearPixelDataFast.ts

@@ -1,4 +1,6 @@
-import type { BinaryMaskRect, Color32, IPixelData32 } from '../_types'
+import type { Color32 } from '../_types'
+import type { BinaryMaskRect } from '../Mask/_mask-types'
+import type { PixelData32 } from './_pixelData-types'
 import { fillPixelDataFast } from './fillPixelDataFast'
 
 /**
@@ -6,7 +8,7 @@ import { fillPixelDataFast } from './fillPixelDataFast'
  * Internally uses the optimized fillPixelDataFast.
  */
 export function clearPixelDataFast(
-  dst: IPixelData32,
+  dst: PixelData32,
   rect?: Partial<BinaryMaskRect>,
 ): void {
   fillPixelDataFast(dst, 0 as Color32, rect)

package/src/PixelData/copyPixelData.ts

@@ -0,0 +1,14 @@
+import type { ImageDataLike } from '../ImageData/_ImageData-types'
+import type { PixelData } from './_pixelData-types'
+import { makePixelData } from './PixelData'
+
+export function copyPixelData<T extends ImageDataLike = ImageData>(target: PixelData<T>): PixelData {
+  const data = target.imageData.data
+  const buffer = new Uint8ClampedArray(data)
+
+  return makePixelData(new ImageData(
+    buffer,
+    target.w,
+    target.h,
+  ))
+}

package/src/PixelData/extractPixelData.ts

@@ -1,15 +1,16 @@
-import type { IPixelData32, Rect } from '../_types'
+import type { Rect } from '../Rect/_rect-types'
+import type { PixelData, PixelData32 } from './_pixelData-types'
 import { extractPixelDataBuffer } from './extractPixelDataBuffer'
-import { PixelData } from './PixelData'
+import { makePixelData } from './PixelData'
 
 /**
  * High-level extraction that returns a new PixelData instance.
  * Leverages extractPixelDataBuffer for optimized 32-bit memory moves.
  */
-export function extractPixelData(source: IPixelData32, rect: Rect): PixelData
-export function extractPixelData(source: IPixelData32, x: number, y: number, w: number, h: number): PixelData
+export function extractPixelData(source: PixelData32, rect: Rect): PixelData
+export function extractPixelData(source: PixelData32, x: number, y: number, w: number, h: number): PixelData
 export function extractPixelData(
-  source: IPixelData32,
+  source: PixelData32,
   _x: Rect | number,
   _y?: number,
   _w?: number,
@@ -19,10 +20,10 @@ export function extractPixelData(
     ? _x
     : { x: _x, y: _y!, w: _w!, h: _h! }
 
-  const result = new PixelData(new ImageData(w, h))
+  const result = makePixelData(new ImageData(w, h))
 
   const buffer = extractPixelDataBuffer(source, x, y, w, h)
-  result.data32.set(buffer)
+  result.data.set(buffer)
 
   return result
 }

package/src/PixelData/extractPixelDataBuffer.ts

@@ -1,5 +1,6 @@
-import type { IPixelData32, Rect } from '../_types'
-import { makeClippedBlit, resolveBlitClipping } from '../Internal/resolveClipping'
+import type { Rect } from '../Rect/_rect-types'
+import { makeClippedBlit, resolveBlitClipping } from '../Rect/resolveClipping'
+import type { PixelData32 } from './_pixelData-types'
 
 const SCRATCH_BLIT = makeClippedBlit()
 
@@ -7,10 +8,10 @@ const SCRATCH_BLIT = makeClippedBlit()
  * Extracts a rectangular region of pixels from PixelData.
  * Returns a new Uint32Array containing the extracted pixels.
  */
-export function extractPixelDataBuffer(source: IPixelData32, rect: Rect): Uint32Array
-export function extractPixelDataBuffer(source: IPixelData32, x: number, y: number, w: number, h: number): Uint32Array
+export function extractPixelDataBuffer(source: PixelData32, rect: Rect): Uint32Array
+export function extractPixelDataBuffer(source: PixelData32, x: number, y: number, w: number, h: number): Uint32Array
 export function extractPixelDataBuffer(
-  source: IPixelData32,
+  source: PixelData32,
   _x: Rect | number,
   _y?: number,
   _w?: number,
@@ -20,9 +21,9 @@ export function extractPixelDataBuffer(
     ? _x
     : { x: _x, y: _y!, w: _w!, h: _h! }
 
-  const srcW = source.width
-  const srcH = source.height
-  const srcData = source.data32
+  const srcW = source.w
+  const srcH = source.h
+  const srcData = source.data
 
   // Safety check for empty or invalid dimensions
   if (w <= 0 || h <= 0) {