X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=zxingorg%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fweb%2FDecodeServlet.java;fp=zxingorg%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fweb%2FDecodeServlet.java;h=6a64c3edb53c25433e3cb206e6bf6d4b7e0b9e85;hp=8419c7ac12ad19454df3e8c8be54a217893196d3;hb=cd86e6050f634084dd100567c4b1f44218aa7d8a;hpb=eb5befec9d93a5968bb0785f3c684a8fb33dd3c7

diff --git a/zxingorg/src/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
index 8419c7ac..6a64c3ed 100644
--- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
@@ -107,13 +107,13 @@ public final class DecodeServlet extends HttpServlet {
     possibleFormats.add(BarcodeFormat.EAN_8);
     possibleFormats.add(BarcodeFormat.EAN_13);
     possibleFormats.add(BarcodeFormat.CODE_39);
-    possibleFormats.add(BarcodeFormat.CODE_93);    
+    possibleFormats.add(BarcodeFormat.CODE_93);
     possibleFormats.add(BarcodeFormat.CODE_128);
     //possibleFormats.add(BarcodeFormat.CODABAR);
     possibleFormats.add(BarcodeFormat.ITF);
-    possibleFormats.add(BarcodeFormat.RSS14);    
+    possibleFormats.add(BarcodeFormat.RSS14);
     possibleFormats.add(BarcodeFormat.QR_CODE);
-    possibleFormats.add(BarcodeFormat.DATAMATRIX);
+    possibleFormats.add(BarcodeFormat.DATA_MATRIX);
     possibleFormats.add(BarcodeFormat.PDF417);
     HINTS.put(DecodeHintType.POSSIBLE_FORMATS, possibleFormats);
     HINTS_PURE = new Hashtable<DecodeHintType, Object>(HINTS);
@@ -286,11 +286,11 @@ public final class DecodeServlet extends HttpServlet {
     }
     if (image == null) {
       response.sendRedirect("badimage.jspx");
-      return;      
+      return;
     }
     if (image.getHeight() <= 1 || image.getWidth() <= 1 ||
         image.getHeight() * image.getWidth() > MAX_PIXELS) {
-      log.fine("Dimensions too large: " + image.getWidth() + 'x' + image.getHeight());        
+      log.fine("Dimensions too large: " + image.getWidth() + 'x' + image.getHeight());
       response.sendRedirect("badimage.jspx");
       return;
     }