[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 3b22568664b0c0017ea793fd3cf5fde433e95717
srowen
srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57
Wed Jun 30 15:29:51 UTC 2010
The following commit has been merged in the upstream branch:
commit 0d27796586a2bf0edcb72f3207db46561ab3a4c5
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu Mar 25 17:22:45 2010 +0000
Support reading multiple barcodes in one image.
git-svn-id: http://zxing.googlecode.com/svn/trunk@1255 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 dce1be7..b561350 100644
--- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
@@ -28,16 +28,15 @@ import com.google.zxing.Reader;
import com.google.zxing.ReaderException;
import com.google.zxing.Result;
import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
-import com.google.zxing.client.result.ParsedResult;
-import com.google.zxing.client.result.ResultParser;
import com.google.zxing.common.GlobalHistogramBinarizer;
import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.multi.GenericMultipleBarcodeReader;
+import com.google.zxing.multi.MultipleBarcodeReader;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.lang.StringEscapeUtils;
import org.apache.http.Header;
import org.apache.http.HttpMessage;
import org.apache.http.HttpResponse;
@@ -66,6 +65,8 @@ import java.net.SocketException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Hashtable;
import java.util.List;
@@ -258,36 +259,58 @@ public final class DecodeServlet extends HttpServlet {
Reader reader = new MultiFormatReader();
LuminanceSource source = new BufferedImageLuminanceSource(image);
BinaryBitmap bitmap = new BinaryBitmap(new GlobalHistogramBinarizer(source));
- Result result = null;
+ Collection<Result> results = new ArrayList<Result>(1);
ReaderException savedException = null;
try {
- // Look for pure barcode
- result = reader.decode(bitmap, HINTS_PURE);
+ // Look for multiple barcodes
+ MultipleBarcodeReader multiReader = new GenericMultipleBarcodeReader(reader);
+ Result[] theResults = multiReader.decodeMultiple(bitmap, HINTS);
+ if (theResults != null) {
+ results.addAll(Arrays.asList(theResults));
+ }
} catch (ReaderException re) {
savedException = re;
}
- if (result == null) {
+ if (results.isEmpty()) {
+ try {
+ // Look for pure barcode
+ Result theResult = reader.decode(bitmap, HINTS_PURE);
+ if (theResult != null) {
+ results.add(theResult);
+ }
+ } catch (ReaderException re) {
+ savedException = re;
+ }
+ }
+
+ if (results.isEmpty()) {
try {
// Look for normal barcode in photo
- result = reader.decode(bitmap, HINTS);
+ Result theResult = reader.decode(bitmap, HINTS);
+ if (theResult != null) {
+ results.add(theResult);
+ }
} catch (ReaderException re) {
savedException = re;
}
}
- if (result == null) {
+ if (results.isEmpty()) {
try {
// Try again with other binarizer
BinaryBitmap hybridBitmap = new BinaryBitmap(new HybridBinarizer(source));
- result = reader.decode(hybridBitmap, HINTS);
+ Result theResult = reader.decode(hybridBitmap, HINTS);
+ if (theResult != null) {
+ results.add(theResult);
+ }
} catch (ReaderException re) {
savedException = re;
}
}
- if (result == null) {
+ if (results.isEmpty()) {
handleException(savedException, response);
return;
}
@@ -297,32 +320,15 @@ public final class DecodeServlet extends HttpServlet {
response.setCharacterEncoding("UTF8");
Writer out = new OutputStreamWriter(response.getOutputStream(), "UTF8");
try {
- out.write(result.getText());
+ for (Result result : results) {
+ out.write(result.getText());
+ out.write('\n');
+ }
} finally {
out.close();
}
} else {
- request.setAttribute("result", result);
- byte[] rawBytes = result.getRawBytes();
- if (rawBytes != null) {
- request.setAttribute("rawBytesString", arrayToString(rawBytes));
- } else {
- request.setAttribute("rawBytesString", "(Not applicable)");
- }
- String text = result.getText();
- if (text != null) {
- request.setAttribute("text", StringEscapeUtils.escapeXml(text));
- } else {
- request.setAttribute("text", "(Not applicable)");
- }
- ParsedResult parsedResult = ResultParser.parseResult(result);
- request.setAttribute("parsedResult", parsedResult);
- String displayResult = parsedResult.getDisplayResult();
- if (displayResult != null) {
- request.setAttribute("displayResult", StringEscapeUtils.escapeXml(displayResult));
- } else {
- request.setAttribute("displayResult", "(Not applicable)");
- }
+ request.setAttribute("results", results);
request.getRequestDispatcher("decoderesult.jspx").forward(request, response);
}
}
@@ -354,28 +360,6 @@ public final class DecodeServlet extends HttpServlet {
return true;
}
- private static String arrayToString(byte[] bytes) {
- int length = bytes.length;
- StringBuilder result = new StringBuilder(length << 2);
- int i = 0;
- while (i < length) {
- int max = Math.min(i + 8, length);
- for (int j = i; j < max; j++) {
- int value = bytes[j] & 0xFF;
- result.append(Integer.toHexString(value / 16));
- result.append(Integer.toHexString(value % 16));
- result.append(' ');
- }
- result.append('\n');
- i += 8;
- }
- for (int j = i - 8; j < length; j++) {
- result.append(Integer.toHexString(bytes[j] & 0xFF));
- result.append(' ');
- }
- return result.toString();
- }
-
@Override
public void destroy() {
log.config("DecodeServlet shutting down...");
diff --git a/zxingorg/web/decoderesult.jspx b/zxingorg/web/decoderesult.jspx
index 40a0c48..658cca1 100644
--- a/zxingorg/web/decoderesult.jspx
+++ b/zxingorg/web/decoderesult.jspx
@@ -16,10 +16,37 @@
-->
<!-- Author: Sean Owen -->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2">
+<jsp:directive.page import="
+ java.util.List,
+ com.google.zxing.Result,
+ com.google.zxing.client.result.ResultParser,
+ com.google.zxing.client.result.ParsedResult,
+ org.apache.commons.lang.StringEscapeUtils"/>
+ <jsp:declaration>
+ private static String arrayToString(byte[] bytes) {
+ int length = bytes.length;
+ StringBuilder result = new StringBuilder(length << 2);
+ int i = 0;
+ while (i < length) {
+ int max = Math.min(i + 8, length);
+ for (int j = i; j < max; j++) {
+ int value = bytes[j] & 0xFF;
+ result.append(Integer.toHexString(value / 16));
+ result.append(Integer.toHexString(value % 16));
+ result.append(' ');
+ }
+ result.append('\n');
+ i += 8;
+ }
+ for (int j = i - 8; j < length; j++) {
+ result.append(Integer.toHexString(bytes[j] & 0xFF));
+ result.append(' ');
+ }
+ return result.toString();
+ }
+</jsp:declaration>
<jsp:directive.page contentType="text/html" session="false"/>
<jsp:scriptlet>response.setHeader("Cache-Control", "no-cache");</jsp:scriptlet>
-<jsp:useBean id="result" scope="request" type="com.google.zxing.Result"/>
-<jsp:useBean id="parsedResult" scope="request" type="com.google.zxing.client.result.ParsedResult"/>
<jsp:text><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">]]></jsp:text>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
@@ -31,28 +58,58 @@
</head>
<body>
<div id="header"><h1><img src="zxing-icon.png" height="32" width="32" alt=""/> Decode Succeeded</h1></div>
+ <jsp:scriptlet>
+ for (Result result : (List<Result>) request.getAttribute("results")) {
+ ParsedResult parsedResult = ResultParser.parseResult(result);
+
+ String text = result.getText();
+ if (text == null) {
+ text = "(Not applicable)";
+ } else {
+ text = StringEscapeUtils.escapeXml(text);
+ }
+
+ byte[] rawBytes = result.getRawBytes();
+ String rawBytesString;
+ if (rawBytes == null) {
+ rawBytesString = "(Not applicable)";
+ } else {
+ rawBytesString = arrayToString(rawBytes);
+ }
+
+ String displayResult = parsedResult.getDisplayResult();
+ if (displayResult == null) {
+ displayResult = "(Not applicable)";
+ } else {
+ displayResult = StringEscapeUtils.escapeXml(displayResult);
+ }
+ </jsp:scriptlet>
<table>
<tr>
<td>Raw text</td>
- <td><jsp:expression>request.getAttribute("text")</jsp:expression></td>
+ <td><jsp:expression>text</jsp:expression></td>
</tr>
<tr>
<td>Raw bytes</td>
- <td><jsp:expression>request.getAttribute("rawBytesString")</jsp:expression></td>
+ <td><jsp:expression>rawBytesString</jsp:expression></td>
</tr>
<tr>
<td>Barcode format</td>
- <td><jsp:getProperty name="result" property="barcodeFormat"/></td>
+ <td><jsp:expression>result.getBarcodeFormat()</jsp:expression></td>
</tr>
<tr>
<td>Parsed Result Type</td>
- <td><jsp:getProperty name="parsedResult" property="type"/></td>
+ <td><jsp:expression>parsedResult.getType()</jsp:expression></td>
</tr>
<tr>
<td>Parsed Result</td>
- <td><jsp:expression>request.getAttribute("displayResult")</jsp:expression></td>
+ <td><jsp:expression>displayResult</jsp:expression></td>
</tr>
</table>
+ <hr/>
+ <jsp:scriptlet>
+ }
+ </jsp:scriptlet>
<div id="footer"><p>Copyright 2008 and onwards ZXing authors</p></div>
<jsp:include page="analytics.jspx"/>
</body>
--
Multi-format 1D/2D barcode image processing library
More information about the Pkg-google-commits
mailing list