From: dswitkin@google.com <dswitkin@google.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 26 Aug 2010 14:06:44 +0000 (+0000)
Subject: Added rounding code to getRow() as well and updated the tests accordingly.
X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=af2a2146f0a0f79f9196501bd38f9ac2e9a6d061;hp=8f2a89aa54e084988c626aa2e5cf072ca6ed58e5

Added rounding code to getRow() as well and updated the tests accordingly.

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

diff --git a/core/test/src/com/google/zxing/oned/Code128BlackBox2TestCase.java b/core/test/src/com/google/zxing/oned/Code128BlackBox2TestCase.java
index 1e134fdd..b8f03f2a 100644
--- a/core/test/src/com/google/zxing/oned/Code128BlackBox2TestCase.java
+++ b/core/test/src/com/google/zxing/oned/Code128BlackBox2TestCase.java
@@ -27,7 +27,7 @@ public final class Code128BlackBox2TestCase extends AbstractBlackBoxTestCase {
 
   public Code128BlackBox2TestCase() {
     super("test/data/blackbox/code128-2", new MultiFormatReader(), BarcodeFormat.CODE_128);
-    addTest(35, 39, 0.0f);
+    addTest(36, 39, 0.0f);
     addTest(36, 39, 180.0f);
   }
 
diff --git a/core/test/src/com/google/zxing/oned/EAN13BlackBox1TestCase.java b/core/test/src/com/google/zxing/oned/EAN13BlackBox1TestCase.java
index 61fc1350..a8fc37df 100644
--- a/core/test/src/com/google/zxing/oned/EAN13BlackBox1TestCase.java
+++ b/core/test/src/com/google/zxing/oned/EAN13BlackBox1TestCase.java
@@ -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, 31, 0.0f);
-    addTest(27, 31, 180.0f);
+    addTest(30, 32, 0.0f);
+    addTest(27, 32, 180.0f);
   }
 
 }
\ No newline at end of file
diff --git a/core/test/src/com/google/zxing/oned/ITFBlackBox1TestCase.java b/core/test/src/com/google/zxing/oned/ITFBlackBox1TestCase.java
index 64050c90..9be4d106 100644
--- a/core/test/src/com/google/zxing/oned/ITFBlackBox1TestCase.java
+++ b/core/test/src/com/google/zxing/oned/ITFBlackBox1TestCase.java
@@ -27,8 +27,8 @@ public final class ITFBlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public ITFBlackBox1TestCase() {
     super("test/data/blackbox/itf-1", new MultiFormatReader(), BarcodeFormat.ITF);
-    addTest(9, 12, 0.0f);
-    addTest(12, 12, 180.0f);
+    addTest(8, 12, 0.0f);
+    addTest(11, 12, 180.0f);
   }
 
 }
diff --git a/core/test/src/com/google/zxing/oned/UPCABlackBox1TestCase.java b/core/test/src/com/google/zxing/oned/UPCABlackBox1TestCase.java
index 50bbb848..049e8992 100644
--- a/core/test/src/com/google/zxing/oned/UPCABlackBox1TestCase.java
+++ b/core/test/src/com/google/zxing/oned/UPCABlackBox1TestCase.java
@@ -27,8 +27,8 @@ public final class UPCABlackBox1TestCase extends AbstractBlackBoxTestCase {
 
   public UPCABlackBox1TestCase() {
     super("test/data/blackbox/upca-1", new MultiFormatReader(), BarcodeFormat.UPC_A);
-    addTest(16, 18, 0.0f);
-    addTest(17, 18, 180.0f);
+    addTest(14, 18, 0.0f);
+    addTest(16, 18, 180.0f);
   }
 
 }
\ No newline at end of file
diff --git a/core/test/src/com/google/zxing/oned/UPCABlackBox3ReflectiveTestCase.java b/core/test/src/com/google/zxing/oned/UPCABlackBox3ReflectiveTestCase.java
index 2bd34555..0dae76d4 100644
--- a/core/test/src/com/google/zxing/oned/UPCABlackBox3ReflectiveTestCase.java
+++ b/core/test/src/com/google/zxing/oned/UPCABlackBox3ReflectiveTestCase.java
@@ -28,7 +28,7 @@ public final class UPCABlackBox3ReflectiveTestCase extends AbstractBlackBoxTestC
   public UPCABlackBox3ReflectiveTestCase() {
     super("test/data/blackbox/upca-3", new MultiFormatReader(), BarcodeFormat.UPC_A);
     addTest(7, 8, 0.0f);
-    addTest(7, 9, 180.0f);
+    addTest(8, 9, 180.0f);
   }
 
 }
diff --git a/core/test/src/com/google/zxing/oned/UPCABlackBox4TestCase.java b/core/test/src/com/google/zxing/oned/UPCABlackBox4TestCase.java
index a1888736..b6da8115 100644
--- a/core/test/src/com/google/zxing/oned/UPCABlackBox4TestCase.java
+++ b/core/test/src/com/google/zxing/oned/UPCABlackBox4TestCase.java
@@ -27,7 +27,7 @@ public final class UPCABlackBox4TestCase extends AbstractBlackBoxTestCase {
 
   public UPCABlackBox4TestCase() {
     super("test/data/blackbox/upca-4", new MultiFormatReader(), BarcodeFormat.UPC_A);
-    addTest(8, 11, 0.0f);
+    addTest(9, 11, 0.0f);
     addTest(9, 11, 180.0f);
   }
 
diff --git a/javase/src/com/google/zxing/client/j2se/BufferedImageLuminanceSource.java b/javase/src/com/google/zxing/client/j2se/BufferedImageLuminanceSource.java
index 28b01294..1d44564d 100644
--- a/javase/src/com/google/zxing/client/j2se/BufferedImageLuminanceSource.java
+++ b/javase/src/com/google/zxing/client/j2se/BufferedImageLuminanceSource.java
@@ -74,7 +74,8 @@ public final class BufferedImageLuminanceSource extends LuminanceSource {
       int pixel = rgbData[x];
       int luminance = (306 * ((pixel >> 16) & 0xFF) +
           601 * ((pixel >> 8) & 0xFF) +
-          117 * (pixel & 0xFF)) >> 10;
+          117 * (pixel & 0xFF) +
+          (0x200)) >> 10; // 0x200 = 1<<9, half an lsb of the result to force rounding
       row[x] = (byte) luminance;
     }
     return row;