From a320c3b450b5b64ae036b4ffe04871d9172bb5a6 Mon Sep 17 00:00:00 2001 From: Julian Descottes Date: Thu, 30 Aug 2012 01:32:03 +0200 Subject: [PATCH 1/5] merge from master --- git-remote-https.exe.stackdump | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 git-remote-https.exe.stackdump diff --git a/git-remote-https.exe.stackdump b/git-remote-https.exe.stackdump new file mode 100644 index 00000000..76cb3476 --- /dev/null +++ b/git-remote-https.exe.stackdump @@ -0,0 +1,7 @@ +Exception: STATUS_ACCESS_VIOLATION at eip=6102048B +eax=104200F8 ebx=612445A4 ecx=75860F81 edx=0034C1CC esi=00000000 edi=0028F9F4 +ebp=61020C00 esp=0028C7C4 program=C:\cygwin\lib\git-core\git-remote-https.exe, pid 4488, thread main +cs=0023 ds=002B es=002B fs=0053 gs=002B ss=002B +Stack trace: +Frame Function Args +End of stack trace From 370ae7b10986943dad950782f5590054b39c1a1a Mon Sep 17 00:00:00 2001 From: Julian Descottes Date: Thu, 30 Aug 2012 01:33:22 +0200 Subject: [PATCH 2/5] delete artifact --- git-remote-https.exe.stackdump | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 git-remote-https.exe.stackdump diff --git a/git-remote-https.exe.stackdump b/git-remote-https.exe.stackdump deleted file mode 100644 index 76cb3476..00000000 --- a/git-remote-https.exe.stackdump +++ /dev/null @@ -1,7 +0,0 @@ -Exception: STATUS_ACCESS_VIOLATION at eip=6102048B -eax=104200F8 ebx=612445A4 ecx=75860F81 edx=0034C1CC esi=00000000 edi=0028F9F4 -ebp=61020C00 esp=0028C7C4 program=C:\cygwin\lib\git-core\git-remote-https.exe, pid 4488, thread main -cs=0023 ds=002B es=002B fs=0053 gs=002B ss=002B -Stack trace: -Frame Function Args -End of stack trace From a1e17716f7c4a48707b6e22e9e00788b984065e7 Mon Sep 17 00:00:00 2001 From: juliandescottes Date: Mon, 3 Sep 2012 12:40:50 +0200 Subject: [PATCH 3/5] changed case of FrameSheetModel --- js/{frameSheetModel.js => FrameSheetModel.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename js/{frameSheetModel.js => FrameSheetModel.js} (100%) diff --git a/js/frameSheetModel.js b/js/FrameSheetModel.js similarity index 100% rename from js/frameSheetModel.js rename to js/FrameSheetModel.js From b74020c93d5b75fa35e9807a10c1cf7eea1eb757 Mon Sep 17 00:00:00 2001 From: juliandescottes Date: Fri, 7 Sep 2012 23:17:46 +0200 Subject: [PATCH 4/5] Added simple piskel/all.html --- all.html | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 all.html diff --git a/all.html b/all.html new file mode 100644 index 00000000..85471c58 --- /dev/null +++ b/all.html @@ -0,0 +1,39 @@ + + + + All piskels + + + + + \ No newline at end of file From ed2e65508a164b4d7aea24803c5699291929e32e Mon Sep 17 00:00:00 2001 From: juliandescottes Date: Sat, 8 Sep 2012 17:54:41 +0200 Subject: [PATCH 5/5] fixed small bug during resize --- js/controller/DrawingController.js | 2 +- js/drawingtools/Move.js | 2 -- js/model/Frame.js | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/js/controller/DrawingController.js b/js/controller/DrawingController.js index f6043669..d6803593 100644 --- a/js/controller/DrawingController.js +++ b/js/controller/DrawingController.js @@ -26,7 +26,7 @@ this.overlayRenderer.updateDPI(newDPI); this.renderer.render(this.frame); - this.overlayRenderer.render(this.frame); + this.overlayRenderer.render(this.overlayFrame); }; ns.DrawingController.prototype.renderFrame = function () { diff --git a/js/drawingtools/Move.js b/js/drawingtools/Move.js index 8a36e36f..2ff9ca73 100644 --- a/js/drawingtools/Move.js +++ b/js/drawingtools/Move.js @@ -12,8 +12,6 @@ // Stroke's first point coordinates (set in applyToolAt) this.startCol = null; this.startRow = null; - - this.canvasOverlay = null; }; pskl.utils.inherit(ns.Move, ns.BaseTool); diff --git a/js/model/Frame.js b/js/model/Frame.js index bef3e94c..681c6ef0 100644 --- a/js/model/Frame.js +++ b/js/model/Frame.js @@ -2,7 +2,7 @@ var ns = $.namespace("pskl.model"); ns.Frame = function (pixels) { - this.pixels = this.clonePixels_(pixels); + this.pixels = pixels; this.previousStates = [this.getPixels()]; this.stateIndex = 0; };