From ce30fae7be0b4730fb111198a2cd22af8c63b819 Mon Sep 17 00:00:00 2001 From: srowen Date: Thu, 26 May 2011 12:42:07 +0000 Subject: [PATCH] Remove unnecessary dependency from common to qrcode package git-svn-id: https://zxing.googlecode.com/svn/trunk@1799 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- core/src/com/google/zxing/common/DecoderResult.java | 8 +++----- .../zxing/qrcode/decoder/DecodedBitStreamParser.java | 5 ++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/src/com/google/zxing/common/DecoderResult.java b/core/src/com/google/zxing/common/DecoderResult.java index ce0e3c524..7e0855333 100644 --- a/core/src/com/google/zxing/common/DecoderResult.java +++ b/core/src/com/google/zxing/common/DecoderResult.java @@ -16,8 +16,6 @@ package com.google.zxing.common; -import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; - import java.util.Vector; /** @@ -32,9 +30,9 @@ public final class DecoderResult { private final byte[] rawBytes; private final String text; private final Vector byteSegments; - private final ErrorCorrectionLevel ecLevel; + private final String ecLevel; - public DecoderResult(byte[] rawBytes, String text, Vector byteSegments, ErrorCorrectionLevel ecLevel) { + public DecoderResult(byte[] rawBytes, String text, Vector byteSegments, String ecLevel) { if (rawBytes == null && text == null) { throw new IllegalArgumentException(); } @@ -56,7 +54,7 @@ public final class DecoderResult { return byteSegments; } - public ErrorCorrectionLevel getECLevel() { + public String getECLevel() { return ecLevel; } diff --git a/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java b/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java index 76087ec04..3376a96c2 100644 --- a/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java +++ b/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java @@ -114,7 +114,10 @@ final class DecodedBitStreamParser { } } while (!mode.equals(Mode.TERMINATOR)); - return new DecoderResult(bytes, result.toString(), byteSegments.isEmpty() ? null : byteSegments, ecLevel); + return new DecoderResult(bytes, + result.toString(), + byteSegments.isEmpty() ? null : byteSegments, + ecLevel.toString()); } /**