Skip to content

Commit 9b4774d

Browse files
committed
minx
1 parent 07d073a commit 9b4774d

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

SeamCarver.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class SeamCarver {
132132
// last row
133133
if (y >= this.height-1) {
134134
energy_cell.vminsum = energy_cell.energy;
135-
energy_cell.minx = 0;
135+
energy_cell.minx = x;
136136
} else {
137137
var cursum = 0;
138138
var curminx = 0;
@@ -310,11 +310,10 @@ class SeamCarver {
310310
} else if (field === 'minx') {
311311
var val = this.minxMatrix[col][row];
312312
var direction = col - val + 1;
313-
if (direction < 0 || direction > 2) direction = 0;
314313
for (var i = 0; i < 3; i ++) {
315314
this.imageData.data[pos + i] = 0;
316315
}
317-
this.imageData.data[pos + direction] = 255;
316+
if (direction >= 0 && direction <= 2) this.imageData.data[pos + direction] = 255;
318317
this.imageData.data[pos + 3] = 255;
319318
continue;
320319
} else {

demo/javascript/build/bundle.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class SeamCarver {
133133
// last row
134134
if (y >= this.height-1) {
135135
energy_cell.vminsum = energy_cell.energy;
136-
energy_cell.minx = 0;
136+
energy_cell.minx = x;
137137
} else {
138138
var cursum = 0;
139139
var curminx = 0;
@@ -311,11 +311,10 @@ class SeamCarver {
311311
} else if (field === 'minx') {
312312
var val = this.minxMatrix[col][row];
313313
var direction = col - val + 1;
314-
if (direction < 0 || direction > 2) direction = 0;
315314
for (var i = 0; i < 3; i ++) {
316315
this.imageData.data[pos + i] = 0;
317316
}
318-
this.imageData.data[pos + direction] = 255;
317+
if (direction >= 0 && direction <= 2) this.imageData.data[pos + direction] = 255;
319318
this.imageData.data[pos + 3] = 255;
320319
continue;
321320
} else {
@@ -503,12 +502,15 @@ demo.reDraw = function (field) {
503502
};
504503

505504
demo.reset = function () {
505+
demo.image.setAttribute('crossOrigin', '');
506+
demo.image.crossOrigin = 'Anonymous';
506507
// demo.image.src = 'images/3x4.png';
507508
// demo.image.src = 'images/6x5.png';
508-
demo.image.src = 'images/70x70.png';
509+
// demo.image.src = 'images/70x70.png';
509510
// demo.image.src = 'images/200x100.png';
510511
// demo.image.src = 'images/chameleon.png';
511512
// demo.image.src = 'images/HJocean.png';
513+
demo.image.src = 'https://cdn.hyperdev.com/us-east-1%3A095124f7-7022-4119-9d6a-68fd1e3dd7ef%2Fchameleon.png';
512514
};
513515

514516
demo.reset();

demo/javascript/src/demo.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,15 @@ demo.reDraw = function (field) {
107107
};
108108

109109
demo.reset = function () {
110+
demo.image.setAttribute('crossOrigin', '');
111+
demo.image.crossOrigin = 'Anonymous';
110112
// demo.image.src = 'images/3x4.png';
111113
// demo.image.src = 'images/6x5.png';
112-
demo.image.src = 'images/70x70.png';
114+
// demo.image.src = 'images/70x70.png';
113115
// demo.image.src = 'images/200x100.png';
114116
// demo.image.src = 'images/chameleon.png';
115117
// demo.image.src = 'images/HJocean.png';
118+
demo.image.src = 'https://cdn.hyperdev.com/us-east-1%3A095124f7-7022-4119-9d6a-68fd1e3dd7ef%2Fchameleon.png';
116119
};
117120

118121
demo.reset();

index.html

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<button onclick="demo.reDraw('minsum')">Cumulative sum (S)</button>
4949
<button onclick="demo.reDraw('minx')">Minx (X)</button>
5050
<button onclick="demo.reDraw()">Color (C)</button>
51+
<button onclick="demo.iterate()">Iterate (I)</button>
5152
<button onclick="demo.findSeam()">Find Seam (F)</button>
5253
<button onclick="demo.removeSeam()">Remove Seam (R)</button>
5354
<button onclick="demo.reset()">Reset (ESC)</button>

0 commit comments

Comments
 (0)