mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-09 20:44:03 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optionally use explict luminance conversion instead of AWT builtin conversion

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2494 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2012-11-04 01:21:38 +00:00
parent 885856bbc4
commit 33cb6a0745
8 changed files with 333 additions and 240 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/build.xml
View file

@ -94,6 +94,7 @@
<enable/>
</assertions>
<jvmarg value="-Djava.awt.headless=true"/>
<jvmarg value="-DexplicitLuminanceConversion=true"/>
<batchtest>
<fileset dir="test/src">
<include name="**/${subdir}/*BlackBox*TestCase.java"/>

46
core/test/src/com/google/zxing/BufferedImageLuminanceSource.java
View file

@ -19,6 +19,7 @@ package com.google.zxing;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster;
/**
* This LuminanceSource implementation is meant for J2SE clients and our blackbox unit tests.
@ -35,6 +36,15 @@ public final class BufferedImageLuminanceSource extends LuminanceSource {
private final int left;
private final int top;
private static final boolean EXPLICIT_LUMINANCE_CONVERSION;
static {
String property = System.getProperty("explicitLuminanceConversion");
if (property == null) {
property = System.getenv("EXPLICIT_LUMINANCE_CONVERSION");
}
EXPLICIT_LUMINANCE_CONVERSION = Boolean.parseBoolean(property);
}
public BufferedImageLuminanceSource(BufferedImage image) {
this(image, 0, 0, image.getWidth(), image.getHeight());
}
@ -42,12 +52,44 @@ public final class BufferedImageLuminanceSource extends LuminanceSource {
public BufferedImageLuminanceSource(BufferedImage image, int left, int top, int width, int height) {
super(width, height);
if (image.getType() == BufferedImage.TYPE_BYTE_GRAY) {
this.image = image;
} else {
int sourceWidth = image.getWidth();
int sourceHeight = image.getHeight();
if (left + width > sourceWidth || top + height > sourceHeight) {
throw new IllegalArgumentException("Crop rectangle does not fit within image data.");
}
this.image = new BufferedImage(sourceWidth, sourceHeight, BufferedImage.TYPE_BYTE_GRAY);
if (EXPLICIT_LUMINANCE_CONVERSION) {
WritableRaster raster = this.image.getRaster();
int[] buffer = new int[width];
for (int y = top; y < top + height; y++) {
image.getRGB(left, y, width, 1, buffer, 0, sourceWidth);
for (int x = 0; x < width; x++) {
int pixel = buffer[x];
// see comments in implicit branch
if ((pixel & 0xFF000000) == 0) {
pixel = 0xFFFFFFFF; // = white
}
int luminance = 0;
// .229R + 0.587G + 0.114B (YUV/YIQ for PAL and NTSC)
luminance = (306 * ((pixel >> 16) & 0xFF) +
601 * ((pixel >> 8) & 0xFF) +
117 * (pixel & 0xFF) +
(0x200)) >> 10; // 0x200 = 1<<9, half an lsb of the result to force rounding
buffer[x] = luminance;
}
raster.setPixels(left, y, width, 1, buffer);
}
} else {
// The color of fully-transparent pixels is irrelevant. They are often, technically, fully-transparent
// black (0 alpha, and then 0 RGB). They are often used, of course as the "white" area in a
// barcode image. Force any such pixel to be white:
@ -69,8 +111,10 @@ public final class BufferedImageLuminanceSource extends LuminanceSource {
}
// Create a grayscale copy, no need to calculate the luminance manually
this.image = new BufferedImage(sourceWidth, sourceHeight, BufferedImage.TYPE_BYTE_GRAY);
this.image.getGraphics().drawImage(image, 0, 0, null);
}
}
this.left = left;
this.top = top;
}

2
core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java
View file

@ -174,6 +174,7 @@ public abstract class AbstractBlackBoxTestCase extends Assert {
misreadCounts[x]++;
}
} catch (ReaderException re) {
System.out.printf("could not read at rotation %f\n", rotation);
// continue
}
try {
@ -183,6 +184,7 @@ public abstract class AbstractBlackBoxTestCase extends Assert {
tryHaderMisreadCounts[x]++;
}
} catch (ReaderException re) {
System.out.printf("could not read at rotation %f w/TH\n", rotation);
// continue
}
}

8
core/test/src/com/google/zxing/negative/FalsePositives2BlackBoxTestCase.java
View file

@ -27,10 +27,10 @@ public final class FalsePositives2BlackBoxTestCase extends AbstractNegativeBlack
public FalsePositives2BlackBoxTestCase() {
super("test/data/blackbox/falsepositives-2");
addTest(5, 0.0f);
addTest(5, 90.0f);
addTest(5, 180.0f);
addTest(5, 270.0f);
addTest(4, 0.0f);
addTest(4, 90.0f);
addTest(4, 180.0f);
addTest(4, 270.0f);
}
}

4
core/test/src/com/google/zxing/oned/EAN13BlackBox1TestCase.java
View file

@ -27,8 +27,8 @@ public final class EAN13BlackBox1TestCase extends AbstractBlackBoxTestCase {
public EAN13BlackBox1TestCase() {
super("test/data/blackbox/ean13-1", new MultiFormatReader(), BarcodeFormat.EAN_13);
addTest(29, 32, 0.0f);
addTest(28, 32, 180.0f);
addTest(30, 32, 0.0f);
addTest(27, 32, 180.0f);
}
}

4
core/test/src/com/google/zxing/oned/UPCABlackBox5TestCase.java
View file

@ -27,8 +27,8 @@ public final class UPCABlackBox5TestCase extends AbstractBlackBoxTestCase {
public UPCABlackBox5TestCase() {
super("test/data/blackbox/upca-5", new MultiFormatReader(), BarcodeFormat.UPC_A);
addTest(19, 23, 1, 1, 0.0f);
addTest(21, 23, 0, 1, 180.0f);
addTest(20, 23, 0, 0, 0.0f);
addTest(22, 23, 0, 0, 180.0f);
}
}

2
core/test/src/com/google/zxing/qrcode/QRCodeBlackBox2TestCase.java
View file

@ -28,7 +28,7 @@ public final class QRCodeBlackBox2TestCase extends AbstractBlackBoxTestCase {
public QRCodeBlackBox2TestCase() {
super("test/data/blackbox/qrcode-2", new MultiFormatReader(), BarcodeFormat.QR_CODE);
addTest(30, 30, 0.0f);
addTest(30, 30, 90.0f);
addTest(29, 29, 90.0f);
addTest(30, 30, 180.0f);
addTest(29, 29, 270.0f);
}

50
javase/src/com/google/zxing/client/j2se/BufferedImageLuminanceSource.java
View file

@ -21,6 +21,7 @@ import com.google.zxing.LuminanceSource;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster;
/**
* This LuminanceSource implementation is meant for J2SE clients and our blackbox unit tests.
@ -31,10 +32,21 @@ import java.awt.image.BufferedImage;
*/
public final class BufferedImageLuminanceSource extends LuminanceSource {
private static final double MINUS_45_IN_RADIANS = -0.7853981633974483; // Math.toRadians(-45.0)
private final BufferedImage image;
private final int left;
private final int top;
private static final boolean EXPLICIT_LUMINANCE_CONVERSION;
static {
String property = System.getProperty("explicitLuminanceConversion");
if (property == null) {
property = System.getenv("EXPLICIT_LUMINANCE_CONVERSION");
}
EXPLICIT_LUMINANCE_CONVERSION = Boolean.parseBoolean(property);
}
public BufferedImageLuminanceSource(BufferedImage image) {
this(image, 0, 0, image.getWidth(), image.getHeight());
}
@ -42,12 +54,44 @@ public final class BufferedImageLuminanceSource extends LuminanceSource {
public BufferedImageLuminanceSource(BufferedImage image, int left, int top, int width, int height) {
super(width, height);
if (image.getType() == BufferedImage.TYPE_BYTE_GRAY) {
this.image = image;
} else {
int sourceWidth = image.getWidth();
int sourceHeight = image.getHeight();
if (left + width > sourceWidth || top + height > sourceHeight) {
throw new IllegalArgumentException("Crop rectangle does not fit within image data.");
}
this.image = new BufferedImage(sourceWidth, sourceHeight, BufferedImage.TYPE_BYTE_GRAY);
if (EXPLICIT_LUMINANCE_CONVERSION) {
WritableRaster raster = this.image.getRaster();
int[] buffer = new int[width];
for (int y = top; y < top + height; y++) {
image.getRGB(left, y, width, 1, buffer, 0, sourceWidth);
for (int x = 0; x < width; x++) {
int pixel = buffer[x];
// see comments in implicit branch
if ((pixel & 0xFF000000) == 0) {
pixel = 0xFFFFFFFF; // = white
}
int luminance = 0;
// .229R + 0.587G + 0.114B (YUV/YIQ for PAL and NTSC)
luminance = (306 * ((pixel >> 16) & 0xFF) +
601 * ((pixel >> 8) & 0xFF) +
117 * (pixel & 0xFF) +
(0x200)) >> 10; // 0x200 = 1<<9, half an lsb of the result to force rounding
buffer[x] = luminance;
}
raster.setPixels(left, y, width, 1, buffer);
}
} else {
// The color of fully-transparent pixels is irrelevant. They are often, technically, fully-transparent
// black (0 alpha, and then 0 RGB). They are often used, of course as the "white" area in a
// barcode image. Force any such pixel to be white:
@ -69,8 +113,10 @@ public final class BufferedImageLuminanceSource extends LuminanceSource {
}
// Create a grayscale copy, no need to calculate the luminance manually
this.image = new BufferedImage(sourceWidth, sourceHeight, BufferedImage.TYPE_BYTE_GRAY);
this.image.getGraphics().drawImage(image, 0, 0, null);
}
}
this.left = left;
this.top = top;
}
@ -150,7 +196,7 @@ public final class BufferedImageLuminanceSource extends LuminanceSource {
int oldCenterY = top + height / 2;
// Rotate 45 degrees counterclockwise.
AffineTransform transform = AffineTransform.getRotateInstance(Math.toRadians(-45.0), oldCenterX, oldCenterY);
AffineTransform transform = AffineTransform.getRotateInstance(MINUS_45_IN_RADIANS, oldCenterX, oldCenterY);
int sourceDimension = Math.max(image.getWidth(), image.getHeight());
BufferedImage rotatedImage = new BufferedImage(sourceDimension, sourceDimension, BufferedImage.TYPE_BYTE_GRAY);