From ece21f9b5b1fb8477987cea706e915aa5373440c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elis=C3=A9e=20Maurer?= <elisee@sparklinlabs.com>
Date: Thu, 8 Oct 2015 10:01:50 +0200
Subject: [PATCH 1/2] Add pngjs2 definition file

---
 pngjs2/pngjs2-tests.ts | 26 +++++++++++++++++
 pngjs2/pngjs2.d.ts     | 66 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 pngjs2/pngjs2-tests.ts
 create mode 100644 pngjs2/pngjs2.d.ts

diff --git a/pngjs2/pngjs2-tests.ts b/pngjs2/pngjs2-tests.ts
new file mode 100644
index 000000000..ae2d73e7b
--- /dev/null
+++ b/pngjs2/pngjs2-tests.ts
@@ -0,0 +1,26 @@
+/// <reference path="pngjs2.d.ts" />
+
+import * as fs from "fs";
+import { PNG } from "pngjs2";
+
+let png = new PNG({ filterType: 4 });
+
+fs.createReadStream("in.png")
+  .pipe(png)
+  .on("parsed", () => {
+    for (let y = 0; y < png.height; y++) {
+      for (let x = 0; x < png.width; x++) {
+        let idx = (png.width * y + x) << 2;
+
+        // invert color
+        png.data[idx] = 255 - png.data[idx];
+        png.data[idx+1] = 255 - png.data[idx+1];
+        png.data[idx+2] = 255 - png.data[idx+2];
+
+        // and reduce opacity
+        png.data[idx+3] = png.data[idx+3] >> 1;
+      }
+    }
+
+    png.pack().pipe(fs.createWriteStream('out.png'));
+  });
diff --git a/pngjs2/pngjs2.d.ts b/pngjs2/pngjs2.d.ts
new file mode 100644
index 000000000..bc2e061cc
--- /dev/null
+++ b/pngjs2/pngjs2.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for pngjs2 1.2.0
+// Project: https://www.npmjs.com/package/pngjs2
+// Definitions by: Elisée Maurer <https://sparklinlabs.com/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "pngjs2" {
+  import fs = require("fs");
+  import events = require("events");
+  import stream = require("stream");
+
+  interface PNGOptions {
+    width?: number;
+    height?: number;
+    checkCRC?: boolean;
+    deflateChunkSize?: number;
+    deflateLevel?: number;
+    deflateStrategy?: number;
+    deflateFactory?: any;
+    filterType?: number|number[];
+    colorType?: number;
+    inputHasAlpha?: boolean;
+  }
+  
+  interface PNGMetadata {
+    width: number;
+    height: number;
+    palette: boolean;
+    color: boolean;
+    alpha: boolean;
+    interlace: boolean;
+  }
+
+  export class PNG extends stream.Writable {
+    constructor(options?: PNGOptions);
+
+    width: number;
+    height: number;
+    data: Buffer;
+    gamma: number;
+
+    on(event: string, callback: Function): PNG;
+    on(event: "metadata", callback: (metadata: PNGMetadata) => void): PNG;
+    on(event: "parsed", callback: (data: Buffer) => void): PNG;
+    on(event: "error", callback: (err: Error) => void): PNG;
+
+    parse(data: string|Buffer, callback?: (err: Error, data: Buffer) => void): PNG;
+    pack(): PNG;
+    pipe(destination: fs.WriteStream): PNG;
+
+    static bitblt(src: PNG, dst: PNG, srcX: number, srcY: number,
+                           width: number, height: number, deltaX: number, deltaY: number): void;
+
+    // This method's signature is wrong in 1.2.0, see https://github.com/lukeapage/pngjs2/pull/29
+    // Use the static version in the meantime
+    /*bitblt(dst: PNG, srcX: number, srcY: number,
+             width: number, height: number, deltaX: number, deltaY: number): void;*/
+  }
+  
+  export namespace PNG {
+    namespace sync {
+      function read(buffer: string|Buffer, options?: PNGOptions): PNG;
+    }
+  }
+}

From b62c244440a528298460bcd25d96dfde38e39f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elis=C3=A9e=20Maurer?= <elisee@sparklinlabs.com>
Date: Thu, 8 Oct 2015 22:32:44 +0200
Subject: [PATCH 2/2] Update pngjs2 definition to 2.0.0

---
 pngjs2/pngjs2.d.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pngjs2/pngjs2.d.ts b/pngjs2/pngjs2.d.ts
index bc2e061cc..e44dbfdd6 100644
--- a/pngjs2/pngjs2.d.ts
+++ b/pngjs2/pngjs2.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for pngjs2 1.2.0
+// Type definitions for pngjs2 2.0.0
 // Project: https://www.npmjs.com/package/pngjs2
 // Definitions by: Elisée Maurer <https://sparklinlabs.com/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -50,12 +50,10 @@ declare module "pngjs2" {
     pipe(destination: fs.WriteStream): PNG;
 
     static bitblt(src: PNG, dst: PNG, srcX: number, srcY: number,
-                           width: number, height: number, deltaX: number, deltaY: number): void;
+                  width: number, height: number, deltaX: number, deltaY: number): void;
 
-    // This method's signature is wrong in 1.2.0, see https://github.com/lukeapage/pngjs2/pull/29
-    // Use the static version in the meantime
-    /*bitblt(dst: PNG, srcX: number, srcY: number,
-             width: number, height: number, deltaX: number, deltaY: number): void;*/
+    bitblt(dst: PNG, srcX: number, srcY: number,
+           width: number, height: number, deltaX: number, deltaY: number): PNG;
   }
   
   export namespace PNG {