pixel-data-js 0.10.0 → 0.11.0

package/dist/index.dev.cjs

@@ -1641,29 +1641,39 @@ function invertImageData(imageData) {
   return imageData;
 }
 
-// src/ImageData/resampleImageData.ts
-function resampleImageData(source, factor) {
-  const srcW = source.width;
-  const srcH = source.height;
+// src/Internal/resample32.ts
+var resample32Scratch = {
+  data: null,
+  width: 0,
+  height: 0
+};
+function resample32(srcData32, srcW, srcH, factor) {
   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);
+  const dstData = new Int32Array(dstW * dstH);
+  const scaleX = srcW / dstW;
+  const scaleY = srcH / dstH;
   for (let y = 0; y < dstH; y++) {
-    const srcY = y / factor | 0;
-    const srcRowOffset = srcY * srcW * 4;
-    const dstRowOffset = y * dstW * 4;
+    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 = x / factor | 0;
-      const srcIdx = srcRowOffset + srcX * 4;
-      const dstIdx = dstRowOffset + x * 4;
-      dstData[dstIdx] = srcData[srcIdx];
-      dstData[dstIdx + 1] = srcData[srcIdx + 1];
-      dstData[dstIdx + 2] = srcData[srcIdx + 2];
-      dstData[dstIdx + 3] = srcData[srcIdx + 3];
+      const srcX = Math.min(srcW - 1, x * scaleX | 0);
+      dstData[dstRowOffset + x] = srcData32[srcRowOffset + srcX];
     }
   }
-  return new ImageData(dstData, dstW, dstH);
+  resample32Scratch.data = dstData;
+  resample32Scratch.width = dstW;
+  resample32Scratch.height = dstH;
+  return resample32Scratch;
+}
+
+// src/ImageData/resampleImageData.ts
+function resampleImageData(source, factor) {
+  const src32 = new Uint32Array(source.data.buffer);
+  const { data, width, height } = resample32(src32, source.width, source.height, factor);
+  const uint8ClampedArray = new Uint8ClampedArray(data.buffer);
+  return new ImageData(uint8ClampedArray, width, height);
 }
 
 // src/ImageData/resizeImageData.ts
@@ -1760,10 +1770,12 @@ function writeImageDataPixels(imageData, data, _x, _y, _w, _h) {
 }
 
 // src/IndexedImage/IndexedImage.ts
-function makeIndexedImage(imageData) {
-  const width = imageData.width;
-  const height = imageData.height;
-  const rawData = new Uint32Array(imageData.data.buffer);
+function makeIndexedImage(imageOrData, width, height) {
+  const isImageData = "width" in imageOrData;
+  const actualWidth = isImageData ? imageOrData.width : width;
+  const actualHeight = isImageData ? imageOrData.height : height;
+  const buffer = isImageData ? imageOrData.data.buffer : imageOrData.buffer;
+  const rawData = new Uint32Array(buffer);
   const indexedData = new Int32Array(rawData.length);
   const colorMap = /* @__PURE__ */ new Map();
   const transparentColor = 0;
@@ -1773,7 +1785,7 @@ function makeIndexedImage(imageData) {
     const pixel = rawData[i];
     const alpha = pixel >>> 24 & 255;
     const isTransparent = alpha === 0;
-    const colorKey = isTransparent ? transparentColor : pixel;
+    const colorKey = isTransparent ? transparentColor : pixel >>> 0;
     let id = colorMap.get(colorKey);
     if (id === void 0) {
       id = colorMap.size;
@@ -1781,10 +1793,10 @@ function makeIndexedImage(imageData) {
     }
     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
@@ -1847,25 +1859,16 @@ function indexedImageToAverageColor(indexedImage, includeTransparent = false) {
 
 // src/IndexedImage/resampleIndexedImage.ts
 function resampleIndexedImage(source, factor) {
-  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
   };
@@ -2497,23 +2500,11 @@ function reflectPixelDataVertical(pixelData) {
 
 // src/PixelData/resamplePixelData.ts
 function resamplePixelData(pixelData, factor) {
-  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;
-    for (let x = 0; x < dstW; x++) {
-      const srcX = x / factor | 0;
-      dstData32[dstRowOffset + x] = pixelData.data32[srcRowOffset + srcX];
-    }
-  }
+  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)
   });
 }