From ec36872b767c59263c098e1ed149092919cd6f5e Mon Sep 17 00:00:00 2001
From: Joe Schafer <joe@jschaf.com>
Date: Mon, 15 Dec 2014 22:00:41 -0500
Subject: [PATCH 1/2] fabricjs: delete trailing whitespace

---
 fabricjs/fabricjs.d.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fabricjs/fabricjs.d.ts b/fabricjs/fabricjs.d.ts
index 81397ea4a..b6fcf709e 100644
--- a/fabricjs/fabricjs.d.ts
+++ b/fabricjs/fabricjs.d.ts
@@ -274,13 +274,13 @@ declare module fabric {
 
         hasControls: boolean;
         hasRotatingPoint: boolean;
-        
+
         height: number;
         getHeight(): number;
         setHeight(value: number): IObject;
 
         includeDefaultValues: boolean;
-        
+
         left: number;
         getLeft(): number;
         setLeft(value: number): IObject;
@@ -296,7 +296,7 @@ declare module fabric {
         padding: number;
         perPixelTargetFind: boolean;
         rotatingPointOffset: number;
-        
+
         scaleX: number;
         getScaleX(): number;
         setScaleX(value: number): IObject;
@@ -310,7 +310,7 @@ declare module fabric {
         stroke: string;
         strokeDashArray: any[];
         strokeWidth: number;
-        
+
         top: number;
         getTop(): number;
         setTop(value: number): IObject;
@@ -318,7 +318,7 @@ declare module fabric {
         transformMatrix: any[];
         transparentCorners: boolean;
         type: string;
-        
+
         width: number;
         getWidth(): number;
         setWidth(value: number): IObject;
@@ -453,7 +453,7 @@ declare module fabric {
         toSVG(): string;
     }
 
-    
+
 
     export interface IPath extends IObject {
         complexity(): number;
@@ -511,7 +511,7 @@ declare module fabric {
         renderOnAddition: boolean;
         stateful: boolean;
 
-        // static 
+        // static
         EMPTY_JSON: string;
         supports(methodName: string): boolean;
 
@@ -681,7 +681,7 @@ declare module fabric {
     }
 
     export interface IRectOptions extends IObjectOptions {
-        x?: number; 
+        x?: number;
         y?: number;
         rx?: number;
         ry?: number;
@@ -798,7 +798,7 @@ declare module fabric {
         new (element: HTMLImageElement, objObjects: IObjectOptions): IImage;
         prototype: any;
 
-        filters: 
+        filters:
         {
             Grayscale: {
                 new (): IGrayscaleFilter;

From 0eb610ef36244932609235464b350dd45a3a9cfd Mon Sep 17 00:00:00 2001
From: Joe Schafer <joe@jschaf.com>
Date: Mon, 15 Dec 2014 22:00:08 -0500
Subject: [PATCH 2/2] fabricjs: fix setBackgroundImage

setBackgroundImage takes two mandatory args and an optional argument.

http://fabricjs.com/docs/fabric.StaticCanvas.html#setBackgroundImage
---
 fabricjs/fabricjs-tests.ts | 8 +++++++-
 fabricjs/fabricjs.d.ts     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fabricjs/fabricjs-tests.ts b/fabricjs/fabricjs-tests.ts
index df0d217e8..e59212d80 100644
--- a/fabricjs/fabricjs-tests.ts
+++ b/fabricjs/fabricjs-tests.ts
@@ -1056,4 +1056,10 @@ function sample8() {
             obj.setCoords();
         });
     };
-}
\ No newline at end of file
+}
+
+function sample9() {
+    var canvas = new fabric.Canvas('c');
+    canvas.setBackgroundImage('yolo.jpg', () => {"a"}, {opacity: 45});
+    canvas.setBackgroundImage('yolo.jpg', () => {"a"});
+}
diff --git a/fabricjs/fabricjs.d.ts b/fabricjs/fabricjs.d.ts
index b6fcf709e..fb73fecb3 100644
--- a/fabricjs/fabricjs.d.ts
+++ b/fabricjs/fabricjs.d.ts
@@ -546,7 +546,7 @@ declare module fabric {
 
         sendBackwards(object: IObject): ICanvas;
         sendToBack(object: IObject): ICanvas;
-        setBackgroundImage(object: IObject): ICanvas;
+        setBackgroundImage(image: any, callback: () => any, options?): ICanvas;
         setDimensions(object: { width: number; height: number; }): ICanvas;
         setHeight(height: number): ICanvas;
         setOverlayImage(url: string, callback: () => any, options): ICanvas;