fix support for 64x32 images

Author: InventivetalentDev

__test__/index.spec.mjs

@@ -1,6 +1,6 @@
 import test from 'ava'
 
-import { sum, encodeImage } from '../index.js'
+import { sum, encodeImage, encodeImageSize } from '../index.js'
 import * as fs from "fs";
 
 test('sum from native', (t) => {
@@ -9,11 +9,11 @@ test('sum from native', (t) => {
 
 // empty hash a67c89456ea2fcd58cdf557c01357632d4f0d28c51dd0d8f79a4c739352f71a7
 
-function testEncode(t, imagePath, expectedHash, trim = false) {
+function testEncode(t, imagePath, expectedHash, height = 64, trim = false) {
     let buffer = fs.readFileSync(imagePath);
 
     //let arr = new Uint8Array(buffer);
-    let encoded = encodeImage(buffer);
+    let encoded = encodeImageSize(buffer, 64, height);
 
     let hash = Buffer.from(encoded.hash).toString('hex');
     console.log('hash    ', hash);
@@ -26,6 +26,9 @@ function testEncode(t, imagePath, expectedHash, trim = false) {
 
     console.log('expected', expectedHash);
     t.is(mchash, expectedHash)
+
+    let err = encoded.error;
+    t.is(err, null);
 }
 
 testEncode.title = (providedTitle = "encode", a, b) =>
@@ -39,7 +42,9 @@ for (const params of [
     ['images/randomImage3.png', '1b84a8081994cce186eeae4787f95bce663d6711272782ce659d9cc954fec435'],
     ['images/randomImage4.png', 'e19abca2800650b449fff3f12ed3d1bd0f20861d7cdd00c66d62264b52837e2c'],
     ['images/trimmed0.png', '0aa97a60ff386b6075aea693893106358def0cd580e6360599811e08bde38b6f'], // mojang strips the leading 0, this doesn't currently
-    ['images/trimmed0.png', 'aa97a60ff386b6075aea693893106358def0cd580e6360599811e08bde38b6f', true]
+    ['images/trimmed0.png', 'aa97a60ff386b6075aea693893106358def0cd580e6360599811e08bde38b6f', 64, true],
+    ['images/randomImage321.png', '8588cfec8f3a9d13459956916e1f85f37753ed81472e85df7601b9c62d3a24f1', 32],
+    ['images/randomImage322.png', '4730ea83a416fcba36b3ec75b8b3e24b476e65d888955038b330ab18baada613', 32],
 ]) {
     test(testEncode, ...params);
 }

images/randomImage321.png

@@ -5,6 +5,7 @@
 
 export declare function sum(a: number, b: number): number
 export declare function encodeImage(buffer: Uint8Array): ImageWithHashes
+export declare function encodeImageSize(buffer: Uint8Array, width: number, height: number): ImageWithHashes
 export declare class ImageWithHashes {
   png: Buffer
   minecraftHash: Buffer

images/randomImage322.png

@@ -310,8 +310,9 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { sum, ImageWithHashes, encodeImage } = nativeBinding
+const { sum, ImageWithHashes, encodeImage, encodeImageSize } = nativeBinding
 
 module.exports.sum = sum
 module.exports.ImageWithHashes = ImageWithHashes
 module.exports.encodeImage = encodeImage
+module.exports.encodeImageSize = encodeImageSize

index.d.ts

@@ -31,6 +31,11 @@ pub fn encode_image(buffer: &[u8]) -> ImageWithHashes {
     encode_custom_image(buffer, SKIN_WIDTH, SKIN_HEIGHT)
 }
 
+#[napi]
+pub fn encode_image_size(buffer: &[u8], width: u8, height: u8) -> ImageWithHashes {
+    encode_custom_image(buffer, width as usize, height as usize)
+}
+
 // based on https://github.com/GeyserMC/global_api/blob/dev/1.0.2/native/skins/src/skin_convert/skin_codec.rs#L100
 //#[napi]
 pub fn encode_custom_image(buffer: &[u8], width: usize, height: usize) -> ImageWithHashes {
@@ -50,7 +55,7 @@ pub fn encode_custom_image(buffer: &[u8], width: usize, height: usize) -> ImageW
     let decoded1 = decoded.unwrap();
     let decoded_data = decoded1.bytes();
 
-    let mut raw_data = vec![0; SKIN_DATA_LENGTH];
+    let mut raw_data = vec![0; width * height * SKIN_CHANNELS];
     decoded_data.clone_into(&mut raw_data);
 
     // encode images like Minecraft does

index.js

@@ -33,6 +33,6 @@ function makeRandomImage(width = 64, height = 64) {
 }
 
 (() => {
-    const { imageBuffer, imageData, data, blob } = makeRandomImage(128, 128);
+    const { imageBuffer, imageData, data, blob } = makeRandomImage(64, 32);
     fs.writeFileSync(`images/randomImage${Math.round(Math.random()*100)}.png`, imageBuffer);
 })();