fix #42

Author: kirjavascript

0x1.png

@@ -1,5 +1,9 @@
 # Changelog
 
+## [unreleased]
+- Change DPLC limit to 255
+- Fix issue where image data would be cached incorrectly
+
 ## [1.2.2]
 - Added sprite rotation algorithm: 3 shears
 - Fix Sonic 3 Object null sprites
@@ -11,9 +15,6 @@
 - Sprite Rotation
 - Add zoom slider in sprites tab
 
-## [1.1.3]
-- Upgrade to electron 12
-
 ## [1.1.2]
 - Assume undefined labels are at address 0 [#33](/../../issues/33)
 - Made generated mapping labels random

CHANGELOG

@@ -1,11 +1,12 @@
-import { observable, computed, action, autorun, toJS, makeObservable } from 'mobx';
+import { observable, computed, action, makeObservable } from 'mobx';
 const { dialog } = require('@electron/remote');
 import { errorMsg } from '#util/dialog';
 import { removeBackground } from './remove-background';
 import { colorMatch } from './color-match';
 import { getSpriteBBoxes } from './get-sprite';
 import { getMappings } from './generate-mappings';
 import { importSprite } from './import-sprite';
+import { readFile } from 'fs';
 
 class ImportState {
     config = {
@@ -65,21 +66,27 @@ class ImportState {
         this.ctx = node.getContext('2d');
 
         if (this.path) {
-            const img = new Image();
-
-            img.onload = () => {
-                node.width = img.width;
-                node.height = img.height;
-                this.ctx.drawImage(img, 0, 0);
-                requestAnimationFrame(this.loaded);
-            };
-
-            img.onerror = (e) => {
-                errorMsg('Import Error', `Error loading ${this.path}`);
-                this.cancel();
-            };
-
-            img.src = this.path;
+            readFile(this.path, (_err, data) => {
+                if (data) {
+                    const blob = new Blob([data]);
+                    const url = URL.createObjectURL(blob);
+                    const img = new Image();
+                    img.onload = () => {
+                        node.width = img.width;
+                        node.height = img.height;
+                        this.ctx.drawImage(img, 0, 0);
+                        requestAnimationFrame(this.loaded);
+                        URL.revokeObjectURL(url);
+                    };
+                    img.onerror = (e) => {
+                        errorMsg('Import Error', `Error loading ${this.path}`);
+                        this.cancel();
+                    };
+                    img.src = url;
+                } else {
+                    errorMsg('Import Error', `Error loading ${this.path}`);
+                }
+            });
 
         } else if (this.rotCanvas) {
             this.ctx.drawImage(this.rotCanvas, 0, 0);

app/components/import/state.js

@@ -1,6 +1,6 @@
 import { environment } from '#store/environment';
 const { dialog } = require('@electron/remote');
-import { writeFile } from 'fs';
+import { readFile, writeFile } from 'fs';
 import { errorMsg } from '#util/dialog';
 import { colorMatch } from '#components/import/color-match';
 
@@ -172,10 +172,21 @@ export async function importImg() {
     // load image
 
     const img = await (new Promise((resolve) => {
-        const img = new Image();
-        img.onload = () => { resolve(img); };
-        img.onerror = (e) => { resolve(null); };
-        img.src = path;
+        readFile(path, (_err, data) => {
+            if (data) {
+                const blob = new Blob([data]);
+                const url = URL.createObjectURL(blob);
+                const img = new Image();
+                img.onload = () => {
+                    resolve(img);
+                    URL.revokeObjectURL(url);
+                };
+                img.onerror = (e) => { resolve(null); };
+                img.src = url;
+            } else {
+                resolve(null);
+            }
+        });
     }));
 
     if (!img) return errorMsg('Import Error', `Error loading ${path}`);