mirror of
https://github.com/zxing/zxing.git
synced 2025-01-13 04:07:27 -08:00
Issue 1136 touch up AS compilation
git-svn-id: https://zxing.googlecode.com/svn/trunk@2224 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
parent
0ba3c24aa2
commit
64b3f0ee79
|
@ -17,6 +17,7 @@
|
|||
package com.google.zxing.aztec
|
||||
{
|
||||
import com.google.zxing.Reader;
|
||||
import com.google.zxing.common.ResultPointCallback;
|
||||
|
||||
public final class AztecReader implements Reader
|
||||
{
|
||||
|
@ -31,7 +32,6 @@ package com.google.zxing.aztec
|
|||
import com.google.zxing.Result;
|
||||
import com.google.zxing.ResultMetadataType;
|
||||
import com.google.zxing.ResultPoint;
|
||||
import com.google.zxing.ResultPointCallback;
|
||||
import com.google.zxing.common.DecoderResult;
|
||||
import com.google.zxing.aztec.decoder.Decoder;
|
||||
import com.google.zxing.aztec.detector.Detector;
|
||||
|
|
|
@ -27,7 +27,7 @@ public class DefaultGridSampler extends GridSampler
|
|||
|
||||
|
||||
|
||||
public function sampleGrid2(image:BitMatrix,
|
||||
override public function sampleGrid2(image:BitMatrix,
|
||||
dimensionX:int,
|
||||
dimensionY:int,
|
||||
p1ToX:Number,
|
||||
|
@ -73,7 +73,7 @@ public class DefaultGridSampler extends GridSampler
|
|||
bits._set(x >> 1, y);
|
||||
}
|
||||
}
|
||||
} catch (aioobe:ArrayIndexOutOfBoundsException) {
|
||||
} catch (aioobe:Error) {
|
||||
// This feels wrong, but, sometimes if the finder patterns are misidentified, the resulting
|
||||
// transform gets "twisted" such that it maps a straight line of points to a set of points
|
||||
// whose endpoints are in bounds, but others are not. There is probably some mathematical
|
||||
|
|
|
@ -41,7 +41,7 @@ public final class MultiDetector extends Detector {
|
|||
|
||||
public function detectMulti(hints:HashTable):Array {
|
||||
var image:BitMatrix = getImage();
|
||||
var finder:MultiFinderPatternFinder = new MultiFinderPatternFinder(image);
|
||||
var finder:MultiFinderPatternFinder = new MultiFinderPatternFinder(image, null);
|
||||
var info:Array = finder.findMulti(hints);
|
||||
|
||||
if (info == null || info.length == 0) {
|
||||
|
|
|
@ -18,15 +18,16 @@ package com.google.zxing.multi.qrcode.detector
|
|||
{
|
||||
|
||||
import com.google.zxing.DecodeHintType;
|
||||
import com.google.zxing.ReaderException;
|
||||
import com.google.zxing.ResultPoint;
|
||||
import com.google.zxing.common.BitMatrix;
|
||||
import com.google.zxing.common.Collections;
|
||||
import com.google.zxing.common.ResultPointCallback;
|
||||
import com.google.zxing.common.flexdatatypes.ArrayList;
|
||||
import com.google.zxing.common.flexdatatypes.HashTable;
|
||||
import com.google.zxing.ResultPoint;
|
||||
import com.google.zxing.qrcode.detector.FinderPattern;
|
||||
import com.google.zxing.qrcode.detector.FinderPatternFinder;
|
||||
import com.google.zxing.qrcode.detector.FinderPatternInfo;
|
||||
import com.google.zxing.ReaderException;
|
||||
|
||||
/**
|
||||
* <p>This class attempts to find finder patterns in a QR Code. Finder patterns are the square
|
||||
|
@ -75,8 +76,8 @@ public final class MultiFinderPatternFinder extends FinderPatternFinder {
|
|||
*
|
||||
* @param image image to search
|
||||
*/
|
||||
public function MultiFinderPatternFinder(image:BitMatrix) {
|
||||
super(image);
|
||||
public function MultiFinderPatternFinder(image:BitMatrix, resultPointCallback:ResultPointCallback) {
|
||||
super(image, resultPointCallback);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -22,8 +22,8 @@ package com.google.zxing.oned.rss
|
|||
import com.google.zxing.NotFoundException;
|
||||
import com.google.zxing.Result;
|
||||
import com.google.zxing.ResultPoint;
|
||||
import com.google.zxing.ResultPointCallback;
|
||||
import com.google.zxing.common.BitArray;
|
||||
import com.google.zxing.common.ResultPointCallback;
|
||||
import com.google.zxing.common.flexdatatypes.ArrayList;
|
||||
import com.google.zxing.common.flexdatatypes.Enumeration;
|
||||
import com.google.zxing.common.flexdatatypes.HashTable;
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
package com.google.zxing.qrcode.detector
|
||||
{
|
||||
import com.google.zxing.common.ResultPointCallback;
|
||||
|
||||
public class AlignmentPatternFinder
|
||||
{
|
||||
|
||||
|
@ -7,7 +9,6 @@ package com.google.zxing.qrcode.detector
|
|||
import com.google.zxing.common.BitArray;
|
||||
import com.google.zxing.common.BitMatrix;
|
||||
import com.google.zxing.ReaderException;
|
||||
import com.google.zxing.ResultPointCallback;
|
||||
import com.google.zxing.ResultPoint;
|
||||
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package com.google.zxing.qrcode.detector
|
||||
{
|
||||
public class Detector
|
||||
{
|
||||
import com.google.zxing.common.ResultPointCallback;
|
||||
import com.google.zxing.common.BitMatrix;
|
||||
import com.google.zxing.common.flexdatatypes.HashTable;
|
||||
import com.google.zxing.common.DetectorResult;
|
||||
|
@ -11,10 +10,12 @@ package com.google.zxing.qrcode.detector
|
|||
import com.google.zxing.ResultPoint;
|
||||
import com.google.zxing.common.BitMatrix;
|
||||
import com.google.zxing.ReaderException;
|
||||
import com.google.zxing.ResultPointCallback;
|
||||
import com.google.zxing.DecodeHintType;
|
||||
import com.google.zxing.NotFoundException;
|
||||
import com.google.zxing.ResultPointCallback;
|
||||
|
||||
public class Detector
|
||||
{
|
||||
|
||||
|
||||
|
||||
private var image:BitMatrix ;
|
||||
|
|
|
@ -1,16 +1,18 @@
|
|||
package com.google.zxing.qrcode.detector
|
||||
{
|
||||
public class FinderPatternFinder
|
||||
{
|
||||
import com.google.zxing.common.flexdatatypes.HashTable;
|
||||
import com.google.zxing.common.flexdatatypes.ArrayList;
|
||||
import com.google.zxing.DecodeHintType;
|
||||
import com.google.zxing.NotFoundException;
|
||||
import com.google.zxing.ReaderException;
|
||||
import com.google.zxing.ResultPoint;
|
||||
import com.google.zxing.ResultPointCallback;
|
||||
import com.google.zxing.common.BitArray;
|
||||
import com.google.zxing.common.BitMatrix;
|
||||
import com.google.zxing.DecodeHintType;
|
||||
import com.google.zxing.ReaderException;
|
||||
import com.google.zxing.NotFoundException;
|
||||
import com.google.zxing.common.ResultPointCallback;
|
||||
import com.google.zxing.common.flexdatatypes.ArrayList;
|
||||
import com.google.zxing.common.flexdatatypes.HashTable;
|
||||
|
||||
public class FinderPatternFinder
|
||||
{
|
||||
|
||||
|
||||
private static var CENTER_QUORUM:int = 2;
|
||||
protected static var MIN_SKIP:int = 3; // 1 pixel/module times 3 modules/center
|
||||
|
|
Loading…
Reference in a new issue