pixel-data-js 0.10.0 → 0.11.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pixel-data-js",
   "type": "module",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "packageManager": "pnpm@10.30.0",
   "description": "JS Pixel and ImageData operations",
   "author": {

package/src/ImageData/resampleImageData.ts

@@ -2,34 +2,16 @@
  * Resamples ImageData by a specific factor.
  * Factor > 1 upscales, Factor < 1 downscales.
  */
-export function resampleImageData(
-  source: ImageData,
-  factor: number,
-): ImageData {
-  const srcW = source.width
-  const srcH = source.height
-  const dstW = Math.max(1, (srcW * factor) | 0)
-  const dstH = Math.max(1, (srcH * factor) | 0)
-  const srcData = source.data
-  const dstData = new Uint8ClampedArray(dstW * dstH * 4)
+import { resample32 } from '../Internal/resample32'
 
-  for (let y = 0; y < dstH; y++) {
-    const srcY = (y / factor) | 0
-    const srcRowOffset = srcY * srcW * 4
-    const dstRowOffset = y * dstW * 4
-
-    for (let x = 0; x < dstW; x++) {
-      const srcX = (x / factor) | 0
-      const srcIdx = srcRowOffset + srcX * 4
-      const dstIdx = dstRowOffset + x * 4
-
-      // Copy RGBA channels
-      dstData[dstIdx] = srcData[srcIdx]!
-      dstData[dstIdx + 1] = srcData[srcIdx + 1]!
-      dstData[dstIdx + 2] = srcData[srcIdx + 2]!
-      dstData[dstIdx + 3] = srcData[srcIdx + 3]!
-    }
-  }
+/**
+ * Resamples ImageData by a specific factor.
+ * Factor > 1 upscales, Factor < 1 downscales.
+ */
+export function resampleImageData(source: ImageData, factor: number): ImageData {
+  const src32 = new Uint32Array(source.data.buffer)
+  const { data, width, height } = resample32(src32, source.width, source.height, factor)
 
-  return new ImageData(dstData, dstW, dstH)
+  const uint8ClampedArray = new Uint8ClampedArray(data.buffer) as Uint8ClampedArray<ArrayBuffer>
+  return new ImageData(uint8ClampedArray, width, height)
 }

package/src/IndexedImage/IndexedImage.ts

@@ -26,15 +26,24 @@ export type IndexedImage = {
 /**
  * Converts standard ImageData into an IndexedImage format.
  */
-/**
- * Converts standard ImageData into an IndexedImage format.
- */
-export function makeIndexedImage(imageData: ImageData): IndexedImage {
-  const width = imageData.width
-  const height = imageData.height
+export function makeIndexedImage(imageData: ImageData): IndexedImage;
+export function makeIndexedImage(
+  data: Uint8ClampedArray,
+  width: number,
+  height: number,
+): IndexedImage;
+export function makeIndexedImage(
+  imageOrData: ImageData | Uint8ClampedArray,
+  width?: number,
+  height?: number,
+): IndexedImage {
+  const isImageData = 'width' in imageOrData
+  const actualWidth = isImageData ? imageOrData.width : (width as number)
+  const actualHeight = isImageData ? imageOrData.height : (height as number)
+  const buffer = isImageData ? imageOrData.data.buffer : imageOrData.buffer
 
-  // Use a 32-bit view to read pixels as packed integers (usually ABGR or RGBA)
-  const rawData = new Uint32Array(imageData.data.buffer)
+  // Use a 32-bit view to read pixels as packed integers (unsigned)
+  const rawData = new Uint32Array(buffer)
   const indexedData = new Int32Array(rawData.length)
   const colorMap = new Map<number, number>()
 
@@ -47,15 +56,14 @@ export function makeIndexedImage(imageData: ImageData): IndexedImage {
   for (let i = 0; i < rawData.length; i++) {
     const pixel = rawData[i]!
 
-    // Check if the pixel is fully transparent
+    // Check if the pixel is fully transparent (Alpha channel is highest byte)
     const alpha = (pixel >>> 24) & 0xFF
     const isTransparent = alpha === 0
-    const colorKey = isTransparent ? transparentColor : pixel
+    const colorKey = isTransparent ? transparentColor : (pixel >>> 0)
 
     let id = colorMap.get(colorKey)
 
     if (id === undefined) {
-      // Use the current length as the next ID to ensure sequence
       id = colorMap.size
       colorMap.set(colorKey, id)
     }
@@ -63,10 +71,11 @@ export function makeIndexedImage(imageData: ImageData): IndexedImage {
     indexedData[i] = id
   }
 
-  const palette = new Uint32Array(colorMap.keys())
+  const palette = Uint32Array.from(colorMap.keys())
+
   return {
-    width,
-    height,
+    width: actualWidth,
+    height: actualHeight,
     data: indexedData,
     transparentPalletIndex,
     palette,

package/src/IndexedImage/resampleIndexedImage.ts

@@ -1,4 +1,9 @@
+/**
+ * Resamples an IndexedImage by a specific factor using nearest neighbor
+ * Factor > 1 upscales, Factor < 1 downscales.
+ */
 import type { IndexedImage } from '../index'
+import { resample32 } from '../Internal/resample32'
 
 /**
  * Resamples an IndexedImage by a specific factor using nearest neighbor
@@ -8,28 +13,18 @@ export function resampleIndexedImage(
   source: IndexedImage,
   factor: number,
 ): IndexedImage {
-  const srcW = source.width
-  const srcH = source.height
-  const dstW = srcW * factor
-  const dstH = srcH * factor
-  const srcData = source.data
-  const dstData = new Int32Array(dstW * dstH)
-
-  for (let y = 0; y < dstH; y++) {
-    const srcY = (y / factor) | 0
-    const rowOffset = srcY * srcW
-    const dstOffset = y * dstW
 
-    for (let x = 0; x < dstW; x++) {
-      const srcX = (x / factor) | 0
-      dstData[dstOffset + x] = srcData[rowOffset + srcX]!
-    }
-  }
+  const { data, width, height } = resample32(
+    source.data,
+    source.width,
+    source.height,
+    factor,
+  )
 
   return {
-    width: dstW,
-    height: dstH,
-    data: dstData,
+    width,
+    height,
+    data,
     palette: source.palette,
     transparentPalletIndex: source.transparentPalletIndex,
   }

package/src/Internal/resample32.ts

@@ -0,0 +1,40 @@
+const resample32Scratch = {
+  data: null as null | Int32Array,
+  width: 0,
+  height: 0,
+}
+
+type Resample32Result = { data: Int32Array; width: number; height: number }
+
+export function resample32(
+  srcData32: Uint32Array | Int32Array,
+  srcW: number,
+  srcH: number,
+  factor: number,
+): Resample32Result {
+  const dstW = Math.max(1, (srcW * factor) | 0)
+  const dstH = Math.max(1, (srcH * factor) | 0)
+  const dstData = new Int32Array(dstW * dstH)
+
+  // Use the reciprocal to map back precisely
+  const scaleX = srcW / dstW
+  const scaleY = srcH / dstH
+
+  for (let y = 0; y < dstH; y++) {
+    const srcY = Math.min(srcH - 1, (y * scaleY) | 0)
+    const srcRowOffset = srcY * srcW
+    const dstRowOffset = y * dstW
+
+    for (let x = 0; x < dstW; x++) {
+      const srcX = Math.min(srcW - 1, (x * scaleX) | 0)
+
+      dstData[dstRowOffset + x] = srcData32[srcRowOffset + srcX]!
+    }
+  }
+
+  resample32Scratch.data = dstData
+  resample32Scratch.width = dstW
+  resample32Scratch.height = dstH
+
+  return resample32Scratch as Resample32Result
+}

package/src/PixelData/resamplePixelData.ts

@@ -1,29 +1,23 @@
-import { PixelData } from '../index'
-
 /**
  * Resamples an PixelData by a specific factor using nearest neighbor
  * Factor > 1 upscales, Factor < 1 downscales.
  */
-export function resamplePixelData(pixelData: PixelData, factor: number): PixelData {
-  const dstW = Math.max(1, (pixelData.width * factor) | 0)
-  const dstH = Math.max(1, (pixelData.height * factor) | 0)
-  const dstBuffer = new Uint8ClampedArray(dstW * dstH * 4)
-  const dstData32 = new Uint32Array(dstBuffer.buffer)
-
-  for (let y = 0; y < dstH; y++) {
-    const srcY = (y / factor) | 0
-    const srcRowOffset = srcY * pixelData.width
-    const dstRowOffset = y * dstW
+import { PixelData } from '../index'
+import { resample32 } from '../Internal/resample32'
 
-    for (let x = 0; x < dstW; x++) {
-      const srcX = (x / factor) | 0
-      dstData32[dstRowOffset + x] = pixelData.data32[srcRowOffset + srcX]!
-    }
-  }
+/**
+ * Resamples PixelData by a specific factor using nearest neighbor.
+ * Factor > 1 upscales, Factor < 1 downscales.
+ */
+export function resamplePixelData(
+  pixelData: PixelData,
+  factor: number,
+): PixelData {
+  const { data, width, height } = resample32(pixelData.data32, pixelData.width, pixelData.height, factor)
 
   return new PixelData({
-    data: dstBuffer,
-    width: dstW,
-    height: dstH,
+    width,
+    height,
+    data: new Uint8ClampedArray(data.buffer),
   })
 }