mirror of
https://github.com/zxing/zxing.git
synced 2025-02-02 05:41:08 -08:00
Remove unnecessary dependency from common to qrcode package
git-svn-id: https://zxing.googlecode.com/svn/trunk@1799 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
parent
9371cc2930
commit
ce30fae7be
|
@ -16,8 +16,6 @@
|
||||||
|
|
||||||
package com.google.zxing.common;
|
package com.google.zxing.common;
|
||||||
|
|
||||||
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
|
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -32,9 +30,9 @@ public final class DecoderResult {
|
||||||
private final byte[] rawBytes;
|
private final byte[] rawBytes;
|
||||||
private final String text;
|
private final String text;
|
||||||
private final Vector byteSegments;
|
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) {
|
if (rawBytes == null && text == null) {
|
||||||
throw new IllegalArgumentException();
|
throw new IllegalArgumentException();
|
||||||
}
|
}
|
||||||
|
@ -56,7 +54,7 @@ public final class DecoderResult {
|
||||||
return byteSegments;
|
return byteSegments;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ErrorCorrectionLevel getECLevel() {
|
public String getECLevel() {
|
||||||
return ecLevel;
|
return ecLevel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -114,7 +114,10 @@ final class DecodedBitStreamParser {
|
||||||
}
|
}
|
||||||
} while (!mode.equals(Mode.TERMINATOR));
|
} 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());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue