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

[srowen]

The following commit has been merged in the upstream branch:
commit dc89129a65039457c3c919ecfae8759e5173ac80
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Thu Mar 25 15:16:33 2010 +0000

    Quick patch to make this work with current writer API
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1253 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/core/src/com/google/zxing/oned/Code128Writer.java b/core/src/com/google/zxing/oned/Code128Writer.java
index 0c22626..9f4734b 100644
--- a/core/src/com/google/zxing/oned/Code128Writer.java
+++ b/core/src/com/google/zxing/oned/Code128Writer.java
@@ -19,7 +19,7 @@ package com.google.zxing.oned;
 import java.util.Hashtable;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.ByteMatrix;
 
 /**
  * This object renders a CODE128 code as a {@link BitMatrix}.
@@ -28,7 +28,7 @@ import com.google.zxing.common.BitMatrix;
  */
 public final class Code128Writer extends UPCEANWriter {
 
-	  public BitMatrix encode(String contents,
+	  public ByteMatrix encode(String contents,
                             BarcodeFormat format,
                             int width,
                             int height,
diff --git a/core/src/com/google/zxing/oned/Code39Writer.java b/core/src/com/google/zxing/oned/Code39Writer.java
index fab63b2..42ab1fd 100644
--- a/core/src/com/google/zxing/oned/Code39Writer.java
+++ b/core/src/com/google/zxing/oned/Code39Writer.java
@@ -19,7 +19,7 @@ package com.google.zxing.oned;
 import java.util.Hashtable;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.ByteMatrix;
 
 /**
  * This object renders a CODE39 code as a {@link BitMatrix}.
@@ -28,7 +28,7 @@ import com.google.zxing.common.BitMatrix;
  */
 public final class Code39Writer extends UPCEANWriter {
 
-	  public BitMatrix encode(String contents, BarcodeFormat format, int width, int height,
+	  public ByteMatrix encode(String contents, BarcodeFormat format, int width, int height,
 	      Hashtable hints) throws WriterException {
 	    if (format != BarcodeFormat.CODE_39) {
 	      throw new IllegalArgumentException("Can only encode CODE_39, but got " + format);
diff --git a/core/src/com/google/zxing/oned/ITFWriter.java b/core/src/com/google/zxing/oned/ITFWriter.java
index b85a652..1847f7b 100644
--- a/core/src/com/google/zxing/oned/ITFWriter.java
+++ b/core/src/com/google/zxing/oned/ITFWriter.java
@@ -19,7 +19,7 @@ package com.google.zxing.oned;
 import java.util.Hashtable;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.ByteMatrix;
 
 /**
  * This object renders a ITF code as a {@link BitMatrix}.
@@ -28,7 +28,7 @@ import com.google.zxing.common.BitMatrix;
  */
 public final class ITFWriter extends UPCEANWriter {
 
-	  public BitMatrix encode(String contents, BarcodeFormat format, int width, int height,
+	  public ByteMatrix encode(String contents, BarcodeFormat format, int width, int height,
 	      Hashtable hints) throws WriterException {
 	    if (format != BarcodeFormat.ITF) {
 	      throw new IllegalArgumentException("Can only encode ITF, but got " + format);

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