From aabf0f234ccab269c4b6ea2f20766d370cd8d359 Mon Sep 17 00:00:00 2001
From: Francisco Dans <fdansv@gmail.com>
Date: Mon, 4 May 2015 11:35:30 +0200
Subject: [PATCH 1/3] limits sprite radius to 255

---
 lib/torque/renderer/cartocss_render.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/torque/renderer/cartocss_render.js b/lib/torque/renderer/cartocss_render.js
index a6acad1..e85189e 100644
--- a/lib/torque/renderer/cartocss_render.js
+++ b/lib/torque/renderer/cartocss_render.js
@@ -78,7 +78,8 @@
       if (st['marker-fill-opacity'] !== undefined || st['marker-opacity'] !== undefined) {
         ctx.globalAlpha = st['marker-fill-opacity'] || st['marker-opacity'];
       }
-      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var maxSpriteRadius = 255;
+      ctx.drawImage(img, 0, 0, Math.min(img.width, maxSpriteRadius), Math.min(img.height, maxSpriteRadius));
     }
   }
 

From adbeebb1c170dde9cb2a24bfb0240fc8646715f3 Mon Sep 17 00:00:00 2001
From: Francisco Dans <fdansv@gmail.com>
Date: Mon, 4 May 2015 11:36:52 +0200
Subject: [PATCH 2/3] updates news

---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index 994b1d6..b6eabee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+2.11.3
+    - Limited sprite radius to a maximum of 255px
 2.11.2
     - Added error handling to Torque
     - Fixed 'remove' event triggering when removing a Torque layer.

From 89b6819e536c1882a024a569966dcc2fe7fa34ec Mon Sep 17 00:00:00 2001
From: Francisco Dans <fdansv@gmail.com>
Date: Mon, 4 May 2015 11:38:07 +0200
Subject: [PATCH 3/3] adds NEWS entry for previous Firefox fix

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index b6eabee..1c36621 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 2.11.3
     - Limited sprite radius to a maximum of 255px
+    - Fixed custom marker-file functionality in Firefox
 2.11.2
     - Added error handling to Torque
     - Fixed 'remove' event triggering when removing a Torque layer.