Merge remote-tracking branch 'Automattic/master' into static

# Conflicts:
#	.gitignore
#	.npmignore
#	binding.gyp
#	util/has_lib.js

Author: piranna

.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,3 @@
-<!----------------------------------- STOP! ----------------------------------->
 <!---
 Having trouble installing node-canvas? Please make sure you have read
 the installation instructions located here before asking for help:
@@ -15,11 +14,11 @@ Still having problems, found a bug or want a feature? Fill out the form below.
 <!--- For bugs, provide a short, complete code example to reproduce the issue. -->
 ```js
 var Canvas = require('canvas');
-var canvas = new Canvas(200, 200);
+var canvas = Canvas.createCanvas(200, 200);
 var ctx = canvas.getContext('2d');
 // etc.
 ```
 
 ## Your Environment
-* Version of node-canvas (e.g. 1.4.0):
-* Environment (e.g. node 4.2.0 on Mac OS X 10.8):
+* Version of node-canvas (output of `npm list canvas` or `yarn list canvas`):
+* Environment (e.g. node 4.2.0 on Mac OS X 10.8):

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,3 @@
+Thanks for contributing!
+
+- [ ] Have you updated CHANGELOG.md?

.gitignore

@@ -12,8 +12,8 @@ out.svg
 node_modules
 deps/
 npm-debug.log
+package-lock.json
 
 # Vim cruft
 *.swp
 *.un~
-npm-debug.log

.travis.yml

@@ -1,8 +1,12 @@
 language: node_js
+install:
+  - npm install --build-from-source
 node_js:
-  - '7'
+  - '13'
+  - '12'
+  - '10'
+  - '8'
   - '6'
-  - '4'
 addons:
   apt:
     sources:
@@ -12,7 +16,10 @@ addons:
       - libjpeg8-dev
       - libpango1.0-dev
       - libgif-dev
+      - librsvg2-dev
       - g++-4.9
 env:
   - CXX=g++-4.9
-sudo: false
+script:
+  - node_version=$(node -v); if [ ${node_version:1:2} = 10 ]; then npm run dtslint; fi
+  - npm test

History.md renamed to CHANGELOG.md

@@ -1,10 +1,295 @@
-Unreleased / patch
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
+project adheres to [Semantic Versioning](http://semver.org/).
+
+(Unreleased)
 ==================
+### Changed
+### Added
+### Fixed
+* Fix BMP issues. (#1497)
+* Update typings to support jpg and addPage on NodeCanvasRenderingContext2D (#1509)
 
+2.6.1
+==================
+### Fixed
+* Ignore `maxWidth` in `fillText` and `strokeText` if it is undefined
+* Fix crash (assertion failure) in Node.js 12.x when patterns or gradients are used
+* Fix crash (check failure) in Node.js 12.x when using RGB16_565 format. (The
+  underlying arraybuffer was incorrectly sized.)
+* Fix rendering error when applying shadow width line style (lineCap lineJoin lineDash)
+
+2.6.0
+==================
+### Changed
+* Allow larger buffers to be returned from `toBuffer('raw')`.
+### Added
+* Support for various BMP headers and color depths (#1435)
+### Fixed
+* Fix crash when changing canvas width/height while `fillStyle` or `strokeStyle`
+  was set to a `CanvasPattern` or `CanvasGradient` (#1357).
+* Fix crash when changing width/height of SVG canvases (#1380).
+* Fix crash when using `toBuffer('raw')` with large canvases (#1158).
+* Clarified meaning of byte ordering for `toBuffer('raw')` in readme. (#1416)
+* Fix package.json Typings field to point to Declaration file (#1432)
+* Properly check return value from `Set` and `Call`. (#1415)
+* Use `Get` version from `Nan` instead of `v8`. (#1415)
+
+2.5.0
+==================
+### Added
+* Support redirects when fetching images (using [simple-get](https://github.com/feross/simple-get)) (#1398)
+* Support Node.js v12
+### Fixed
+* Fix object literal & arrow function syntax usage for IE.
+
+2.4.1
+==================
+### Fixed
+* Guard JPEG width/height against maximum supported (#1385)
+* Fix electron 5 and node 12 compatibility
+* Fix encoding options (quality) parameter in `canvas.toDataURL()`
+
+2.4.0
+==================
+### Added
+* (Actually) added `resolution` option for `canvas.toBuffer("image/png")` and
+  `canvas.createPNGStream()`. This was documented since 2.0.0 but not working.
+* Add typescript definitions.
+### Fixed
+* PDF metadata (added in 2.3.0) wasn't being set with `canvas.createPDFStream()`
+* Fix custom "inspect" function deprecation warnings (#1326)
+
+2.3.1
+==================
+### Fixed
+* Fix `canvas.toBuffer()` for JPEGs (#1350)
+
+2.3.0
+==================
+### Added
+* Add support for multiple PDF page sizes
+* Add support for embedding document metadata in PDFs
+
+### Fixed
+* Don't crash when font string is invalid (bug since 2.2.0) (#1328)
+* Fix memory leak in `canvas.toBuffer()` (#1202, #1296)
+* Fix memory leak in `ctx.font=` (#1202)
+
+2.2.0
+==================
+### Added
+* BMP support
+
+### Fixed
+* Reset context on resurface (#1292)
+* Support Jest test framework (#1311)
+
+2.1.0
+==================
+### Added
+* Warn when building with old, unsupported versions of cairo or libjpeg.
+
+2.0.0
+==================
+
+**Upgrading from 1.x**
+```js
+// (1) The Canvas constructor is no longer the default export from the module.
+/* old: */
+const Canvas = require('canvas')
+const mycanvas = new Canvas(width, height)
+/* new: */
+const { createCanvas, Canvas } = require('canvas')
+const mycanvas = createCanvas(width, height)
+mycanvas instanceof Canvas // true
+
+/* old: */
+const Canvas = require('canvas')
+const myimg = new Canvas.Image()
+/* new: */
+const { Image } = require('canvas')
+const myimg = new Image()
+
+// (2) The quality argument for canvas.createJPEGStream/canvas.jpegStream now
+//     goes from 0 to 1 instead of from 0 to 100:
+canvas.createJPEGStream({ quality: 50 }) // old
+canvas.createJPEGStream({ quality: 0.5 }) // new
+
+// (3) The ZLIB compression level and PNG filter options for canvas.toBuffer are
+//     now named instead of positional arguments:
+canvas.toBuffer(undefined, 3, canvas.PNG_FILTER_NONE) // old
+canvas.toBuffer(undefined, { compressionLevel: 3, filters: canvas.PNG_FILTER_NONE }) // new
+// or specify the mime type explicitly:
+canvas.toBuffer('image/png', { compressionLevel: 3, filters: canvas.PNG_FILTER_NONE }) // new
+
+// (4) #2 also applies for canvas.pngStream, although these arguments were not
+//     documented:
+canvas.pngStream(3, canvas.PNG_FILTER_NONE) // old
+canvas.pngStream({ compressionLevel: 3, filters: canvas.PNG_FILTER_NONE }) // new
+
+// (5) canvas.syncPNGStream() and canvas.syncJPEGStream() have been removed:
+canvas.syncPNGStream() // old
+canvas.createSyncPNGStream() // old
+canvas.createPNGStream() // new
+
+canvas.syncJPEGStream() // old
+canvas.createSyncJPEGStream() // old
+canvas.createJPEGStream() // new
+
+// (6) Context2d.filter has been renamed to context2d.quality to avoid a
+//     conflict with the new standard 'filter' property.
+context.filter = 'best' // old
+context.quality = 'best' // new
+```
+
+### Breaking
+ * Drop support for Node.js <6.x
+ * Remove sync stream functions (bc53059). Note that most streams are still
+   synchronous (run in the main thread); this change just removed `syncPNGStream`
+   and `syncJPEGStream`.
+ * Pango is now *required* on all platforms (7716ae4).
+ * Make the `quality` argument for JPEG output go from 0 to 1 to match HTML spec.
+ * Make the `compressionLevel` and `filters` arguments for `canvas.toBuffer()`
+   named instead of positional. Same for `canvas.pngStream()`, although these
+   arguments were not documented.
+ * See also: *Correct some of the `globalCompositeOperator` types* under
+   **Fixed**. These changes were bug-fixes, but will break existing code relying
+   on the incorrect types.
+ * Rename `context2d.filter` to `context2d.quality` to avoid a conflict with the
+   new standard 'filter' property. Note that the standard 'filter' property is
+   not yet implemented.
+
+### Fixed
+ * Fix build with SVG support enabled (#1123)
+ * Prevent segfaults caused by loading invalid fonts (#1105)
+ * Fix memory leak in font loading
  * Port has_lib.sh to javascript (#872)
- * Support canvas.getContext("2d", {alpha: boolean}) and
-   canvas.getContext("2d", {pixelFormat: "..."})
+ * Correctly sample the edge of images when scaling (#1084)
+ * Detect CentOS libjpeg path (b180ea5)
+ * Improve measureText accuracy (2bbfec5)
+ * Fix memory leak when image callbacks reference the image (1f4b646)
+ * Fix putImageData(data, negative, negative) (2102e25)
+ * Fix SVG recognition when loading from buffer (77749e6)
+ * Re-rasterize SVG when drawing to a context and dimensions changed (79bf232)
+ * Prevent JPEG errors from crashing process (#1124)
+ * Improve handling of invalid arguments (#1129)
+ * Fix repeating patterns when drawing a canvas to itself (#1136)
+ * Prevent segfaults caused by creating a too large canvas
+ * Fix parse-font regex to allow for whitespaces.
+ * Allow assigning non-string values to fillStyle and strokeStyle
+ * Fix drawing zero-width and zero-height images.
+ * Fix DEP0005 deprecation warning
+ * Don't assume `data:` URIs assigned to `img.src` are always base64-encoded
+ * Fix formatting of color strings (e.g. `ctx.fillStyle`) on 32-bit platforms
+ * Explicitly export symbols for the C++ API
+ * Named CSS colors should match case-insensitive
+ * Correct some of the `globalCompositeOperator` types to match the spec:
+     * "hsl-hue" is now "hue"
+     * "hsl-saturation" is now "saturation"
+     * "hsl-color" is now "color"
+     * "hsl-luminosity" is now "luminosity"
+     * "darker" is now "darken"
+     * "dest" is now "destination"
+     * "add" is removed (but is the same as "lighter")
+     * "source" is now "copy"
+ * Provide better, Node.js core-style coded errors for failed sys calls. (For
+   example, provide an error with code 'ENOENT' if setting `img.src` to a path
+   that does not exist.)
+ * Support reading CMYK, YCCK JPEGs.
+ * Hide `Image.prototype.source`
+ * Fix behavior of maxWidth (#1088)
+ * Fix behavior of textAlignment with maxWidth (#1253)
+
+### Added
+ * Prebuilds (#992) with different libc versions to the prebuilt binary (#1140)
+ * Support `canvas.getContext("2d", {alpha: boolean})` and
+   `canvas.getContext("2d", {pixelFormat: "..."})`
  * Support indexed PNG encoding.
+ * Support `currentTransform` (d6714ee)
+ * Export `CanvasGradient` (6a4c0ab)
+ * Support #RGBA , #RRGGBBAA hex colors (10a82ec)
+ * Support maxWidth arg for fill/strokeText (175b40d)
+ * Support image.naturalWidth/Height (a5915f8)
+ * Render SVG img elements when librsvg is available (1baf00e)
+ * Support ellipse method (4d4a726)
+ * Browser-compatible API (6a29a23)
+ * Support for jpeg on Windows (42e9a74)
+ * Support for backends (1a6dffe)
+ * Support for `canvas.toBuffer("image/jpeg")`
+ * Unified configuration options for `canvas.toBuffer()`, `canvas.pngStream()`
+   and `canvas.jpegStream()`
+ * ~~Added `resolution` option for `canvas.toBuffer("image/png")` and
+   `canvas.createPNGStream()`~~ this was not working
+ * Support for `canvas.toDataURI("image/jpeg")` (sync)
+ * Support for `img.src = <url>` to match browsers
+ * Support reading data URL on `img.src`
+ * Readme: add dependencies command for OpenBSD
+ * Throw error if calling jpegStream when canvas was not built with JPEG support
+ * Emit error if trying to load GIF, SVG or JPEG image when canvas was not built
+   with support for that format
+
+1.6.x (unreleased)
+==================
+### Fixed
+ * Make setLineDash able to handle full zeroed dashes (b8cf1d7)
+ * Fix reading fillStyle after setting it from gradient to color (a84b2bc)
+
+### Added
+ * Support for pattern repeat and no-repeat (#1066)
+ * Support for context globalAlpha for gradients and patterns (#1064)
+
+1.6.9 / 2017-12-20
+==================
+### Fixed
+ * Fix some instances of crashes (7c9ec58, 8b792c3)
+ * Fix node 0.x compatibility (dca33f7)
+
+1.6.8 / 2017-12-12
+==================
+### Fixed
+ * Faster, more compliant parseFont (4625efa, 37cd969)
+
+1.6.7 / 2017-09-08
+==================
+### Fixed
+ * Minimal backport of #985 (rotated text baselines) (c19edb8)
+
+1.6.6 / 2017-05-03
+==================
+### Fixed
+ * Use .node extension for requiring native module so webpack works (1b05599)
+ * Correct text baseline calculation (#1037)
+
+1.6.5 / 2017-03-18
+==================
+### Changed
+ * Parse font using parse-css-font and units-css (d316416)
+
+1.6.4 / 2017-02-26
+==================
+### Fixed
+ * Make sure Canvas#toDataURL is always async if callback is passed (8586d72)
+
+1.6.3 / 2017-02-14
+==================
+### Fixed
+ * Fix isnan() and isinf() on clang (5941e13)
+
+1.6.2 / 2016-10-30
+==================
+### Fixed
+ * Fix deprecation warnings (c264879)
+ * Bump nan (e4aea20)
+
+1.6.1 / 2016-10-23
+==================
+
+### Fixed
+ * Make has_lib.sh work on BSD OSes (1727d66)
 
 1.6.0 / 2016-10-16
 ==================