diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13425f86..a048de8e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,6 +43,7 @@ Any change that modifies the existing public API should be added to the relevant | ------: | :--------- | | v0.16.0 | pencil | | v0.17.0 | quill | +| v0.18.0 | ridge | Please squash your changes into a single commit using a command like `git rebase -i upstream/`. diff --git a/docs/changelog.md b/docs/changelog.md index e99ff383..a351b8ed 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -6,6 +6,8 @@ Requires libvips v8.3.2 #### v0.16.0 - TBD +* Remove deprecated interpolateWith method - use resize(w, h, { interpolator: ... }) + * Ensure boolean, bandbool, extractChannel ops occur before sRGB conversion. [#504](https://github.com/lovell/sharp/pull/504) [@mhirsch](https://github.com/mhirsch) diff --git a/index.js b/index.js index 941f7e19..eb6160b8 100644 --- a/index.js +++ b/index.js @@ -876,13 +876,6 @@ Sharp.prototype.resize = function(width, height, options) { } return this; }; -Sharp.prototype.interpolateWith = util.deprecate(function(interpolator) { - return this.resize( - this.options.width > 0 ? this.options.width : null, - this.options.height > 0 ? this.options.height : null, - { interpolator: interpolator } - ); -}, 'interpolateWith: Please use resize(w, h, { interpolator: ... }) instead'); /* Limit the total number of pixels for input images diff --git a/package.json b/package.json index 25255a63..90608b13 100644 --- a/package.json +++ b/package.json @@ -62,11 +62,11 @@ "color": "^0.11.3", "nan": "^2.4.0", "semver": "^5.2.0", - "request": "^2.73.0", + "request": "^2.74.0", "tar": "^2.2.1" }, "devDependencies": { - "async": "^1.5.2", + "async": "^2.0.1", "bufferutil": "^1.2.1", "coveralls": "^2.11.9", "exif-reader": "^1.0.0", @@ -75,7 +75,7 @@ "mocha": "^2.5.3", "mocha-jshint": "^2.3.1", "node-cpplint": "^0.4.0", - "rimraf": "^2.5.3", + "rimraf": "^2.5.4", "unzip": "^0.1.11" }, "license": "Apache-2.0", diff --git a/test/bench/package.json b/test/bench/package.json index 311923e5..e2e464c9 100644 --- a/test/bench/package.json +++ b/test/bench/package.json @@ -8,14 +8,14 @@ "test": "VIPS_WARNING=0 node perf && node random && node parallel" }, "devDependencies": { - "async": "^1.5.2", - "benchmark": "^2.1.0", + "async": "^2.0.1", + "benchmark": "^2.1.1", "gm": "^1.22.0", "imagemagick": "^0.1.3", "imagemagick-native": "^1.9.2", "jimp": "^0.2.24", "lwip": "^0.0.9", - "semver": "^5.1.0" + "semver": "^5.3.0" }, "license": "Apache-2.0", "engines": { diff --git a/test/unit/interpolation.js b/test/unit/interpolation.js index d979b294..8aad57ef 100644 --- a/test/unit/interpolation.js +++ b/test/unit/interpolation.js @@ -60,12 +60,4 @@ describe('Interpolators and kernels', function() { }); }); - describe('deprecated interpolateWith method still works', function() { - it('resize then interpolateWith', function() { - sharp().resize(1, 1).interpolateWith('bicubic'); - }); - it('interpolateWith then resize', function() { - sharp().interpolateWith('bicubic').resize(1, 1); - }); - }); });