[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

[srowen]

The following commit has been merged in the upstream branch:
commit 484403019ee065f4ed41bb122f0cc9c7836e6605
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Tue May 11 11:44:18 2010 +0000

    Tiny NPE fix
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1352 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/zxingorg/src/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
index e3245c1..70a3555 100644
--- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
@@ -282,8 +282,11 @@ public final class DecodeServlet extends HttpServlet {
       response.sendRedirect("badimage.jspx");
       return;
     }
-    if (image == null ||
-        image.getHeight() <= 1 || image.getWidth() <= 1 ||
+    if (image == null) {
+      response.sendRedirect("badimage.jspx");
+      return;      
+    }
+    if (image.getHeight() <= 1 || image.getWidth() <= 1 ||
         image.getHeight() * image.getWidth() > MAX_PIXELS) {
       log.fine("Dimensions too large: " + image.getWidth() + 'x' + image.getHeight());        
       response.sendRedirect("badimage.jspx");

-- 
Multi-format 1D/2D barcode image processing library