From e432d6cc74e474953fedf51b52c9f4c31841297b Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Fri, 31 Jan 2014 11:31:19 +0000
Subject: [PATCH] Increase size of input that decoder accepts

---
 .../src/main/java/com/google/zxing/web/DecodeServlet.java | 8 ++++----
 zxingorg/src/web/w/decode.jspx                            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java
index 2756cd7ce..a695be185 100644
--- a/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java
@@ -86,10 +86,10 @@ public final class DecodeServlet extends HttpServlet {
 
   private static final Logger log = Logger.getLogger(DecodeServlet.class.getName());
 
-  // No real reason to let people upload more than a 4MB image
-  private static final long MAX_IMAGE_SIZE = 4000000L;
-  // No real reason to deal with more than maybe 8.3 megapixels
-  private static final int MAX_PIXELS = 1 << 23;
+  // No real reason to let people upload more than a 10MB image
+  private static final long MAX_IMAGE_SIZE = 10_000_000L;
+  // No real reason to deal with more than maybe 10 megapixels
+  private static final int MAX_PIXELS = 10_000_000;
   private static final byte[] REMAINDER_BUFFER = new byte[32768];
   private static final Map<DecodeHintType,Object> HINTS;
   private static final Map<DecodeHintType,Object> HINTS_PURE;
diff --git a/zxingorg/src/web/w/decode.jspx b/zxingorg/src/web/w/decode.jspx
index 19ac4fff8..1d338a857 100644
--- a/zxingorg/src/web/w/decode.jspx
+++ b/zxingorg/src/web/w/decode.jspx
@@ -64,7 +64,7 @@
         </form>
         <form action="decode" method="post" enctype="multipart/form-data">
           <tr>
-            <td style="text-align:right">Or upload a file (&amp;lt;2MB, &amp;lt;8MP):</td>
+            <td style="text-align:right">Or upload a file (&amp;lt;10MB, &amp;lt;10MP):</td>
             <td><input type="file" name="f"/></td>
             <td><input type="submit"/></td>
           </tr>