From fe9e0ccf6a36f46827a982675a6a378423074b4b Mon Sep 17 00:00:00 2001
From: "srowen@gmail.com"
 <srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Wed, 27 Mar 2013 09:54:44 +0000
Subject: [PATCH] Raise MP limit and improve message about limit on decode page

git-svn-id: https://zxing.googlecode.com/svn/trunk@2597 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 zxingorg/src/com/google/zxing/web/DecodeServlet.java | 4 ++--
 zxingorg/web/w/decode.jspx                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zxingorg/src/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
index f7c8e3f2f..937129def 100644
--- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
@@ -79,8 +79,8 @@ public final class DecodeServlet extends HttpServlet {
 
   // No real reason to let people upload more than a 2MB image
   private static final long MAX_IMAGE_SIZE = 2000000L;
-  // No real reason to deal with more than maybe 2 megapixels
-  private static final int MAX_PIXELS = 1 << 21;
+  // No real reason to deal with more than maybe 8.3 megapixels
+  private static final int MAX_PIXELS = 1 << 23;
   private static final byte[] REMAINDER_BUFFER = new byte[8192];
   private static final Map<DecodeHintType,Object> HINTS;
   private static final Map<DecodeHintType,Object> HINTS_PURE;
diff --git a/zxingorg/web/w/decode.jspx b/zxingorg/web/w/decode.jspx
index 66a402bc4..91161c547 100644
--- a/zxingorg/web/w/decode.jspx
+++ b/zxingorg/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):</td>
+            <td style="text-align:right">Or upload a file (&amp;lt;2MB, &amp;lt;8MP):</td>
             <td><input type="file" name="f"/></td>
             <td><input type="submit"/></td>
           </tr>