Skip to content
This repository was archived by the owner on May 1, 2020. It is now read-only.

Fix hShift and vShift #64

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix hShift and vShift #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09de638
Fix hShift and vShift
Red54 Feb 14, 2020
7c0b29f
Update .travis.yml
Red54 Feb 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
language: node_js

node_js:
- "0.10"
- "0.11"
- "0.12"
- "iojs"
- node
- lts/*

branches:
except:
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ All the parameters that were available in the command-line tool are also availab
* ```composition``` Creates as output a composition of all three images (approved, highlight, and build) (default: true)
* ```composeLeftToRight``` Creates comparison-composition from left to right, otherwise it lets decide the app on what is best
* ```composeTopToBottom``` Creates comparison-composition from top to bottom, otherwise it lets decide the app on what is best
* ```hShift``` Horizontal shift for possible antialiasing (default: 2) Set to 0 to turn this off.
* ```vShift``` Vertical shift for possible antialiasing (default: 2) Set to 0 to turn this off.
* ```hShift``` Horizontal shift for possible antialiasing (default: 0)
* ```vShift``` Vertical shift for possible antialiasing (default: 0)
* ```hideShift``` Uses the background color for "highlighting" shifts. (default: false)
* ```cropImageA``` Cropping for first image (default: no cropping) - Format: { x:<int>, y:<int>, width:<int>, height:<int> }
* ```cropImageB``` Cropping for second image (default: no cropping) - Format: { x:<int>, y:<int>, width:<int>, height:<int> }
Expand Down
8 changes: 4 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ function load(value, defaultValue) {
* @param {boolean} [options.composeLeftToRight=false] Create composition from left to right, otherwise let it decide on its own whats best
* @param {boolean} [options.composeTopToBottom=false] Create composition from top to bottom, otherwise let it decide on its own whats best
* @param {boolean} [options.hideShift=false] Hides shift highlighting by using the background color instead
* @param {int} [options.hShift=2] Horizontal shift for possible antialiasing
* @param {int} [options.vShift=2] Vertical shift for possible antialiasing
* @param {int} [options.hShift=0] Horizontal shift for possible antialiasing
* @param {int} [options.vShift=0] Vertical shift for possible antialiasing
* @param {object} [options.cropImageA=null] Cropping for first image (default: no cropping)
* @param {int} [options.cropImageA.x=0] Coordinate for left corner of cropping region
* @param {int} [options.cropImageA.y=0] Coordinate for top corner of cropping region
Expand Down Expand Up @@ -201,8 +201,8 @@ function BlinkDiff (options) {
this._composeLeftToRight = load(options.composeLeftToRight, false);
this._composeTopToBottom = load(options.composeTopToBottom, false);

this._hShift = load(options.hShift, 2);
this._vShift = load(options.vShift, 2);
this._hShift = load(options.hShift, 0);
this._vShift = load(options.vShift, 0);

this._cropImageA = options.cropImageA;
this._cropImageB = options.cropImageB;
Expand Down
8 changes: 4 additions & 4 deletions lib/compatibility.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ var Compatibility = Base.extend(
* @param {boolean} [options.composeLeftToRight=false] Create composition from left to right, otherwise let it decide on its own whats best
* @param {boolean} [options.composeTopToBottom=false] Create composition from top to bottom, otherwise let it decide on its own whats best
* @param {boolean} [options.hideShift=false] Hides shift highlighting by using the background color instead
* @param {int} [options.hShift=2] Horizontal shift for possible antialiasing
* @param {int} [options.vShift=2] Vertical shift for possible antialiasing
* @param {int} [options.hShift=0] Horizontal shift for possible antialiasing
* @param {int} [options.vShift=0] Vertical shift for possible antialiasing
* @param {object} [options.cropImageA=null] Cropping for first image (default: no cropping)
* @param {int} [options.cropImageA.x=0] Coordinate for left corner of cropping region
* @param {int} [options.cropImageA.y=0] Coordinate for top corner of cropping region
Expand Down Expand Up @@ -136,8 +136,8 @@ var Compatibility = Base.extend(

shift: {
active: !options.hideShift,
horizontal: options.hShift || 2,
vertical: options.vShift || 2
horizontal: options.hShift || 0,
vertical: options.vShift || 0
},

blockOuts: blockOuts,
Expand Down