Encapsulates a point of interest in an image containing a barcode. Typically, this
+
+ using MathUtils = com.google.zxing.common.detector.MathUtils;
+
+ ///
+ /// Encapsulates a point of interest in an image containing a barcode. Typically, this
/// would be the location of a finder pattern or the corner of the barcode, for example.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
-
public class ResultPoint
{
- virtual public float X
- {
- get
- {
- return x;
- }
-
- }
- virtual public float Y
- {
- get
- {
- return y;
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'x '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private float x;
- //UPGRADE_NOTE: Final was removed from the declaration of 'y '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private float y;
-
- public ResultPoint(float x, float y)
- {
- this.x = x;
- this.y = y;
- }
-
- public override bool Equals(System.Object other)
- {
- if (other is ResultPoint)
- {
- ResultPoint otherPoint = (ResultPoint) other;
- return x == otherPoint.x && y == otherPoint.y;
- }
- return false;
- }
-
- public override int GetHashCode()
- {
- // Redivivus.in Java to c# Porting update
- // 30/01/2010
- // Commented function body
- //return 31 * Float.floatToIntBits(x) + Float.floatToIntBits(y);
- return 0;
- }
-
- public override System.String ToString()
+ private readonly float x;
+ private readonly float y;
+
+ public ResultPoint(float x, float y)
+ {
+ this.x = x;
+ this.y = y;
+ }
+
+ public float X
+ {
+ get
+ {
+ return x;
+ }
+ }
+
+ public float Y
+ {
+ get
+ {
+ return y;
+ }
+ }
+
+ public override bool Equals(object other)
+ {
+ if (other is ResultPoint)
{
- System.Text.StringBuilder result = new System.Text.StringBuilder(25);
- result.Append('(');
- result.Append(x);
- result.Append(',');
- result.Append(y);
- result.Append(')');
- return result.ToString();
+ ResultPoint otherPoint = (ResultPoint) other;
+ return x == otherPoint.x && y == otherPoint.y;
}
-
- /// Orders an array of three ResultPoints in an order [A,B,C] such that AB < AC and
- /// BC < AC and the angle between BC and BA is less than 180 degrees.
- ///
- public static void orderBestPatterns(ResultPoint[] patterns)
+ return false;
+ }
+
+ public override int GetHashCode()
+ {
+ //return 31 * float.floatToIntBits(x) + float.floatToIntBits(y);
+
+ int xbits = BitConverter.ToInt32(BitConverter.GetBytes(x), 0);
+ int ybits = BitConverter.ToInt32(BitConverter.GetBytes(y), 0);
+ return 31 * xbits + ybits;
+ }
+
+ public override string ToString()
+ {
+ StringBuilder result = new StringBuilder(25);
+ result.Append('(');
+ result.Append(x);
+ result.Append(',');
+ result.Append(y);
+ result.Append(')');
+ return result.ToString();
+ }
+
+ ///
+ /// Orders an array of three ResultPoints in an order [A,B,C] such that AB < AC and
+ /// BC < AC and the angle between BC and BA is less than 180 degrees.
+ ///
+ public static void orderBestPatterns(ResultPoint[] patterns)
+ {
+
+ // Find distances between pattern centers
+ float zeroOneDistance = distance(patterns[0], patterns[1]);
+ float oneTwoDistance = distance(patterns[1], patterns[2]);
+ float zeroTwoDistance = distance(patterns[0], patterns[2]);
+
+ ResultPoint pointA;
+ ResultPoint pointB;
+ ResultPoint pointC;
+ // Assume one closest to other two is B; A and C will just be guesses at first
+ if (oneTwoDistance >= zeroOneDistance && oneTwoDistance >= zeroTwoDistance)
{
-
- // Find distances between pattern centers
- float zeroOneDistance = distance(patterns[0], patterns[1]);
- float oneTwoDistance = distance(patterns[1], patterns[2]);
- float zeroTwoDistance = distance(patterns[0], patterns[2]);
-
- ResultPoint pointA, pointB, pointC;
- // Assume one closest to other two is B; A and C will just be guesses at first
- if (oneTwoDistance >= zeroOneDistance && oneTwoDistance >= zeroTwoDistance)
- {
- pointB = patterns[0];
- pointA = patterns[1];
- pointC = patterns[2];
- }
- else if (zeroTwoDistance >= oneTwoDistance && zeroTwoDistance >= zeroOneDistance)
- {
- pointB = patterns[1];
- pointA = patterns[0];
- pointC = patterns[2];
- }
- else
- {
- pointB = patterns[2];
- pointA = patterns[0];
- pointC = patterns[1];
- }
-
- // Use cross product to figure out whether A and C are correct or flipped.
- // This asks whether BC x BA has a positive z component, which is the arrangement
- // we want for A, B, C. If it's negative, then we've got it flipped around and
- // should swap A and C.
- if (crossProductZ(pointA, pointB, pointC) < 0.0f)
- {
- ResultPoint temp = pointA;
- pointA = pointC;
- pointC = temp;
- }
-
- patterns[0] = pointA;
- patterns[1] = pointB;
- patterns[2] = pointC;
+ pointB = patterns[0];
+ pointA = patterns[1];
+ pointC = patterns[2];
}
-
-
- /// distance between two points
- ///
- public static float distance(ResultPoint pattern1, ResultPoint pattern2)
+ else if (zeroTwoDistance >= oneTwoDistance && zeroTwoDistance >= zeroOneDistance)
{
- float xDiff = pattern1.X - pattern2.X;
- float yDiff = pattern1.Y - pattern2.Y;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- return (float) System.Math.Sqrt((double) (xDiff * xDiff + yDiff * yDiff));
+ pointB = patterns[1];
+ pointA = patterns[0];
+ pointC = patterns[2];
}
-
- /// Returns the z component of the cross product between vectors BC and BA.
- private static float crossProductZ(ResultPoint pointA, ResultPoint pointB, ResultPoint pointC)
+ else
{
- float bX = pointB.x;
- float bY = pointB.y;
- return ((pointC.x - bX) * (pointA.y - bY)) - ((pointC.y - bY) * (pointA.x - bX));
+ pointB = patterns[2];
+ pointA = patterns[0];
+ pointC = patterns[1];
}
+
+ // Use cross product to figure out whether A and C are correct or flipped.
+ // This asks whether BC x BA has a positive z component, which is the arrangement
+ // we want for A, B, C. If it's negative, then we've got it flipped around and
+ // should swap A and C.
+ if (crossProductZ(pointA, pointB, pointC) < 0.0f)
+ {
+ ResultPoint temp = pointA;
+ pointA = pointC;
+ pointC = temp;
+ }
+
+ patterns[0] = pointA;
+ patterns[1] = pointB;
+ patterns[2] = pointC;
+ }
+
+
+ /// distance between two points
+ public static float distance(ResultPoint pattern1, ResultPoint pattern2)
+ {
+ return MathUtils.distance(pattern1.x, pattern1.y, pattern2.x, pattern2.y);
+ }
+
+ ///
+ /// Returns the z component of the cross product between vectors BC and BA.
+ ///
+ private static float crossProductZ(ResultPoint pointA, ResultPoint pointB, ResultPoint pointC)
+ {
+ float bX = pointB.x;
+ float bY = pointB.y;
+ return ((pointC.x - bX) * (pointA.y - bY)) - ((pointC.y - bY) * (pointA.x - bX));
+ }
+
+
}
+
}
\ No newline at end of file
diff --git a/csharp/ResultPointCallback.cs b/csharp/ResultPointCallback.cs
index e736c0a07..a7f7ecd99 100755
--- a/csharp/ResultPointCallback.cs
+++ b/csharp/ResultPointCallback.cs
@@ -1,31 +1,32 @@
/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing
{
-
- /// Callback which is invoked when a possible result point (significant
+
+ ///
+ /// Callback which is invoked when a possible result point (significant
/// point in the barcode image such as a corner) is found.
- ///
///
- ///
- ///
+ ///
public interface ResultPointCallback
{
-
- void foundPossibleResultPoint(ResultPoint point);
+
+ void foundPossibleResultPoint(ResultPoint point);
+
}
+
}
\ No newline at end of file
diff --git a/csharp/Writer.cs b/csharp/Writer.cs
index 540b91721..961490a15 100755
--- a/csharp/Writer.cs
+++ b/csharp/Writer.cs
@@ -1,62 +1,56 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using ByteMatrix = com.google.zxing.common.ByteMatrix;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing
{
-
- /// The base class for all objects which encode/generate a barcode image.
- ///
- ///
- /// dswitkin@google.com (Daniel Switkin)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+
+
+ ///
+ /// The base class for all objects which encode/generate a barcode image.
+ ///
+ /// @author dswitkin@google.com (Daniel Switkin)
+ ///
public interface Writer
{
-
- /// Encode a barcode using the default settings.
- ///
- ///
- /// The contents to encode in the barcode
- ///
- /// The barcode format to generate
- ///
- /// The preferred width in pixels
- ///
- /// The preferred height in pixels
- ///
- /// The generated barcode as a Matrix of unsigned bytes (0 == black, 255 == white)
- ///
- ByteMatrix encode(System.String contents, BarcodeFormat format, int width, int height);
-
- ///
- /// The contents to encode in the barcode
- ///
- /// The barcode format to generate
- ///
- /// The preferred width in pixels
- ///
- /// The preferred height in pixels
- ///
- /// Additional parameters to supply to the encoder
- ///
- /// The generated barcode as a Matrix of unsigned bytes (0 == black, 255 == white)
- ///
- ByteMatrix encode(System.String contents, BarcodeFormat format, int width, int height, System.Collections.Hashtable hints);
+
+ ///
+ /// Encode a barcode using the default settings.
+ ///
+ /// The contents to encode in the barcode
+ /// The barcode format to generate
+ /// The preferred width in pixels
+ /// The preferred height in pixels
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: com.google.zxing.common.BitMatrix encode(String contents, BarcodeFormat format, int width, int height) throws WriterException;
+ BitMatrix encode(string contents, BarcodeFormat format, int width, int height);
+
+ ///
+ /// The contents to encode in the barcode
+ /// The barcode format to generate
+ /// The preferred width in pixels
+ /// The preferred height in pixels
+ /// Additional parameters to supply to the encoder
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: com.google.zxing.common.BitMatrix encode(String contents, BarcodeFormat format, int width, int height, java.util.Map hints) throws WriterException;
+ BitMatrix encode(string contents, BarcodeFormat format, int width, int height, IDictionary hints);
+
}
+
}
\ No newline at end of file
diff --git a/csharp/WriterException.cs b/csharp/WriterException.cs
index e36569e98..c51b5106e 100755
--- a/csharp/WriterException.cs
+++ b/csharp/WriterException.cs
@@ -1,40 +1,45 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing
{
-
- /// A base class which covers the range of exceptions which may occur when encoding a barcode using
+
+ ///
+ /// A base class which covers the range of exceptions which may occur when encoding a barcode using
/// the Writer framework.
///
+ /// @author dswitkin@google.com (Daniel Switkin)
///
- /// dswitkin@google.com (Daniel Switkin)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- [Serializable]
- public sealed class WriterException:System.Exception
+ public sealed class WriterException : Exception
{
-
- public WriterException():base()
- {
- }
-
- public WriterException(System.String message):base(message)
- {
- }
+
+ public WriterException()
+ {
+ }
+
+ public WriterException(string message) : base(message)
+ {
+ }
+
+ public WriterException(Exception cause) : base(cause.Message,cause)
+ {
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/AbstractDoCoMoResultParser.cs b/csharp/client/result/AbstractDoCoMoResultParser.cs
index c3640984e..5886f9ff7 100755
--- a/csharp/client/result/AbstractDoCoMoResultParser.cs
+++ b/csharp/client/result/AbstractDoCoMoResultParser.cs
@@ -1,45 +1,45 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// See
+
+ ///
+ /// See
///
/// DoCoMo's documentation about the result types represented by subclasses of this class.
///
/// Thanks to Jeff Griffin for proposing rewrite of these classes that relies less
/// on exception-based mechanisms during parsing.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- abstract class AbstractDoCoMoResultParser:ResultParser
+ public abstract class AbstractDoCoMoResultParser : ResultParser
{
-
- internal static System.String[] matchDoCoMoPrefixedField(System.String prefix, System.String rawText, bool trim)
- {
- return matchPrefixedField(prefix, rawText, ';', trim);
- }
-
- internal static System.String matchSingleDoCoMoPrefixedField(System.String prefix, System.String rawText, bool trim)
- {
- return matchSinglePrefixedField(prefix, rawText, ';', trim);
- }
+
+ internal static string[] matchDoCoMoPrefixedField(string prefix, string rawText, bool trim)
+ {
+ return matchPrefixedField(prefix, rawText, ';', trim);
+ }
+
+ internal static string matchSingleDoCoMoPrefixedField(string prefix, string rawText, bool trim)
+ {
+ return matchSinglePrefixedField(prefix, rawText, ';', trim);
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/AddressBookAUResultParser.cs b/csharp/client/result/AddressBookAUResultParser.cs
index f3ba7c670..c0abf0317 100755
--- a/csharp/client/result/AddressBookAUResultParser.cs
+++ b/csharp/client/result/AddressBookAUResultParser.cs
@@ -1,79 +1,83 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Implements KDDI AU's address book format. See
+
+ using Result = com.google.zxing.Result;
+
+
+ ///
+ /// Implements KDDI AU's address book format. See
///
/// http://www.au.kddi.com/ezfactory/tec/two_dimensions/index.html.
/// (Thanks to Yuzo for translating!)
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class AddressBookAUResultParser:ResultParser
+ public sealed class AddressBookAUResultParser : ResultParser
{
-
- public static AddressBookParsedResult parse(Result result)
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+ // MEMORY is mandatory; seems like a decent indicator, as does end-of-record separator CR/LF
+ if (!rawText.Contains("MEMORY") || !rawText.Contains("\r\n"))
{
- System.String rawText = result.Text;
- // MEMORY is mandatory; seems like a decent indicator, as does end-of-record separator CR/LF
- if (rawText == null || rawText.IndexOf("MEMORY") < 0 || rawText.IndexOf("\r\n") < 0)
- {
- return null;
- }
-
- // NAME1 and NAME2 have specific uses, namely written name and pronunciation, respectively.
- // Therefore we treat them specially instead of as an array of names.
- System.String name = matchSinglePrefixedField("NAME1:", rawText, '\r', true);
- System.String pronunciation = matchSinglePrefixedField("NAME2:", rawText, '\r', true);
-
- System.String[] phoneNumbers = matchMultipleValuePrefix("TEL", 3, rawText, true);
- System.String[] emails = matchMultipleValuePrefix("MAIL", 3, rawText, true);
- System.String note = matchSinglePrefixedField("MEMORY:", rawText, '\r', false);
- System.String address = matchSinglePrefixedField("ADD:", rawText, '\r', true);
- System.String[] addresses = address == null?null:new System.String[]{address};
- return new AddressBookParsedResult(maybeWrap(name), pronunciation, phoneNumbers, emails, note, addresses, null, null, null, null);
+ return null;
}
-
- private static System.String[] matchMultipleValuePrefix(System.String prefix, int max, System.String rawText, bool trim)
+
+ // NAME1 and NAME2 have specific uses, namely written name and pronunciation, respectively.
+ // Therefore we treat them specially instead of as an array of names.
+ string name = matchSinglePrefixedField("NAME1:", rawText, '\r', true);
+ string pronunciation = matchSinglePrefixedField("NAME2:", rawText, '\r', true);
+
+ string[] phoneNumbers = matchMultipleValuePrefix("TEL", 3, rawText, true);
+ string[] emails = matchMultipleValuePrefix("MAIL", 3, rawText, true);
+ string note = matchSinglePrefixedField("MEMORY:", rawText, '\r', false);
+ string address = matchSinglePrefixedField("ADD:", rawText, '\r', true);
+ string[] addresses = address == null ? null : new string[] {address};
+ return new AddressBookParsedResult(maybeWrap(name), pronunciation, phoneNumbers, null, emails, null, null, note, addresses, null, null, null, null, null);
+ }
+
+ private static string[] matchMultipleValuePrefix(string prefix, int max, string rawText, bool trim)
+ {
+ List values = null;
+ for (int i = 1; i <= max; i++)
{
- System.Collections.ArrayList values = null;
- for (int i = 1; i <= max; i++)
- {
- System.String value_Renamed = matchSinglePrefixedField(prefix + i + ':', rawText, '\r', trim);
- if (value_Renamed == null)
- {
- break;
- }
- if (values == null)
- {
- values = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(max)); // lazy init
- }
- values.Add(value_Renamed);
- }
- if (values == null)
- {
- return null;
- }
- return toStringArray(values);
+ string value = matchSinglePrefixedField(prefix + i + ':', rawText, '\r', trim);
+ if (value == null)
+ {
+ break;
+ }
+ if (values == null)
+ {
+ values = new List(max); // lazy init
+ }
+ values.Add(value);
}
+ if (values == null)
+ {
+ return null;
+ }
+ return values.ToArray();
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/AddressBookDoCoMoResultParser.cs b/csharp/client/result/AddressBookDoCoMoResultParser.cs
index 68b5f2396..7efdfe0f1 100755
--- a/csharp/client/result/AddressBookDoCoMoResultParser.cs
+++ b/csharp/client/result/AddressBookDoCoMoResultParser.cs
@@ -1,24 +1,26 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Implements the "MECARD" address book entry format.
+
+ using Result = com.google.zxing.Result;
+
+ ///
+ /// Implements the "MECARD" address book entry format.
///
/// Supported keys: N, SOUND, TEL, EMAIL, NOTE, ADR, BDAY, URL, plus ORG
/// Unsupported keys: TEL-AV, NICKNAME
@@ -30,56 +32,55 @@ namespace com.google.zxing.client.result
///
/// http://www.mobicode.org.tw/files/OMIA%20Mobile%20Bar%20Code%20Standard%20v3.2.1.doc
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class AddressBookDoCoMoResultParser:AbstractDoCoMoResultParser
+ public sealed class AddressBookDoCoMoResultParser : AbstractDoCoMoResultParser
{
-
- public static AddressBookParsedResult parse(Result result)
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+ if (!rawText.StartsWith("MECARD:"))
{
- System.String rawText = result.Text;
- if (rawText == null || !rawText.StartsWith("MECARD:"))
- {
- return null;
- }
- System.String[] rawName = matchDoCoMoPrefixedField("N:", rawText, true);
- if (rawName == null)
- {
- return null;
- }
- System.String name = parseName(rawName[0]);
- System.String pronunciation = matchSingleDoCoMoPrefixedField("SOUND:", rawText, true);
- System.String[] phoneNumbers = matchDoCoMoPrefixedField("TEL:", rawText, true);
- System.String[] emails = matchDoCoMoPrefixedField("EMAIL:", rawText, true);
- System.String note = matchSingleDoCoMoPrefixedField("NOTE:", rawText, false);
- System.String[] addresses = matchDoCoMoPrefixedField("ADR:", rawText, true);
- System.String birthday = matchSingleDoCoMoPrefixedField("BDAY:", rawText, true);
- if (birthday != null && !isStringOfDigits(birthday, 8))
- {
- // No reason to throw out the whole card because the birthday is formatted wrong.
- birthday = null;
- }
- System.String url = matchSingleDoCoMoPrefixedField("URL:", rawText, true);
-
- // Although ORG may not be strictly legal in MECARD, it does exist in VCARD and we might as well
- // honor it when found in the wild.
- System.String org = matchSingleDoCoMoPrefixedField("ORG:", rawText, true);
-
- return new AddressBookParsedResult(maybeWrap(name), pronunciation, phoneNumbers, emails, note, addresses, org, birthday, null, url);
+ return null;
}
-
- private static System.String parseName(System.String name)
+ string[] rawName = matchDoCoMoPrefixedField("N:", rawText, true);
+ if (rawName == null)
{
- int comma = name.IndexOf(',');
- if (comma >= 0)
- {
- // Format may be last,first; switch it around
- return name.Substring(comma + 1) + ' ' + name.Substring(0, (comma) - (0));
- }
- return name;
+ return null;
}
+ string name = parseName(rawName[0]);
+ string pronunciation = matchSingleDoCoMoPrefixedField("SOUND:", rawText, true);
+ string[] phoneNumbers = matchDoCoMoPrefixedField("TEL:", rawText, true);
+ string[] emails = matchDoCoMoPrefixedField("EMAIL:", rawText, true);
+ string note = matchSingleDoCoMoPrefixedField("NOTE:", rawText, false);
+ string[] addresses = matchDoCoMoPrefixedField("ADR:", rawText, true);
+ string birthday = matchSingleDoCoMoPrefixedField("BDAY:", rawText, true);
+ if (birthday != null && !isStringOfDigits(birthday, 8))
+ {
+ // No reason to throw out the whole card because the birthday is formatted wrong.
+ birthday = null;
+ }
+ string url = matchSingleDoCoMoPrefixedField("URL:", rawText, true);
+
+ // Although ORG may not be strictly legal in MECARD, it does exist in VCARD and we might as well
+ // honor it when found in the wild.
+ string org = matchSingleDoCoMoPrefixedField("ORG:", rawText, true);
+
+ return new AddressBookParsedResult(maybeWrap(name), pronunciation, phoneNumbers, null, emails, null, null, note, addresses, null, org, birthday, null, url);
+ }
+
+ private static string parseName(string name)
+ {
+ int comma =(int) name.IndexOf(',');
+ if (comma >= 0)
+ {
+ // Format may be last,first; switch it around
+ return name.Substring(comma + 1) + ' ' + name.Substring(0, comma);
+ }
+ return name;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/AddressBookParsedResult.cs b/csharp/client/result/AddressBookParsedResult.cs
index d26232788..57b6534b0 100755
--- a/csharp/client/result/AddressBookParsedResult.cs
+++ b/csharp/client/result/AddressBookParsedResult.cs
@@ -1,169 +1,207 @@
+using System.Text;
+
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class AddressBookParsedResult:ParsedResult
+
+ ///
+ /// @author Sean Owen
+ ///
+ public sealed class AddressBookParsedResult : ParsedResult
{
- public System.String[] Names
- {
- get
- {
- return names;
- }
-
- }
- /// In Japanese, the name is written in kanji, which can have multiple readings. Therefore a hint
- /// is often provided, called furigana, which spells the name phonetically.
- ///
- ///
- /// The pronunciation of the getNames() field, often in hiragana or katakana.
- ///
- public System.String Pronunciation
- {
- get
- {
- return pronunciation;
- }
-
- }
- public System.String[] PhoneNumbers
- {
- get
- {
- return phoneNumbers;
- }
-
- }
- public System.String[] Emails
- {
- get
- {
- return emails;
- }
-
- }
- public System.String Note
- {
- get
- {
- return note;
- }
-
- }
- public System.String[] Addresses
- {
- get
- {
- return addresses;
- }
-
- }
- public System.String Title
- {
- get
- {
- return title;
- }
-
- }
- public System.String Org
- {
- get
- {
- return org;
- }
-
- }
- public System.String URL
- {
- get
- {
- return url;
- }
-
- }
- /// birthday formatted as yyyyMMdd (e.g. 19780917)
- ///
- public System.String Birthday
- {
- get
- {
- return birthday;
- }
-
- }
- override public System.String DisplayResult
- {
- get
- {
- System.Text.StringBuilder result = new System.Text.StringBuilder(100);
- maybeAppend(names, result);
- maybeAppend(pronunciation, result);
- maybeAppend(title, result);
- maybeAppend(org, result);
- maybeAppend(addresses, result);
- maybeAppend(phoneNumbers, result);
- maybeAppend(emails, result);
- maybeAppend(url, result);
- maybeAppend(birthday, result);
- maybeAppend(note, result);
- return result.ToString();
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'names '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String[] names;
- //UPGRADE_NOTE: Final was removed from the declaration of 'pronunciation '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String pronunciation;
- //UPGRADE_NOTE: Final was removed from the declaration of 'phoneNumbers '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String[] phoneNumbers;
- //UPGRADE_NOTE: Final was removed from the declaration of 'emails '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String[] emails;
- //UPGRADE_NOTE: Final was removed from the declaration of 'note '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String note;
- //UPGRADE_NOTE: Final was removed from the declaration of 'addresses '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String[] addresses;
- //UPGRADE_NOTE: Final was removed from the declaration of 'org '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String org;
- //UPGRADE_NOTE: Final was removed from the declaration of 'birthday '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String birthday;
- //UPGRADE_NOTE: Final was removed from the declaration of 'title '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String title;
- //UPGRADE_NOTE: Final was removed from the declaration of 'url '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String url;
-
- public AddressBookParsedResult(System.String[] names, System.String pronunciation, System.String[] phoneNumbers, System.String[] emails, System.String note, System.String[] addresses, System.String org, System.String birthday, System.String title, System.String url):base(ParsedResultType.ADDRESSBOOK)
- {
- this.names = names;
- this.pronunciation = pronunciation;
- this.phoneNumbers = phoneNumbers;
- this.emails = emails;
- this.note = note;
- this.addresses = addresses;
- this.org = org;
- this.birthday = birthday;
- this.title = title;
- this.url = url;
- }
+
+ private readonly string[] names;
+ private readonly string pronunciation;
+ private readonly string[] phoneNumbers;
+ private readonly string[] phoneTypes;
+ private readonly string[] emails;
+ private readonly string[] emailTypes;
+ private readonly string instantMessenger;
+ private readonly string note;
+ private readonly string[] addresses;
+ private readonly string[] addressTypes;
+ private readonly string org;
+ private readonly string birthday;
+ private readonly string title;
+ private readonly string url;
+
+ public AddressBookParsedResult(string[] names, string pronunciation, string[] phoneNumbers, string[] phoneTypes, string[] emails, string[] emailTypes, string instantMessenger, string note, string[] addresses, string[] addressTypes, string org, string birthday, string title, string url) : base(ParsedResultType.ADDRESSBOOK)
+ {
+ this.names = names;
+ this.pronunciation = pronunciation;
+ this.phoneNumbers = phoneNumbers;
+ this.phoneTypes = phoneTypes;
+ this.emails = emails;
+ this.emailTypes = emailTypes;
+ this.instantMessenger = instantMessenger;
+ this.note = note;
+ this.addresses = addresses;
+ this.addressTypes = addressTypes;
+ this.org = org;
+ this.birthday = birthday;
+ this.title = title;
+ this.url = url;
+ }
+
+ public string[] Names
+ {
+ get
+ {
+ return names;
+ }
+ }
+
+ ///
+ /// In Japanese, the name is written in kanji, which can have multiple readings. Therefore a hint
+ /// is often provided, called furigana, which spells the name phonetically.
+ ///
+ /// The pronunciation of the getNames() field, often in hiragana or katakana.
+ public string Pronunciation
+ {
+ get
+ {
+ return pronunciation;
+ }
+ }
+
+ public string[] PhoneNumbers
+ {
+ get
+ {
+ return phoneNumbers;
+ }
+ }
+
+ /// optional descriptions of the type of each phone number. It could be like "HOME", but,
+ /// there is no guaranteed or standard format.
+ public string[] PhoneTypes
+ {
+ get
+ {
+ return phoneTypes;
+ }
+ }
+
+ public string[] Emails
+ {
+ get
+ {
+ return emails;
+ }
+ }
+
+ /// optional descriptions of the type of each e-mail. It could be like "WORK", but,
+ /// there is no guaranteed or standard format.
+ public string[] EmailTypes
+ {
+ get
+ {
+ return emailTypes;
+ }
+ }
+
+ public string InstantMessenger
+ {
+ get
+ {
+ return instantMessenger;
+ }
+ }
+
+ public string Note
+ {
+ get
+ {
+ return note;
+ }
+ }
+
+ public string[] Addresses
+ {
+ get
+ {
+ return addresses;
+ }
+ }
+
+ /// optional descriptions of the type of each e-mail. It could be like "WORK", but,
+ /// there is no guaranteed or standard format.
+ public string[] AddressTypes
+ {
+ get
+ {
+ return addressTypes;
+ }
+ }
+
+ public string Title
+ {
+ get
+ {
+ return title;
+ }
+ }
+
+ public string Org
+ {
+ get
+ {
+ return org;
+ }
+ }
+
+ public string URL
+ {
+ get
+ {
+ return url;
+ }
+ }
+
+ /// birthday formatted as yyyyMMdd (e.g. 19780917)
+ public string Birthday
+ {
+ get
+ {
+ return birthday;
+ }
+ }
+
+ public override string DisplayResult
+ {
+ get
+ {
+ StringBuilder result = new StringBuilder(100);
+ maybeAppend(names, result);
+ maybeAppend(pronunciation, result);
+ maybeAppend(title, result);
+ maybeAppend(org, result);
+ maybeAppend(addresses, result);
+ maybeAppend(phoneNumbers, result);
+ maybeAppend(emails, result);
+ maybeAppend(instantMessenger, result);
+ maybeAppend(url, result);
+ maybeAppend(birthday, result);
+ maybeAppend(note, result);
+ return result.ToString();
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/BizcardResultParser.cs b/csharp/client/result/BizcardResultParser.cs
index 2e4f48bf0..949903bb2 100755
--- a/csharp/client/result/BizcardResultParser.cs
+++ b/csharp/client/result/BizcardResultParser.cs
@@ -1,98 +1,97 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Implements the "BIZCARD" address book entry format, though this has been
+
+ using Result = com.google.zxing.Result;
+
+
+ ///
+ /// Implements the "BIZCARD" address book entry format, though this has been
/// largely reverse-engineered from examples observed in the wild -- still
/// looking for a definitive reference.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class BizcardResultParser:AbstractDoCoMoResultParser
+ public sealed class BizcardResultParser : AbstractDoCoMoResultParser
{
-
- // Yes, we extend AbstractDoCoMoResultParser since the format is very much
- // like the DoCoMo MECARD format, but this is not technically one of
- // DoCoMo's proposed formats
-
- public static AddressBookParsedResult parse(Result result)
+
+ // Yes, we extend AbstractDoCoMoResultParser since the format is very much
+ // like the DoCoMo MECARD format, but this is not technically one of
+ // DoCoMo's proposed formats
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+ if (!rawText.StartsWith("BIZCARD:"))
{
- System.String rawText = result.Text;
- if (rawText == null || !rawText.StartsWith("BIZCARD:"))
- {
- return null;
- }
- System.String firstName = matchSingleDoCoMoPrefixedField("N:", rawText, true);
- System.String lastName = matchSingleDoCoMoPrefixedField("X:", rawText, true);
- System.String fullName = buildName(firstName, lastName);
- System.String title = matchSingleDoCoMoPrefixedField("T:", rawText, true);
- System.String org = matchSingleDoCoMoPrefixedField("C:", rawText, true);
- System.String[] addresses = matchDoCoMoPrefixedField("A:", rawText, true);
- System.String phoneNumber1 = matchSingleDoCoMoPrefixedField("B:", rawText, true);
- System.String phoneNumber2 = matchSingleDoCoMoPrefixedField("M:", rawText, true);
- System.String phoneNumber3 = matchSingleDoCoMoPrefixedField("F:", rawText, true);
- System.String email = matchSingleDoCoMoPrefixedField("E:", rawText, true);
-
- return new AddressBookParsedResult(maybeWrap(fullName), null, buildPhoneNumbers(phoneNumber1, phoneNumber2, phoneNumber3), maybeWrap(email), null, addresses, org, null, title, null);
+ return null;
}
-
- private static System.String[] buildPhoneNumbers(System.String number1, System.String number2, System.String number3)
+ string firstName = matchSingleDoCoMoPrefixedField("N:", rawText, true);
+ string lastName = matchSingleDoCoMoPrefixedField("X:", rawText, true);
+ string fullName = buildName(firstName, lastName);
+ string title = matchSingleDoCoMoPrefixedField("T:", rawText, true);
+ string org = matchSingleDoCoMoPrefixedField("C:", rawText, true);
+ string[] addresses = matchDoCoMoPrefixedField("A:", rawText, true);
+ string phoneNumber1 = matchSingleDoCoMoPrefixedField("B:", rawText, true);
+ string phoneNumber2 = matchSingleDoCoMoPrefixedField("M:", rawText, true);
+ string phoneNumber3 = matchSingleDoCoMoPrefixedField("F:", rawText, true);
+ string email = matchSingleDoCoMoPrefixedField("E:", rawText, true);
+
+ return new AddressBookParsedResult(maybeWrap(fullName), null, buildPhoneNumbers(phoneNumber1, phoneNumber2, phoneNumber3), null, maybeWrap(email), null, null, null, addresses, null, org, null, title, null);
+ }
+
+ private static string[] buildPhoneNumbers(string number1, string number2, string number3)
+ {
+ List numbers = new List(3);
+ if (number1 != null)
{
- System.Collections.ArrayList numbers = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(3));
- if (number1 != null)
- {
- numbers.Add(number1);
- }
- if (number2 != null)
- {
- numbers.Add(number2);
- }
- if (number3 != null)
- {
- numbers.Add(number3);
- }
- int size = numbers.Count;
- if (size == 0)
- {
- return null;
- }
- System.String[] result = new System.String[size];
- for (int i = 0; i < size; i++)
- {
- result[i] = ((System.String) numbers[i]);
- }
- return result;
+ numbers.Add(number1);
}
-
- private static System.String buildName(System.String firstName, System.String lastName)
+ if (number2 != null)
{
- if (firstName == null)
- {
- return lastName;
- }
- else
- {
- return lastName == null?firstName:firstName + ' ' + lastName;
- }
+ numbers.Add(number2);
}
+ if (number3 != null)
+ {
+ numbers.Add(number3);
+ }
+ int size = numbers.Count;
+ if (size == 0)
+ {
+ return null;
+ }
+ return numbers.ToArray();
+ }
+
+ private static string buildName(string firstName, string lastName)
+ {
+ if (firstName == null)
+ {
+ return lastName;
+ }
+ else
+ {
+ return lastName == null ? firstName : firstName + ' ' + lastName;
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/BookmarkDoCoMoResultParser.cs b/csharp/client/result/BookmarkDoCoMoResultParser.cs
index da70093d5..69a40193f 100755
--- a/csharp/client/result/BookmarkDoCoMoResultParser.cs
+++ b/csharp/client/result/BookmarkDoCoMoResultParser.cs
@@ -1,53 +1,46 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class BookmarkDoCoMoResultParser:AbstractDoCoMoResultParser
+
+ using Result = com.google.zxing.Result;
+
+ ///
+ /// @author Sean Owen
+ ///
+ public sealed class BookmarkDoCoMoResultParser : AbstractDoCoMoResultParser
{
-
- private BookmarkDoCoMoResultParser()
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = result.Text;
+ if (!rawText.StartsWith("MEBKM:"))
{
+ return null;
}
-
- public static URIParsedResult parse(Result result)
+ string title = matchSingleDoCoMoPrefixedField("TITLE:", rawText, true);
+ string[] rawUri = matchDoCoMoPrefixedField("URL:", rawText, true);
+ if (rawUri == null)
{
- System.String rawText = result.Text;
- if (rawText == null || !rawText.StartsWith("MEBKM:"))
- {
- return null;
- }
- System.String title = matchSingleDoCoMoPrefixedField("TITLE:", rawText, true);
- System.String[] rawUri = matchDoCoMoPrefixedField("URL:", rawText, true);
- if (rawUri == null)
- {
- return null;
- }
- System.String uri = rawUri[0];
- if (!URIResultParser.isBasicallyValidURI(uri))
- {
- return null;
- }
- return new URIParsedResult(uri, title);
+ return null;
}
+ string uri = rawUri[0];
+ return URIResultParser.isBasicallyValidURI(uri) ? new URIParsedResult(uri, title) : null;
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/CalendarParsedResult.cs b/csharp/client/result/CalendarParsedResult.cs
index e0786cde6..c1d9c3d45 100755
--- a/csharp/client/result/CalendarParsedResult.cs
+++ b/csharp/client/result/CalendarParsedResult.cs
@@ -1,172 +1,300 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
+using System.Text;
+using System.Text.RegularExpressions;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class CalendarParsedResult:ParsedResult
+
+
+ ///
+ /// @author Sean Owen
+ ///
+ public sealed class CalendarParsedResult : ParsedResult
{
- public System.String Summary
+
+ private static readonly string RFC2445_DURATION = "P(?:(\\d+)W)?(?:(\\d+)D)?(?:T(?:(\\d+)H)?(?:(\\d+)M)?(?:(\\d+)S)?)?";
+ private static readonly long[] RFC2445_DURATION_FIELD_UNITS = {7 * 24 * 60 * 60 * 1000L, 24 * 60 * 60 * 1000L, 60 * 60 * 1000L, 60 * 1000L, 1000L};
+
+ private static readonly string DATE_TIME = "[0-9]{8}(T[0-9]{6}Z?)?";
+
+ private static readonly string DATE_FORMAT = "yyyyMMdd";
+ static CalendarParsedResult()
+ {
+ // For dates without a time, for purposes of interacting with Android, the resulting timestamp
+ // needs to be midnight of that day in GMT. See:
+ // http://code.google.com/p/android/issues/detail?id=8330
+ string DATE_FORMAT_TimeZone = "GMT";
+ }
+ private static readonly string DATE_TIME_FORMAT = "yyyyMMdd'T'HHmmss";
+
+ private readonly string summary;
+ private readonly DateTime start;
+ private readonly bool startAllDay;
+ private readonly DateTime? end;
+ private readonly bool endAllDay;
+ private readonly string location;
+ private readonly string organizer;
+ private readonly string[] attendees;
+ private readonly string description;
+ private readonly double latitude;
+ private readonly double longitude;
+
+ public CalendarParsedResult(string summary, string startString, string endString, string durationString, string location, string organizer, string[] attendees, string description, double latitude, double longitude) : base(ParsedResultType.CALENDAR)
+ {
+ this.summary = summary;
+
+ try
{
- get
- {
- return summary;
- }
-
+ this.start = parseDate(startString);
}
- /// We would return the start and end date as a {@link java.util.Date} except that this code
- /// needs to work under JavaME / MIDP and there is no date parsing library available there, such
- /// as java.text.SimpleDateFormat.
See validateDate() for the return format.
- ///
- ///
- /// start time formatted as a RFC 2445 DATE or DATE-TIME.
- ///
- public System.String Start
+ catch (FormatException pe)
{
- get
- {
- return start;
- }
-
+ throw new System.ArgumentException(pe.ToString());
}
- ///
- ///
- public System.String End
+
+ if (endString == null)
{
- get
- {
- return end;
- }
-
+ long durationMS = parseDurationMS(durationString);
+ end = durationMS < 0L ? null :(DateTime?) start.AddMilliseconds( durationMS);
}
- public System.String Location
+ else
{
- get
- {
- return location;
- }
-
+ try
+ {
+ this.end = parseDate(endString);
+ }
+ catch (FormatException pe)
+ {
+ throw new System.ArgumentException(pe.ToString());
+ }
}
- public System.String Attendee
+
+ this.startAllDay = startString.Length == 8;
+ this.endAllDay = endString != null && endString.Length == 8;
+
+ this.location = location;
+ this.organizer = organizer;
+ this.attendees = attendees;
+ this.description = description;
+ this.latitude = latitude;
+ this.longitude = longitude;
+ }
+
+ public string Summary
+ {
+ get
+ {
+ return summary;
+ }
+ }
+
+ /// start time
+ public DateTime Start
+ {
+ get
+ {
+ return start;
+ }
+ }
+
+ /// true if start time was specified as a whole day
+ public bool StartAllDay
+ {
+ get
+ {
+ return startAllDay;
+ }
+ }
+
+ ///
+ /// May return null if the event has no duration.
+ ///
+ public DateTime? End
+ {
+ get
+ {
+ return end;
+ }
+ }
+
+ /// true if end time was specified as a whole day
+ public bool EndAllDay
+ {
+ get
+ {
+ return endAllDay;
+ }
+ }
+
+ public string Location
+ {
+ get
+ {
+ return location;
+ }
+ }
+
+ public string Organizer
+ {
+ get
+ {
+ return organizer;
+ }
+ }
+
+ public string[] Attendees
+ {
+ get
+ {
+ return attendees;
+ }
+ }
+
+ public string Description
+ {
+ get
+ {
+ return description;
+ }
+ }
+
+ public double Latitude
+ {
+ get
+ {
+ return latitude;
+ }
+ }
+
+ public double Longitude
+ {
+ get
+ {
+ return longitude;
+ }
+ }
+
+ public override string DisplayResult
+ {
+ get
+ {
+ StringBuilder result = new StringBuilder(100);
+ maybeAppend(summary, result);
+ maybeAppend(format(startAllDay, start), result);
+ maybeAppend(format(endAllDay, end), result);
+ maybeAppend(location, result);
+ maybeAppend(organizer, result);
+ maybeAppend(attendees, result);
+ maybeAppend(description, result);
+ return result.ToString();
+ }
+ }
+
+ ///
+ /// Parses a string as a date. RFC 2445 allows the start and end fields to be of type DATE (e.g. 20081021)
+ /// or DATE-TIME (e.g. 20081021T123000 for local time, or 20081021T123000Z for UTC).
+ ///
+ /// The string to parse
+ /// if not able to parse as a date
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static java.util.Date parseDate(String when) throws java.text.ParseException
+ private static DateTime parseDate(string when)
+ {
+ if (!(new Regex (DATE_TIME).IsMatch(when)))
{
- get
- {
- return attendee;
- }
-
+ throw FormatException.FormatInstance;
}
- public System.String Title
+ if (when.Length == 8)
{
- get
- {
- return title;
- }
-
+ // Show only year/month/day
+ return DateTime.Parse(when);
}
- override public System.String DisplayResult
+ else
{
- get
- {
- System.Text.StringBuilder result = new System.Text.StringBuilder(100);
- maybeAppend(summary, result);
- maybeAppend(start, result);
- maybeAppend(end, result);
- maybeAppend(location, result);
- maybeAppend(attendee, result);
- maybeAppend(title, result);
- return result.ToString();
- }
-
+ // The when string can be local time, or UTC if it ends with a Z
+ DateTime date;
+ if (when.Length == 16 && when[15] == 'Z')
+ {
+ date = DateTime.Parse(when.Substring(0, 15));
+ //DateTime calendar = new GregorianCalendar();
+ // System.Globalization.GregorianCalendar calendar = new System.Globalization.GregorianCalendar()
+ //long milliseconds = date;
+ //// Account for time zone difference
+ //milliseconds += calendar.get(DateTime.ZONE_OFFSET);
+ //// Might need to correct for daylight savings time, but use target time since
+ //// now might be in DST but not then, or vice versa
+ //calendar = new DateTime(milliseconds);
+ //milliseconds += calendar.get(DateTime.DST_OFFSET);
+ TimeSpan offset = TimeZone.CurrentTimeZone.GetUtcOffset(date);
+
+ date = date + offset;
+ }
+ else
+ {
+ date = DateTime.Parse(when);
+ }
+ return date;
}
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'summary '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String summary;
- //UPGRADE_NOTE: Final was removed from the declaration of 'start '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String start;
- //UPGRADE_NOTE: Final was removed from the declaration of 'end '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String end;
- //UPGRADE_NOTE: Final was removed from the declaration of 'location '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String location;
- //UPGRADE_NOTE: Final was removed from the declaration of 'attendee '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String attendee;
- //UPGRADE_NOTE: Final was removed from the declaration of 'title '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String title;
-
- public CalendarParsedResult(System.String summary, System.String start, System.String end, System.String location, System.String attendee, System.String title):base(ParsedResultType.CALENDAR)
+ }
+
+ private static string format(bool allDay, DateTime? date)
+ {
+ if (date == null)
+ {
+ return null;
+ }
+ //DateFormat format = allDay ? DateFormat.getDateInstance(DateFormat.MEDIUM) : DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
+ //return format.format(date);
+ if (allDay)
+ {
+ return String.Format("dd-MMM-yyyy",date);
+ }
+ else
+ {
+ return String.Format("dd-MMM-yyyy hh:mm:ss tt",date);
+ }
+ }
+
+ private static long parseDurationMS(string durationString)
+ {
+ if (durationString == null)
{
- // Start is required, end is not
- if (start == null)
- {
- throw new System.ArgumentException();
- }
- validateDate(start);
- validateDate(end);
- this.summary = summary;
- this.start = start;
- this.end = end;
- this.location = location;
- this.attendee = attendee;
- this.title = title;
+ return -1L;
}
-
- /// RFC 2445 allows the start and end fields to be of type DATE (e.g. 20081021) or DATE-TIME
- /// (e.g. 20081021T123000 for local time, or 20081021T123000Z for UTC).
- ///
- ///
- /// The string to validate
- ///
- private static void validateDate(System.String date)
+ Regex m = new Regex(RFC2445_DURATION);
+ Match match = m.Match(durationString);
+ if (!match.Success)
{
- if (date != null)
- {
- int length = date.Length;
- if (length != 8 && length != 15 && length != 16)
- {
- throw new System.ArgumentException();
- }
- for (int i = 0; i < 8; i++)
- {
- if (!System.Char.IsDigit(date[i]))
- {
- throw new System.ArgumentException();
- }
- }
- if (length > 8)
- {
- if (date[8] != 'T')
- {
- throw new System.ArgumentException();
- }
- for (int i = 9; i < 15; i++)
- {
- if (!System.Char.IsDigit(date[i]))
- {
- throw new System.ArgumentException();
- }
- }
- if (length == 16 && date[15] != 'Z')
- {
- throw new System.ArgumentException();
- }
- }
- }
+ return -1L;
}
+ long durationMS = 0L;
+ for (int i = 0; i < RFC2445_DURATION_FIELD_UNITS.Length; i++)
+ {
+ string fieldValue = match.Groups[i + 1].Value;
+ if (fieldValue != null)
+ {
+ durationMS += RFC2445_DURATION_FIELD_UNITS[i] * Convert.ToInt32(fieldValue);
+ }
+ }
+ return durationMS;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/EmailAddressParsedResult.cs b/csharp/client/result/EmailAddressParsedResult.cs
index 3322012bc..9facf6e26 100755
--- a/csharp/client/result/EmailAddressParsedResult.cs
+++ b/csharp/client/result/EmailAddressParsedResult.cs
@@ -1,88 +1,86 @@
+using System.Text;
+
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class EmailAddressParsedResult:ParsedResult
+
+ ///
+ /// @author Sean Owen
+ ///
+ public sealed class EmailAddressParsedResult : ParsedResult
{
- public System.String EmailAddress
- {
- get
- {
- return emailAddress;
- }
-
- }
- public System.String Subject
- {
- get
- {
- return subject;
- }
-
- }
- public System.String Body
- {
- get
- {
- return body;
- }
-
- }
- public System.String MailtoURI
- {
- get
- {
- return mailtoURI;
- }
-
- }
- override public System.String DisplayResult
- {
- get
- {
- System.Text.StringBuilder result = new System.Text.StringBuilder(30);
- maybeAppend(emailAddress, result);
- maybeAppend(subject, result);
- maybeAppend(body, result);
- return result.ToString();
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'emailAddress '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String emailAddress;
- //UPGRADE_NOTE: Final was removed from the declaration of 'subject '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String subject;
- //UPGRADE_NOTE: Final was removed from the declaration of 'body '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String body;
- //UPGRADE_NOTE: Final was removed from the declaration of 'mailtoURI '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String mailtoURI;
-
- internal EmailAddressParsedResult(System.String emailAddress, System.String subject, System.String body, System.String mailtoURI):base(ParsedResultType.EMAIL_ADDRESS)
- {
- this.emailAddress = emailAddress;
- this.subject = subject;
- this.body = body;
- this.mailtoURI = mailtoURI;
- }
+
+ private readonly string emailAddress;
+ private readonly string subject;
+ private readonly string body;
+ private readonly string mailtoURI;
+
+ internal EmailAddressParsedResult(string emailAddress, string subject, string body, string mailtoURI) : base(ParsedResultType.EMAIL_ADDRESS)
+ {
+ this.emailAddress = emailAddress;
+ this.subject = subject;
+ this.body = body;
+ this.mailtoURI = mailtoURI;
+ }
+
+ public string EmailAddress
+ {
+ get
+ {
+ return emailAddress;
+ }
+ }
+
+ public string Subject
+ {
+ get
+ {
+ return subject;
+ }
+ }
+
+ public string Body
+ {
+ get
+ {
+ return body;
+ }
+ }
+
+ public string MailtoURI
+ {
+ get
+ {
+ return mailtoURI;
+ }
+ }
+
+ public override string DisplayResult
+ {
+ get
+ {
+ StringBuilder result = new StringBuilder(30);
+ maybeAppend(emailAddress, result);
+ maybeAppend(subject, result);
+ maybeAppend(body, result);
+ return result.ToString();
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/EmailAddressResultParser.cs b/csharp/client/result/EmailAddressResultParser.cs
index dff45462d..897e8d918 100755
--- a/csharp/client/result/EmailAddressResultParser.cs
+++ b/csharp/client/result/EmailAddressResultParser.cs
@@ -1,74 +1,73 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Represents a result that encodes an e-mail address, either as a plain address
+
+ using Result = com.google.zxing.Result;
+
+
+ ///
+ /// Represents a result that encodes an e-mail address, either as a plain address
/// like "joe@example.org" or a mailto: URL like "mailto:joe@example.org".
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class EmailAddressResultParser:ResultParser
+ public sealed class EmailAddressResultParser : ResultParser
{
-
- public static EmailAddressParsedResult parse(Result result)
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+ string emailAddress;
+ if (rawText.StartsWith("mailto:") || rawText.StartsWith("MAILTO:"))
{
- System.String rawText = result.Text;
- if (rawText == null)
+ // If it starts with mailto:, assume it is definitely trying to be an email address
+ emailAddress = rawText.Substring(7);
+ int queryStart = emailAddress.IndexOf('?');
+ if (queryStart >= 0)
+ {
+ emailAddress = emailAddress.Substring(0, queryStart);
+ }
+ IDictionary nameValues = parseNameValuePairs(rawText);
+ string subject = null;
+ string body = null;
+ if (nameValues != null)
+ {
+ if (emailAddress.Length == 0)
{
- return null;
- }
- System.String emailAddress;
- if (rawText.StartsWith("mailto:") || rawText.StartsWith("MAILTO:"))
- {
- // If it starts with mailto:, assume it is definitely trying to be an email address
- emailAddress = rawText.Substring(7);
- int queryStart = emailAddress.IndexOf('?');
- if (queryStart >= 0)
- {
- emailAddress = emailAddress.Substring(0, (queryStart) - (0));
- }
- System.Collections.Hashtable nameValues = parseNameValuePairs(rawText);
- System.String subject = null;
- System.String body = null;
- if (nameValues != null)
- {
- if (emailAddress.Length == 0)
- {
- emailAddress = ((System.String) nameValues["to"]);
- }
- subject = ((System.String) nameValues["subject"]);
- body = ((System.String) nameValues["body"]);
- }
- return new EmailAddressParsedResult(emailAddress, subject, body, rawText);
- }
- else
- {
- if (!EmailDoCoMoResultParser.isBasicallyValidEmailAddress(rawText))
- {
- return null;
- }
- emailAddress = rawText;
- return new EmailAddressParsedResult(emailAddress, null, null, "mailto:" + emailAddress);
+ emailAddress = nameValues["to"];
}
+ subject = nameValues["subject"];
+ body = nameValues["body"];
+ }
+ return new EmailAddressParsedResult(emailAddress, subject, body, rawText);
}
+ else
+ {
+ if (!EmailDoCoMoResultParser.isBasicallyValidEmailAddress(rawText))
+ {
+ return null;
+ }
+ emailAddress = rawText;
+ return new EmailAddressParsedResult(emailAddress, null, null, "mailto:" + emailAddress);
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/EmailDoCoMoResultParser.cs b/csharp/client/result/EmailDoCoMoResultParser.cs
index adb065f11..26da44691 100755
--- a/csharp/client/result/EmailDoCoMoResultParser.cs
+++ b/csharp/client/result/EmailDoCoMoResultParser.cs
@@ -1,101 +1,71 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Implements the "MATMSG" email message entry format.
+
+ using Result = com.google.zxing.Result;
+ using System.Text.RegularExpressions;
+
+
+ ///
+ /// Implements the "MATMSG" email message entry format.
///
/// Supported keys: TO, SUB, BODY
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class EmailDoCoMoResultParser:AbstractDoCoMoResultParser
+ public sealed class EmailDoCoMoResultParser : AbstractDoCoMoResultParser
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'ATEXT_SYMBOLS'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly char[] ATEXT_SYMBOLS = new char[]{'@', '.', '!', '#', '$', '%', '&', '\'', '*', '+', '-', '/', '=', '?', '^', '_', '`', '{', '|', '}', '~'};
-
- public static EmailAddressParsedResult parse(Result result)
+
+ private static readonly string ATEXT_ALPHANUMERIC = "[a-zA-Z0-9@.!#$%&'*+\\-/=?^_`{|}~]+";
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+ if (!rawText.StartsWith("MATMSG:"))
{
- System.String rawText = result.Text;
- if (rawText == null || !rawText.StartsWith("MATMSG:"))
- {
- return null;
- }
- System.String[] rawTo = matchDoCoMoPrefixedField("TO:", rawText, true);
- if (rawTo == null)
- {
- return null;
- }
- System.String to = rawTo[0];
- if (!isBasicallyValidEmailAddress(to))
- {
- return null;
- }
- System.String subject = matchSingleDoCoMoPrefixedField("SUB:", rawText, false);
- System.String body = matchSingleDoCoMoPrefixedField("BODY:", rawText, false);
- return new EmailAddressParsedResult(to, subject, body, "mailto:" + to);
+ return null;
}
-
- /// This implements only the most basic checking for an email address's validity -- that it contains
- /// an '@' contains no characters disallowed by RFC 2822. This is an overly lenient definition of
- /// validity. We want to generally be lenient here since this class is only intended to encapsulate what's
- /// in a barcode, not "judge" it.
- ///
- internal static bool isBasicallyValidEmailAddress(System.String email)
+ string[] rawTo = matchDoCoMoPrefixedField("TO:", rawText, true);
+ if (rawTo == null)
{
- if (email == null)
- {
- return false;
- }
- bool atFound = false;
- for (int i = 0; i < email.Length; i++)
- {
- char c = email[i];
- if ((c < 'a' || c > 'z') && (c < 'A' || c > 'Z') && (c < '0' || c > '9') && !isAtextSymbol(c))
- {
- return false;
- }
- if (c == '@')
- {
- if (atFound)
- {
- return false;
- }
- atFound = true;
- }
- }
- return atFound;
+ return null;
}
-
- private static bool isAtextSymbol(char c)
+ string to = rawTo[0];
+ if (!isBasicallyValidEmailAddress(to))
{
- for (int i = 0; i < ATEXT_SYMBOLS.Length; i++)
- {
- if (c == ATEXT_SYMBOLS[i])
- {
- return true;
- }
- }
- return false;
+ return null;
}
+ string subject = matchSingleDoCoMoPrefixedField("SUB:", rawText, false);
+ string body = matchSingleDoCoMoPrefixedField("BODY:", rawText, false);
+ return new EmailAddressParsedResult(to, subject, body, "mailto:" + to);
+ }
+
+ ///
+ /// This implements only the most basic checking for an email address's validity -- that it contains
+ /// an '@' and contains no characters disallowed by RFC 2822. This is an overly lenient definition of
+ /// validity. We want to generally be lenient here since this class is only intended to encapsulate what's
+ /// in a barcode, not "judge" it.
+ ///
+ internal static bool isBasicallyValidEmailAddress(string email)
+ {
+ //return email != null && ATEXT_ALPHANUMERIC.matcher(email).matches() && email.IndexOf('@') >= 0;
+ return email != null && new Regex( ATEXT_ALPHANUMERIC).IsMatch(email) && email.IndexOf('@') >= 0;
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/GeoParsedResult.cs b/csharp/client/result/GeoParsedResult.cs
index da4f217db..11e01a067 100755
--- a/csharp/client/result/GeoParsedResult.cs
+++ b/csharp/client/result/GeoParsedResult.cs
@@ -1,131 +1,125 @@
+using System.Text;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class GeoParsedResult:ParsedResult
+
+ ///
+ /// @author Sean Owen
+ ///
+ public sealed class GeoParsedResult : ParsedResult
{
- public System.String GeoURI
- {
- get
+
+ private readonly double latitude;
+ private readonly double longitude;
+ private readonly double altitude;
+ private readonly string query;
+
+ internal GeoParsedResult(double latitude, double longitude, double altitude, string query) : base(ParsedResultType.GEO)
+ {
+ this.latitude = latitude;
+ this.longitude = longitude;
+ this.altitude = altitude;
+ this.query = query;
+ }
+
+ public string GeoURI
+ {
+ get
+ {
+ StringBuilder result = new StringBuilder();
+ result.Append("geo:");
+ result.Append(latitude);
+ result.Append(',');
+ result.Append(longitude);
+ if (altitude > 0)
{
- return geoURI;
+ result.Append(',');
+ result.Append(altitude);
}
-
- }
- /// latitude in degrees
- ///
- public double Latitude
- {
- get
+ if (query != null)
{
- return latitude;
+ result.Append('?');
+ result.Append(query);
}
-
- }
- /// longitude in degrees
- ///
- public double Longitude
- {
- get
+ return result.ToString();
+ }
+ }
+
+ /// latitude in degrees
+ public double Latitude
+ {
+ get
+ {
+ return latitude;
+ }
+ }
+
+ /// longitude in degrees
+ public double Longitude
+ {
+ get
+ {
+ return longitude;
+ }
+ }
+
+ /// altitude in meters. If not specified, in the geo URI, returns 0.0
+ public double Altitude
+ {
+ get
+ {
+ return altitude;
+ }
+ }
+
+ /// query string associated with geo URI or null if none exists
+ public string Query
+ {
+ get
+ {
+ return query;
+ }
+ }
+
+ public override string DisplayResult
+ {
+ get
+ {
+ StringBuilder result = new StringBuilder(20);
+ result.Append(latitude);
+ result.Append(", ");
+ result.Append(longitude);
+ if (altitude > 0.0)
{
- return longitude;
+ result.Append(", ");
+ result.Append(altitude);
+ result.Append('m');
}
-
- }
- /// altitude in meters. If not specified, in the geo URI, returns 0.0
- ///
- public double Altitude
- {
- get
+ if (query != null)
{
- return altitude;
+ result.Append(" (");
+ result.Append(query);
+ result.Append(')');
}
-
- }
- override public System.String DisplayResult
- {
- get
- {
- System.Text.StringBuilder result = new System.Text.StringBuilder(50);
- result.Append(latitude);
- result.Append(", ");
- result.Append(longitude);
- if (altitude > 0.0f)
- {
- result.Append(", ");
- result.Append(altitude);
- result.Append('m');
- }
- return result.ToString();
- }
-
- /// a URI link to Google Maps which display the point on the Earth described
- /// by this instance, and sets the zoom level in a way that roughly reflects the
- /// altitude, if specified
- ///
- /*
- public String getGoogleMapsURI() {
- StringBuffer result = new StringBuffer(50);
- result.append("http://maps.google.com/?ll=");
- result.append(latitude);
- result.append(',');
- result.append(longitude);
- if (altitude > 0.0f) {
- // Map altitude to zoom level, cleverly. Roughly, zoom level 19 is like a
- // view from 1000ft, 18 is like 2000ft, 17 like 4000ft, and so on.
- double altitudeInFeet = altitude * 3.28;
- int altitudeInKFeet = (int) (altitudeInFeet / 1000.0);
- // No Math.log() available here, so compute log base 2 the old fashioned way
- // Here logBaseTwo will take on a value between 0 and 18 actually
- int logBaseTwo = 0;
- while (altitudeInKFeet > 1 && logBaseTwo < 18) {
- altitudeInKFeet >>= 1;
- logBaseTwo++;
- }
- int zoom = 19 - logBaseTwo;
- result.append("&z=");
- result.append(zoom);
- }
- return result.toString();
- }
- */
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'geoURI '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String geoURI;
- //UPGRADE_NOTE: Final was removed from the declaration of 'latitude '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private double latitude;
- //UPGRADE_NOTE: Final was removed from the declaration of 'longitude '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private double longitude;
- //UPGRADE_NOTE: Final was removed from the declaration of 'altitude '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private double altitude;
-
- internal GeoParsedResult(System.String geoURI, double latitude, double longitude, double altitude):base(ParsedResultType.GEO)
- {
- this.geoURI = geoURI;
- this.latitude = latitude;
- this.longitude = longitude;
- this.altitude = altitude;
- }
+ return result.ToString();
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/GeoResultParser.cs b/csharp/client/result/GeoResultParser.cs
index cd2e8498d..7658c3c28 100755
--- a/csharp/client/result/GeoResultParser.cs
+++ b/csharp/client/result/GeoResultParser.cs
@@ -1,78 +1,87 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using Result = com.google.zxing.Result;
+using System.Text.RegularExpressions;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Parses a "geo:" URI result, which specifies a location on the surface of
+
+ using Result = com.google.zxing.Result;
+
+
+ ///
+ /// Parses a "geo:" URI result, which specifies a location on the surface of
/// the Earth as well as an optional altitude above the surface. See
///
/// http://tools.ietf.org/html/draft-mayrhofer-geo-uri-00.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class GeoResultParser:ResultParser
+ public sealed class GeoResultParser : ResultParser
{
-
- private GeoResultParser()
+
+ private static readonly string GEO_URL_PATTERN = "geo:([\\-0-9.]+),([\\-0-9.]+)(?:,([\\-0-9.]+))?(?:\\?(.*))?";
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+
+ Match matcher = Regex.Match(rawText,GEO_URL_PATTERN,RegexOptions.IgnoreCase);
+ if (!matcher.Success)
{
+ return null;
}
-
- public static GeoParsedResult parse(Result result)
+
+ string query = matcher.Groups[4].Value;
+
+ double latitude;
+ double longitude;
+ double altitude;
+ try
{
- System.String rawText = result.Text;
- if (rawText == null || (!rawText.StartsWith("geo:") && !rawText.StartsWith("GEO:")))
+ latitude = Convert.ToDouble(matcher.Groups[1].Value);
+ if (latitude > 90.0 || latitude < -90.0)
+ {
+ return null;
+ }
+ longitude = Convert.ToDouble(matcher.Groups[2].Value);
+ if (longitude > 180.0 || longitude < -180.0)
+ {
+ return null;
+ }
+ if (matcher.Groups[3].Value == null)
+ {
+ altitude = 0.0;
+ }
+ else
+ {
+ altitude = Convert.ToDouble(matcher.Groups[3].Value);
+ if (altitude < 0.0)
{
- return null;
+ return null;
}
- // Drop geo, query portion
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- int queryStart = rawText.IndexOf('?', 4);
- System.String geoURIWithoutQuery = queryStart < 0?rawText.Substring(4):rawText.Substring(4, (queryStart) - (4));
- int latitudeEnd = geoURIWithoutQuery.IndexOf(',');
- if (latitudeEnd < 0)
- {
- return null;
- }
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- int longitudeEnd = geoURIWithoutQuery.IndexOf(',', latitudeEnd + 1);
- double latitude, longitude, altitude;
- try
- {
- latitude = System.Double.Parse(geoURIWithoutQuery.Substring(0, (latitudeEnd) - (0)));
- if (longitudeEnd < 0)
- {
- longitude = System.Double.Parse(geoURIWithoutQuery.Substring(latitudeEnd + 1));
- altitude = 0.0;
- }
- else
- {
- longitude = System.Double.Parse(geoURIWithoutQuery.Substring(latitudeEnd + 1, (longitudeEnd) - (latitudeEnd + 1)));
- altitude = System.Double.Parse(geoURIWithoutQuery.Substring(longitudeEnd + 1));
- }
- }
- catch (System.FormatException)
- {
- return null;
- }
- return new GeoParsedResult(rawText.StartsWith("GEO:")?"geo:" + rawText.Substring(4):rawText, latitude, longitude, altitude);
+ }
}
+ catch (FormatException nfe)
+ {
+ return null;
+ }
+ return new GeoParsedResult(latitude, longitude, altitude, query);
+ }
+
}
-}
+}
\ No newline at end of file
diff --git a/csharp/client/result/ISBNParsedResult.cs b/csharp/client/result/ISBNParsedResult.cs
index 75b5f8bd2..6e467c3bf 100755
--- a/csharp/client/result/ISBNParsedResult.cs
+++ b/csharp/client/result/ISBNParsedResult.cs
@@ -1,51 +1,51 @@
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// jbreiden@google.com (Jeff Breidenbach)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class ISBNParsedResult:ParsedResult
+
+ ///
+ /// @author jbreiden@google.com (Jeff Breidenbach)
+ ///
+ public sealed class ISBNParsedResult : ParsedResult
{
- public System.String ISBN
- {
- get
- {
- return isbn;
- }
-
- }
- override public System.String DisplayResult
- {
- get
- {
- return isbn;
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'isbn '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String isbn;
-
- internal ISBNParsedResult(System.String isbn):base(ParsedResultType.ISBN)
- {
- this.isbn = isbn;
- }
+
+ private readonly string isbn;
+
+ internal ISBNParsedResult(string isbn) : base(ParsedResultType.ISBN)
+ {
+ this.isbn = isbn;
+ }
+
+ public string ISBN
+ {
+ get
+ {
+ return isbn;
+ }
+ }
+
+ public override string DisplayResult
+ {
+ get
+ {
+ return isbn;
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/ISBNResultParser.cs b/csharp/client/result/ISBNResultParser.cs
index 54f26d661..aa6249f26 100755
--- a/csharp/client/result/ISBNResultParser.cs
+++ b/csharp/client/result/ISBNResultParser.cs
@@ -1,63 +1,57 @@
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using Result = com.google.zxing.Result;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Parses strings of digits that represent a ISBN.
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using Result = com.google.zxing.Result;
+
+ ///
+ /// Parses strings of digits that represent a ISBN.
///
+ /// @author jbreiden@google.com (Jeff Breidenbach)
///
- /// jbreiden@google.com (Jeff Breidenbach)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public class ISBNResultParser:ResultParser
+ public sealed class ISBNResultParser : ResultParser
{
-
- private ISBNResultParser()
+
+ ///
+ /// See ISBN-13 For Dummies
+ ///
+ public override ParsedResult parse(Result result)
+ {
+ BarcodeFormat format = result.BarcodeFormat;
+ if (format != BarcodeFormat.EAN_13)
{
+ return null;
}
-
- // ISBN-13 For Dummies
- // http://www.bisg.org/isbn-13/for.dummies.html
- public static ISBNParsedResult parse(Result result)
+ string rawText = getMassagedText(result);
+ int length = rawText.Length;
+ if (length != 13)
{
- BarcodeFormat format = result.BarcodeFormat;
- if (!BarcodeFormat.EAN_13.Equals(format))
- {
- return null;
- }
- System.String rawText = result.Text;
- if (rawText == null)
- {
- return null;
- }
- int length = rawText.Length;
- if (length != 13)
- {
- return null;
- }
- if (!rawText.StartsWith("978") && !rawText.StartsWith("979"))
- {
- return null;
- }
-
- return new ISBNParsedResult(rawText);
+ return null;
}
+ if (!rawText.StartsWith("978") && !rawText.StartsWith("979"))
+ {
+ return null;
+ }
+
+ return new ISBNParsedResult(rawText);
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/ParsedResult.cs b/csharp/client/result/ParsedResult.cs
index 5c522d669..103b18f35 100755
--- a/csharp/client/result/ParsedResult.cs
+++ b/csharp/client/result/ParsedResult.cs
@@ -1,90 +1,91 @@
+using System.Text;
+
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Abstract class representing the result of decoding a barcode, as more than
+
+ ///
+ /// Abstract class representing the result of decoding a barcode, as more than
/// a String -- as some type of structured data. This might be a subclass which represents
- /// a URL, or an e-mail address. {@link ResultParser#parseResult(Result)} will turn a raw
+ /// a URL, or an e-mail address. will turn a raw
/// decoded string into the most appropriate type of structured representation.
///
/// Thanks to Jeff Griffin for proposing rewrite of these classes that relies less
/// on exception-based mechanisms during parsing.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public abstract class ParsedResult
{
- virtual public ParsedResultType Type
+
+ private readonly ParsedResultType type;
+
+ protected internal ParsedResult(ParsedResultType type)
+ {
+ this.type = type;
+ }
+
+ public ParsedResultType Type
+ {
+ get
+ {
+ return type;
+ }
+ }
+
+ public abstract string DisplayResult {get;}
+
+ public override string ToString()
+ {
+ return DisplayResult;
+ }
+
+ public static void maybeAppend(string value, StringBuilder result)
+ {
+ if (value != null && value.Length > 0)
{
- get
+ // Don't add a newline before the first value
+ if (result.Length > 0)
+ {
+ result.Append('\n');
+ }
+ result.Append(value);
+ }
+ }
+
+ public static void maybeAppend(string[] value, StringBuilder result)
+ {
+ if (value != null)
+ {
+ foreach (string s in value)
+ {
+ if (s != null && s.Length > 0)
{
- return type;
- }
-
- }
- public abstract System.String DisplayResult{get;}
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'type '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private ParsedResultType type;
-
- protected internal ParsedResult(ParsedResultType type)
- {
- this.type = type;
- }
-
- public override System.String ToString()
- {
- return DisplayResult;
- }
-
- public static void maybeAppend(System.String value_Renamed, System.Text.StringBuilder result)
- {
- if (value_Renamed != null && value_Renamed.Length > 0)
- {
- // Don't add a newline before the first value
- if (result.Length > 0)
- {
- result.Append('\n');
- }
- result.Append(value_Renamed);
- }
- }
-
- public static void maybeAppend(System.String[] value_Renamed, System.Text.StringBuilder result)
- {
- if (value_Renamed != null)
- {
- for (int i = 0; i < value_Renamed.Length; i++)
- {
- if (value_Renamed[i] != null && value_Renamed[i].Length > 0)
- {
- if (result.Length > 0)
- {
- result.Append('\n');
- }
- result.Append(value_Renamed[i]);
- }
- }
+ if (result.Length > 0)
+ {
+ result.Append('\n');
+ }
+ result.Append(s);
}
+ }
}
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/ParsedResultType.cs b/csharp/client/result/ParsedResultType.cs
index fd962b58f..5aa3e97af 100755
--- a/csharp/client/result/ParsedResultType.cs
+++ b/csharp/client/result/ParsedResultType.cs
@@ -1,72 +1,43 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2010 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Represents the type of data encoded by a barcode -- from plain text, to a
+
+ ///
+ /// Represents the type of data encoded by a barcode -- from plain text, to a
/// URI, to an e-mail address, etc.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class ParsedResultType
+ public enum ParsedResultType
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'ADDRESSBOOK '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType ADDRESSBOOK = new ParsedResultType("ADDRESSBOOK");
- //UPGRADE_NOTE: Final was removed from the declaration of 'EMAIL_ADDRESS '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType EMAIL_ADDRESS = new ParsedResultType("EMAIL_ADDRESS");
- //UPGRADE_NOTE: Final was removed from the declaration of 'PRODUCT '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType PRODUCT = new ParsedResultType("PRODUCT");
- //UPGRADE_NOTE: Final was removed from the declaration of 'URI '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType URI = new ParsedResultType("URI");
- //UPGRADE_NOTE: Final was removed from the declaration of 'TEXT '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType TEXT = new ParsedResultType("TEXT");
- //UPGRADE_NOTE: Final was removed from the declaration of 'ANDROID_INTENT '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType ANDROID_INTENT = new ParsedResultType("ANDROID_INTENT");
- //UPGRADE_NOTE: Final was removed from the declaration of 'GEO '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType GEO = new ParsedResultType("GEO");
- //UPGRADE_NOTE: Final was removed from the declaration of 'TEL '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType TEL = new ParsedResultType("TEL");
- //UPGRADE_NOTE: Final was removed from the declaration of 'SMS '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType SMS = new ParsedResultType("SMS");
- //UPGRADE_NOTE: Final was removed from the declaration of 'CALENDAR '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType CALENDAR = new ParsedResultType("CALENDAR");
- // "optional" types
- //UPGRADE_NOTE: Final was removed from the declaration of 'NDEF_SMART_POSTER '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType NDEF_SMART_POSTER = new ParsedResultType("NDEF_SMART_POSTER");
- //UPGRADE_NOTE: Final was removed from the declaration of 'MOBILETAG_RICH_WEB '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType MOBILETAG_RICH_WEB = new ParsedResultType("MOBILETAG_RICH_WEB");
- //UPGRADE_NOTE: Final was removed from the declaration of 'ISBN '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public static readonly ParsedResultType ISBN = new ParsedResultType("ISBN");
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'name '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String name;
-
- private ParsedResultType(System.String name)
- {
- this.name = name;
- }
-
- public override System.String ToString()
- {
- return name;
- }
+
+ ADDRESSBOOK,
+ EMAIL_ADDRESS,
+ PRODUCT,
+ URI,
+ TEXT,
+ GEO,
+ TEL,
+ SMS,
+ CALENDAR,
+ WIFI,
+ ISBN,
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/ProductParsedResult.cs b/csharp/client/result/ProductParsedResult.cs
index 3781f9308..758b763e8 100755
--- a/csharp/client/result/ProductParsedResult.cs
+++ b/csharp/client/result/ProductParsedResult.cs
@@ -1,66 +1,65 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// dswitkin@google.com (Daniel Switkin)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class ProductParsedResult:ParsedResult
+
+ ///
+ /// @author dswitkin@google.com (Daniel Switkin)
+ ///
+ public sealed class ProductParsedResult : ParsedResult
{
- public System.String ProductID
- {
- get
- {
- return productID;
- }
-
- }
- public System.String NormalizedProductID
- {
- get
- {
- return normalizedProductID;
- }
-
- }
- override public System.String DisplayResult
- {
- get
- {
- return productID;
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'productID '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String productID;
- //UPGRADE_NOTE: Final was removed from the declaration of 'normalizedProductID '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String normalizedProductID;
-
- internal ProductParsedResult(System.String productID):this(productID, productID)
- {
- }
-
- internal ProductParsedResult(System.String productID, System.String normalizedProductID):base(ParsedResultType.PRODUCT)
- {
- this.productID = productID;
- this.normalizedProductID = normalizedProductID;
- }
+
+ private readonly string productID;
+ private readonly string normalizedProductID;
+
+ internal ProductParsedResult(string productID) : this(productID, productID)
+ {
+ }
+
+ internal ProductParsedResult(string productID, string normalizedProductID) : base(ParsedResultType.PRODUCT)
+ {
+ this.productID = productID;
+ this.normalizedProductID = normalizedProductID;
+ }
+
+ public string ProductID
+ {
+ get
+ {
+ return productID;
+ }
+ }
+
+ public string NormalizedProductID
+ {
+ get
+ {
+ return normalizedProductID;
+ }
+ }
+
+ public override string DisplayResult
+ {
+ get
+ {
+ return productID;
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/ProductResultParser.cs b/csharp/client/result/ProductResultParser.cs
index 8a8092863..123842975 100755
--- a/csharp/client/result/ProductResultParser.cs
+++ b/csharp/client/result/ProductResultParser.cs
@@ -1,77 +1,67 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using Result = com.google.zxing.Result;
-using UPCEReader = com.google.zxing.oned.UPCEReader;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Parses strings of digits that represent a UPC code.
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using Result = com.google.zxing.Result;
+ using UPCEReader = com.google.zxing.oned.UPCEReader;
+
+ ///
+ /// Parses strings of digits that represent a UPC code.
///
+ /// @author dswitkin@google.com (Daniel Switkin)
///
- /// dswitkin@google.com (Daniel Switkin)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class ProductResultParser:ResultParser
+ public sealed class ProductResultParser : ResultParser
{
-
- private ProductResultParser()
+
+ // Treat all UPC and EAN variants as UPCs, in the sense that they are all product barcodes.
+ public override ParsedResult parse(Result result)
+ {
+ BarcodeFormat format = result.BarcodeFormat;
+ if (!(format == BarcodeFormat.UPC_A || format == BarcodeFormat.UPC_E || format == BarcodeFormat.EAN_8 || format == BarcodeFormat.EAN_13))
{
+ return null;
}
-
- // Treat all UPC and EAN variants as UPCs, in the sense that they are all product barcodes.
- public static ProductParsedResult parse(Result result)
+ string rawText = getMassagedText(result);
+ int length = rawText.Length;
+ for (int x = 0; x < length; x++)
{
- BarcodeFormat format = result.BarcodeFormat;
- if (!(BarcodeFormat.UPC_A.Equals(format) || BarcodeFormat.UPC_E.Equals(format) || BarcodeFormat.EAN_8.Equals(format) || BarcodeFormat.EAN_13.Equals(format)))
- {
- return null;
- }
- // Really neither of these should happen:
- System.String rawText = result.Text;
- if (rawText == null)
- {
- return null;
- }
-
- int length = rawText.Length;
- for (int x = 0; x < length; x++)
- {
- char c = rawText[x];
- if (c < '0' || c > '9')
- {
- return null;
- }
- }
- // Not actually checking the checksum again here
-
- System.String normalizedProductID;
- // Expand UPC-E for purposes of searching
- if (BarcodeFormat.UPC_E.Equals(format))
- {
- normalizedProductID = UPCEReader.convertUPCEtoUPCA(rawText);
- }
- else
- {
- normalizedProductID = rawText;
- }
-
- return new ProductParsedResult(rawText, normalizedProductID);
+ char c = rawText[x];
+ if (c < '0' || c > '9')
+ {
+ return null;
+ }
}
+ // Not actually checking the checksum again here
+
+ string normalizedProductID;
+ // Expand UPC-E for purposes of searching
+ if (format == BarcodeFormat.UPC_E)
+ {
+ normalizedProductID = UPCEReader.convertUPCEtoUPCA(rawText);
+ }
+ else
+ {
+ normalizedProductID = rawText;
+ }
+
+ return new ProductParsedResult(rawText, normalizedProductID);
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/ResultParser.cs b/csharp/client/result/ResultParser.cs
index 567df9b64..218daf46c 100755
--- a/csharp/client/result/ResultParser.cs
+++ b/csharp/client/result/ResultParser.cs
@@ -1,371 +1,282 @@
-/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using Result = com.google.zxing.Result;
+using System.Collections.Generic;
+using System.Text;
+
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Abstract class representing the result of decoding a barcode, as more than
+
+ using Result = com.google.zxing.Result;
+ using System.Text.RegularExpressions;
+
+
+ ///
+ /// Abstract class representing the result of decoding a barcode, as more than
/// a String -- as some type of structured data. This might be a subclass which represents
- /// a URL, or an e-mail address. {@link #parseResult(com.google.zxing.Result)} will turn a raw
+ /// a URL, or an e-mail address. will turn a raw
/// decoded string into the most appropriate type of structured representation.
///
/// Thanks to Jeff Griffin for proposing rewrite of these classes that relies less
/// on exception-based mechanisms during parsing.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public abstract class ResultParser
{
-
- public static ParsedResult parseResult(Result theResult)
+
+ private static readonly ResultParser[] PARSERS = {new BookmarkDoCoMoResultParser(), new AddressBookDoCoMoResultParser(), new EmailDoCoMoResultParser(), new AddressBookAUResultParser(), new VCardResultParser(), new BizcardResultParser(), new VEventResultParser(), new EmailAddressResultParser(), new SMTPResultParser(), new TelResultParser(), new SMSMMSResultParser(), new SMSTOMMSTOResultParser(), new GeoResultParser(), new WifiResultParser(), new URLTOResultParser(), new URIResultParser(), new ISBNResultParser(), new ProductResultParser(), new ExpandedProductResultParser()};
+
+ private static readonly string DIGITS = "\\d*";
+ private static readonly string ALPHANUM = "[a-zA-Z0-9]*";
+ private static readonly string AMPERSAND = "&";
+ private static readonly string EQUALS = "=";
+ private const string BYTE_ORDER_MARK = "\ufeff";
+
+ ///
+ /// Attempts to parse the raw 's contents as a particular type
+ /// of information (email, URL, etc.) and return a encapsulating
+ /// the result of parsing.
+ ///
+ public abstract ParsedResult parse(Result theResult);
+
+ protected internal static string getMassagedText(Result result)
+ {
+ string text = result.Text;
+ if (text.StartsWith(BYTE_ORDER_MARK))
{
- // Simplification of original if - if else logic using Null Coalescing operator ??
- //
- // ?? Simply checks from left to right for a non null object
- // when an object evaluates to null the next object after the ?? is evaluated
- // This continues until a non null value is found or the last object is evaluated
- return
- BookmarkDoCoMoResultParser.parse(theResult) as ParsedResult ??
- AddressBookDoCoMoResultParser.parse(theResult) as ParsedResult ??
- EmailDoCoMoResultParser.parse(theResult) as ParsedResult ??
- AddressBookAUResultParser.parse(theResult) as ParsedResult ??
- VCardResultParser.parse(theResult) as ParsedResult ??
- BizcardResultParser.parse(theResult) as ParsedResult ??
- VEventResultParser.parse(theResult) as ParsedResult ??
- EmailAddressResultParser.parse(theResult) as ParsedResult ??
- TelResultParser.parse(theResult) as ParsedResult ??
- SMSMMSResultParser.parse(theResult) as ParsedResult ??
- GeoResultParser.parse(theResult) as ParsedResult ??
- URLTOResultParser.parse(theResult) as ParsedResult ??
- URIResultParser.parse(theResult) as ParsedResult ??
- ISBNResultParser.parse(theResult) as ParsedResult ??
- ProductResultParser.parse(theResult) as ParsedResult ??
- new TextParsedResult(theResult.Text, null) as ParsedResult;
+ text = text.Substring(1);
}
-
- protected internal static void maybeAppend(System.String value_Renamed, System.Text.StringBuilder result)
+ return text;
+ }
+
+ public static ParsedResult parseResult(Result theResult)
+ {
+ foreach (ResultParser parser in PARSERS)
{
- if (value_Renamed != null)
- {
- result.Append('\n');
- result.Append(value_Renamed);
- }
- }
-
- protected internal static void maybeAppend(System.String[] value_Renamed, System.Text.StringBuilder result)
- {
- if (value_Renamed != null)
- {
- for (int i = 0; i < value_Renamed.Length; i++)
- {
- result.Append('\n');
- result.Append(value_Renamed[i]);
- }
- }
- }
-
- protected internal static System.String[] maybeWrap(System.String value_Renamed)
- {
- return value_Renamed == null?null:new System.String[]{value_Renamed};
- }
-
- protected internal static System.String unescapeBackslash(System.String escaped)
- {
- if (escaped != null)
- {
- int backslash = escaped.IndexOf('\\');
- if (backslash >= 0)
- {
- int max = escaped.Length;
- System.Text.StringBuilder unescaped = new System.Text.StringBuilder(max - 1);
- unescaped.Append(escaped.ToCharArray(), 0, backslash);
- bool nextIsEscaped = false;
- for (int i = backslash; i < max; i++)
- {
- char c = escaped[i];
- if (nextIsEscaped || c != '\\')
- {
- unescaped.Append(c);
- nextIsEscaped = false;
- }
- else
- {
- nextIsEscaped = true;
- }
- }
- return unescaped.ToString();
- }
- }
- return escaped;
- }
-
- private static System.String urlDecode(System.String escaped)
- {
-
- // No we can't use java.net.URLDecoder here. JavaME doesn't have it.
- if (escaped == null)
- {
- return null;
- }
- char[] escapedArray = escaped.ToCharArray();
-
- int first = findFirstEscape(escapedArray);
- if (first < 0)
- {
- return escaped;
- }
-
- int max = escapedArray.Length;
- // final length is at most 2 less than original due to at least 1 unescaping
- System.Text.StringBuilder unescaped = new System.Text.StringBuilder(max - 2);
- // Can append everything up to first escape character
- unescaped.Append(escapedArray, 0, first);
-
- for (int i = first; i < max; i++)
- {
- char c = escapedArray[i];
- if (c == '+')
- {
- // + is translated directly into a space
- unescaped.Append(' ');
- }
- else if (c == '%')
- {
- // Are there even two more chars? if not we will just copy the escaped sequence and be done
- if (i >= max - 2)
- {
- unescaped.Append('%'); // append that % and move on
- }
- else
- {
- int firstDigitValue = parseHexDigit(escapedArray[++i]);
- int secondDigitValue = parseHexDigit(escapedArray[++i]);
- if (firstDigitValue < 0 || secondDigitValue < 0)
- {
- // bad digit, just move on
- unescaped.Append('%');
- unescaped.Append(escapedArray[i - 1]);
- unescaped.Append(escapedArray[i]);
- }
- unescaped.Append((char) ((firstDigitValue << 4) + secondDigitValue));
- }
- }
- else
- {
- unescaped.Append(c);
- }
- }
- return unescaped.ToString();
- }
-
- private static int findFirstEscape(char[] escapedArray)
- {
- int max = escapedArray.Length;
- for (int i = 0; i < max; i++)
- {
- char c = escapedArray[i];
- if (c == '+' || c == '%')
- {
- return i;
- }
- }
- return - 1;
- }
-
- private static int parseHexDigit(char c)
- {
- if (c >= 'a')
- {
- if (c <= 'f')
- {
- return 10 + (c - 'a');
- }
- }
- else if (c >= 'A')
- {
- if (c <= 'F')
- {
- return 10 + (c - 'A');
- }
- }
- else if (c >= '0')
- {
- if (c <= '9')
- {
- return c - '0';
- }
- }
- return - 1;
- }
-
- protected internal static bool isStringOfDigits(System.String value_Renamed, int length)
- {
- if (value_Renamed == null)
- {
- return false;
- }
- int stringLength = value_Renamed.Length;
- if (length != stringLength)
- {
- return false;
- }
- for (int i = 0; i < length; i++)
- {
- char c = value_Renamed[i];
- if (c < '0' || c > '9')
- {
- return false;
- }
- }
- return true;
- }
-
- protected internal static bool isSubstringOfDigits(System.String value_Renamed, int offset, int length)
- {
- if (value_Renamed == null)
- {
- return false;
- }
- int stringLength = value_Renamed.Length;
- int max = offset + length;
- if (stringLength < max)
- {
- return false;
- }
- for (int i = offset; i < max; i++)
- {
- char c = value_Renamed[i];
- if (c < '0' || c > '9')
- {
- return false;
- }
- }
- return true;
- }
-
- internal static System.Collections.Hashtable parseNameValuePairs(System.String uri)
- {
- int paramStart = uri.IndexOf('?');
- if (paramStart < 0)
- {
- return null;
- }
- System.Collections.Hashtable result = System.Collections.Hashtable.Synchronized(new System.Collections.Hashtable(3));
- paramStart++;
- int paramEnd;
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- while ((paramEnd = uri.IndexOf('&', paramStart)) >= 0)
- {
- appendKeyValue(uri, paramStart, paramEnd, result);
- paramStart = paramEnd + 1;
- }
- appendKeyValue(uri, paramStart, uri.Length, result);
+ ParsedResult result = parser.parse(theResult);
+ if (result != null)
+ {
return result;
+ }
}
-
- private static void appendKeyValue(System.String uri, int paramStart, int paramEnd, System.Collections.Hashtable result)
+ return new TextParsedResult(theResult.Text, null);
+ }
+
+ protected internal static void maybeAppend(string value, StringBuilder result)
+ {
+ if (value != null)
{
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- int separator = uri.IndexOf('=', paramStart);
- if (separator >= 0)
- {
- // key = value
- System.String key = uri.Substring(paramStart, (separator) - (paramStart));
- System.String value_Renamed = uri.Substring(separator + 1, (paramEnd) - (separator + 1));
- value_Renamed = urlDecode(value_Renamed);
- result[key] = value_Renamed;
- }
- // Can't put key, null into a hashtable
+ result.Append('\n');
+ result.Append(value);
}
-
- internal static System.String[] matchPrefixedField(System.String prefix, System.String rawText, char endChar, bool trim)
+ }
+
+ protected internal static void maybeAppend(string[] value, StringBuilder result)
+ {
+ if (value != null)
{
- System.Collections.ArrayList matches = null;
- int i = 0;
- int max = rawText.Length;
- while (i < max)
- {
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- i = rawText.IndexOf(prefix, i);
- if (i < 0)
- {
- break;
- }
- i += prefix.Length; // Skip past this prefix we found to start
- int start = i; // Found the start of a match here
- bool done = false;
- while (!done)
- {
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- i = rawText.IndexOf((System.Char) endChar, i);
- if (i < 0)
- {
- // No terminating end character? uh, done. Set i such that loop terminates and break
- i = rawText.Length;
- done = true;
- }
- else if (rawText[i - 1] == '\\')
- {
- // semicolon was escaped so continue
- i++;
- }
- else
- {
- // found a match
- if (matches == null)
- {
- matches = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(3)); // lazy init
- }
- System.String element = unescapeBackslash(rawText.Substring(start, (i) - (start)));
- if (trim)
- {
- element = element.Trim();
- }
- matches.Add(element);
- i++;
- done = true;
- }
- }
- }
- if (matches == null || (matches.Count == 0))
- {
- return null;
- }
- return toStringArray(matches);
+ foreach (string s in value)
+ {
+ result.Append('\n');
+ result.Append(s);
+ }
}
-
- internal static System.String matchSinglePrefixedField(System.String prefix, System.String rawText, char endChar, bool trim)
+ }
+
+ protected internal static string[] maybeWrap(string value)
+ {
+ return value == null ? null : new string[] {value};
+ }
+
+ protected internal static string unescapeBackslash(string escaped)
+ {
+ int backslash = (int) escaped.IndexOf('\\');
+ if (backslash < 0)
{
- System.String[] matches = matchPrefixedField(prefix, rawText, endChar, trim);
- return matches == null?null:matches[0];
+ return escaped;
}
-
- internal static System.String[] toStringArray(System.Collections.ArrayList strings)
+ int max = escaped.Length;
+ StringBuilder unescaped = new StringBuilder(max - 1);
+ unescaped.Append(escaped.ToCharArray(), 0, backslash);
+ bool nextIsEscaped = false;
+ for (int i = backslash; i < max; i++)
{
- int size = strings.Count;
- System.String[] result = new System.String[size];
- for (int j = 0; j < size; j++)
- {
- result[j] = ((System.String) strings[j]);
- }
- return result;
+ char c = escaped[i];
+ if (nextIsEscaped || c != '\\')
+ {
+ unescaped.Append(c);
+ nextIsEscaped = false;
+ }
+ else
+ {
+ nextIsEscaped = true;
+ }
}
+ return unescaped.ToString();
+ }
+
+ protected internal static int parseHexDigit(char c)
+ {
+ if (c >= '0' && c <= '9')
+ {
+ return c - '0';
+ }
+ if (c >= 'a' && c <= 'f')
+ {
+ return 10 + (c - 'a');
+ }
+ if (c >= 'A' && c <= 'F')
+ {
+ return 10 + (c - 'A');
+ }
+ return -1;
+ }
+
+ protected internal static bool isStringOfDigits(string value, int length)
+ {
+ //return value != null && length == value.Length && DIGITS.matcher(value).matches();
+
+ return value != null && length == value.Length && new Regex(DIGITS).IsMatch(value);
+ }
+
+ protected internal static bool isSubstringOfDigits(string value, int offset, int length)
+ {
+ if (value == null)
+ {
+ return false;
+ }
+ int max = offset + length;
+ string s = value.Substring(offset, length);
+ return isStringOfDigits(s, length);
+ //return value.Length >= max && DIGITS.matcher(value.subSequence(offset, max)).matches();
+ }
+
+ protected internal static bool isSubstringOfAlphaNumeric(string value, int offset, int length)
+ {
+ if (value == null)
+ {
+ return false;
+ }
+ int max = offset + length;
+ string s = value.Substring(offset, length);
+ return length == s.Length && new Regex(ALPHANUM).IsMatch(s);
+ //return value.Length >= max && ALPHANUM.matcher(value.subSequence(offset, max)).matches();
+ }
+
+ internal static IDictionary parseNameValuePairs(string uri)
+ {
+ int paramStart = uri.IndexOf('?');
+ if (paramStart < 0)
+ {
+ return null;
+ }
+ IDictionary result = new Dictionary(3);
+ foreach (string keyValue in AMPERSAND.Split(new string[] {uri.Substring(paramStart + 1)},StringSplitOptions.None))
+ {
+ appendKeyValue(keyValue, result);
+ }
+ return result;
+ }
+
+ private static void appendKeyValue(string keyValue, IDictionary result)
+ {
+ string[] keyValueTokens = EQUALS.Split(new string[] {keyValue}, 2,StringSplitOptions.None);
+ if (keyValueTokens.Length == 2)
+ {
+ string key = keyValueTokens[0];
+ string value = keyValueTokens[1];
+ try
+ {
+ //value = URLDecoder.decode(value, "UTF-8");
+ value = System.Web.HttpUtility.UrlDecode(value,Encoding.UTF8);
+ result[key] = value;
+ }
+ //catch (UnsupportedEncodingException uee)
+ //{
+ // throw new IllegalStateException(uee); // can't happen
+ //}
+ catch (System.ArgumentException iae)
+ {
+ // continue; invalid data such as an escape like %0t
+ }
+ }
+ }
+
+ internal static string[] matchPrefixedField(string prefix, string rawText, char endChar, bool trim)
+ {
+ List matches = null;
+ int i = 0;
+ int max = rawText.Length;
+ while (i < max)
+ {
+ i = rawText.IndexOf(prefix, i);
+ if (i < 0)
+ {
+ break;
+ }
+ i += prefix.Length; // Skip past this prefix we found to start
+ int start = i; // Found the start of a match here
+ bool more = true;
+ while (more)
+ {
+ i = (int)rawText.IndexOf( endChar, i);
+ if (i < 0)
+ {
+ // No terminating end character? uh, done. Set i such that loop terminates and break
+ i = rawText.Length;
+ more = false;
+ }
+ else if (rawText[i - 1] == '\\')
+ {
+ // semicolon was escaped so continue
+ i++;
+ }
+ else
+ {
+ // found a match
+ if (matches == null)
+ {
+ matches = new List(3); // lazy init
+ }
+ string element = unescapeBackslash(rawText.Substring(start, i - start));
+ if (trim)
+ {
+ element = element.Trim();
+ }
+ matches.Add(element);
+ i++;
+ more = false;
+ }
+ }
+ }
+ if (matches == null || matches.Count == 0)
+ {
+ return null;
+ }
+ return matches.ToArray();
+ }
+
+ internal static string matchSinglePrefixedField(string prefix, string rawText, char endChar, bool trim)
+ {
+ string[] matches = matchPrefixedField(prefix, rawText, endChar, trim);
+ return matches == null ? null : matches[0];
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/SMSMMSResultParser.cs b/csharp/client/result/SMSMMSResultParser.cs
index 3719e118d..ecc7ecdd8 100755
--- a/csharp/client/result/SMSMMSResultParser.cs
+++ b/csharp/client/result/SMSMMSResultParser.cs
@@ -1,123 +1,117 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Parses an "sms:" URI result, which specifies a number to SMS and optional
- /// "via" number. See
- /// the IETF draft on this.
+
+ using Result = com.google.zxing.Result;
+
+
+ ///
+ /// Parses an "sms:" URI result, which specifies a number to SMS.
+ /// See RFC 5724 on this.
///
- /// This actually also parses URIs starting with "mms:", "smsto:", "mmsto:", "SMSTO:", and
- /// "MMSTO:", and treats them all the same way, and effectively converts them to an "sms:" URI
- /// for purposes of forwarding to the platform.
+ /// This class supports "via" syntax for numbers, which is not part of the spec.
+ /// For example "+12125551212;via=+12124440101" may appear as a number.
+ /// It also supports a "subject" query parameter, which is not mentioned in the spec.
+ /// These are included since they were mentioned in earlier IETF drafts and might be
+ /// used.
///
+ /// This actually also parses URIs starting with "mms:" and treats them all the same way,
+ /// and effectively converts them to an "sms:" URI for purposes of forwarding to the platform.
+ ///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class SMSMMSResultParser:ResultParser
+ public sealed class SMSMMSResultParser : ResultParser
{
-
- private SMSMMSResultParser()
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+ if (!(rawText.StartsWith("sms:") || rawText.StartsWith("SMS:") || rawText.StartsWith("mms:") || rawText.StartsWith("MMS:")))
{
+ return null;
}
-
- public static SMSParsedResult parse(Result result)
+
+ // Check up front if this is a URI syntax string with query arguments
+ IDictionary nameValuePairs = parseNameValuePairs(rawText);
+ string subject = null;
+ string body = null;
+ bool querySyntax = false;
+ if (nameValuePairs != null && nameValuePairs.Count > 0)
{
- System.String rawText = result.Text;
- if (rawText == null)
- {
- return null;
- }
- int prefixLength;
- if (rawText.StartsWith("sms:") || rawText.StartsWith("SMS:") || rawText.StartsWith("mms:") || rawText.StartsWith("MMS:"))
- {
- prefixLength = 4;
- }
- else if (rawText.StartsWith("smsto:") || rawText.StartsWith("SMSTO:") || rawText.StartsWith("mmsto:") || rawText.StartsWith("MMSTO:"))
- {
- prefixLength = 6;
- }
- else
- {
- return null;
- }
-
- // Check up front if this is a URI syntax string with query arguments
- System.Collections.Hashtable nameValuePairs = parseNameValuePairs(rawText);
- System.String subject = null;
- System.String body = null;
- bool querySyntax = false;
- if (nameValuePairs != null && !(nameValuePairs.Count == 0))
- {
- subject = ((System.String) nameValuePairs["subject"]);
- body = ((System.String) nameValuePairs["body"]);
- querySyntax = true;
- }
-
- // Drop sms, query portion
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- int queryStart = rawText.IndexOf('?', prefixLength);
- System.String smsURIWithoutQuery;
- // If it's not query syntax, the question mark is part of the subject or message
- if (queryStart < 0 || !querySyntax)
- {
- smsURIWithoutQuery = rawText.Substring(prefixLength);
- }
- else
- {
- smsURIWithoutQuery = rawText.Substring(prefixLength, (queryStart) - (prefixLength));
- }
- int numberEnd = smsURIWithoutQuery.IndexOf(';');
- System.String number;
- System.String via;
- if (numberEnd < 0)
- {
- number = smsURIWithoutQuery;
- via = null;
- }
- else
- {
- number = smsURIWithoutQuery.Substring(0, (numberEnd) - (0));
- System.String maybeVia = smsURIWithoutQuery.Substring(numberEnd + 1);
- if (maybeVia.StartsWith("via="))
- {
- via = maybeVia.Substring(4);
- }
- else
- {
- via = null;
- }
- }
-
- // Thanks to dominik.wild for suggesting this enhancement to support
- // smsto:number:body URIs
- if (body == null)
- {
- int bodyStart = number.IndexOf(':');
- if (bodyStart >= 0)
- {
- body = number.Substring(bodyStart + 1);
- number = number.Substring(0, (bodyStart) - (0));
- }
- }
- return new SMSParsedResult("sms:" + number, number, via, subject, body, null);
+ subject = nameValuePairs["subject"];
+ body = nameValuePairs["body"];
+ querySyntax = true;
}
+
+ // Drop sms, query portion
+ int queryStart = rawText.IndexOf('?', 4);
+ string smsURIWithoutQuery;
+ // If it's not query syntax, the question mark is part of the subject or message
+ if (queryStart < 0 || !querySyntax)
+ {
+ smsURIWithoutQuery = rawText.Substring(4);
+ }
+ else
+ {
+ smsURIWithoutQuery = rawText.Substring(4, queryStart - 4);
+ }
+
+ int lastComma = -1;
+ int comma;
+ List numbers = new List(1);
+ List vias = new List(1);
+ while ((comma = smsURIWithoutQuery.IndexOf(',', lastComma + 1)) > lastComma)
+ {
+ string numberPart = smsURIWithoutQuery.Substring(lastComma + 1, comma - (lastComma + 1));
+ addNumberVia(numbers, vias, numberPart);
+ lastComma = comma;
+ }
+ addNumberVia(numbers, vias, smsURIWithoutQuery.Substring(lastComma + 1));
+
+ return new SMSParsedResult(numbers.ToArray(), vias.ToArray(), subject, body);
+ }
+
+ private static void addNumberVia(ICollection numbers, ICollection vias, string numberPart)
+ {
+ int numberEnd = numberPart.IndexOf(';');
+ if (numberEnd < 0)
+ {
+ numbers.Add(numberPart);
+ vias.Add(null);
+ }
+ else
+ {
+ numbers.Add(numberPart.Substring(0, numberEnd));
+ string maybeVia = numberPart.Substring(numberEnd + 1);
+ string via;
+ if (maybeVia.StartsWith("via="))
+ {
+ via = maybeVia.Substring(4);
+ }
+ else
+ {
+ via = null;
+ }
+ vias.Add(via);
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/SMSParsedResult.cs b/csharp/client/result/SMSParsedResult.cs
index c42eb2858..8cd1cb6a5 100755
--- a/csharp/client/result/SMSParsedResult.cs
+++ b/csharp/client/result/SMSParsedResult.cs
@@ -1,112 +1,142 @@
+using System.Text;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class SMSParsedResult:ParsedResult
+
+ ///
+ /// @author Sean Owen
+ ///
+ public sealed class SMSParsedResult : ParsedResult
{
- public System.String SMSURI
- {
- get
+
+ private readonly string[] numbers;
+ private readonly string[] vias;
+ private readonly string subject;
+ private readonly string body;
+
+ public SMSParsedResult(string number, string via, string subject, string body) : base(ParsedResultType.SMS)
+ {
+ this.numbers = new string[] {number};
+ this.vias = new string[] {via};
+ this.subject = subject;
+ this.body = body;
+ }
+
+ public SMSParsedResult(string[] numbers, string[] vias, string subject, string body) : base(ParsedResultType.SMS)
+ {
+ this.numbers = numbers;
+ this.vias = vias;
+ this.subject = subject;
+ this.body = body;
+ }
+
+ public string SMSURI
+ {
+ get
+ {
+ StringBuilder result = new StringBuilder();
+ result.Append("sms:");
+ bool first = true;
+ for (int i = 0; i < numbers.Length; i++)
{
- return smsURI;
+ if (first)
+ {
+ first = false;
+ }
+ else
+ {
+ result.Append(',');
+ }
+ result.Append(numbers[i]);
+ if (vias != null && vias[i] != null)
+ {
+ result.Append(";via=");
+ result.Append(vias[i]);
+ }
}
-
- }
- public System.String Number
- {
- get
+ bool hasBody = body != null;
+ bool hasSubject = subject != null;
+ if (hasBody || hasSubject)
{
- return number;
+ result.Append('?');
+ if (hasBody)
+ {
+ result.Append("body=");
+ result.Append(body);
+ }
+ if (hasSubject)
+ {
+ if (hasBody)
+ {
+ result.Append('&');
+ }
+ result.Append("subject=");
+ result.Append(subject);
+ }
}
-
- }
- public System.String Via
- {
- get
- {
- return via;
- }
-
- }
- public System.String Subject
- {
- get
- {
- return subject;
- }
-
- }
- public System.String Body
- {
- get
- {
- return body;
- }
-
- }
- public System.String Title
- {
- get
- {
- return title;
- }
-
- }
- override public System.String DisplayResult
- {
- get
- {
- System.Text.StringBuilder result = new System.Text.StringBuilder(100);
- maybeAppend(number, result);
- maybeAppend(via, result);
- maybeAppend(subject, result);
- maybeAppend(body, result);
- maybeAppend(title, result);
- return result.ToString();
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'smsURI '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String smsURI;
- //UPGRADE_NOTE: Final was removed from the declaration of 'number '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String number;
- //UPGRADE_NOTE: Final was removed from the declaration of 'via '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String via;
- //UPGRADE_NOTE: Final was removed from the declaration of 'subject '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String subject;
- //UPGRADE_NOTE: Final was removed from the declaration of 'body '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String body;
- //UPGRADE_NOTE: Final was removed from the declaration of 'title '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String title;
-
- public SMSParsedResult(System.String smsURI, System.String number, System.String via, System.String subject, System.String body, System.String title):base(ParsedResultType.SMS)
- {
- this.smsURI = smsURI;
- this.number = number;
- this.via = via;
- this.subject = subject;
- this.body = body;
- this.title = title;
- }
+ return result.ToString();
+ }
+ }
+
+ public string[] Numbers
+ {
+ get
+ {
+ return numbers;
+ }
+ }
+
+ public string[] Vias
+ {
+ get
+ {
+ return vias;
+ }
+ }
+
+ public string Subject
+ {
+ get
+ {
+ return subject;
+ }
+ }
+
+ public string Body
+ {
+ get
+ {
+ return body;
+ }
+ }
+
+ public override string DisplayResult
+ {
+ get
+ {
+ StringBuilder result = new StringBuilder(100);
+ maybeAppend(numbers, result);
+ maybeAppend(subject, result);
+ maybeAppend(body, result);
+ return result.ToString();
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/TelParsedResult.cs b/csharp/client/result/TelParsedResult.cs
index 6c00ed40b..af017bebb 100755
--- a/csharp/client/result/TelParsedResult.cs
+++ b/csharp/client/result/TelParsedResult.cs
@@ -1,76 +1,75 @@
+using System.Text;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class TelParsedResult:ParsedResult
+
+ ///
+ /// @author Sean Owen
+ ///
+ public sealed class TelParsedResult : ParsedResult
{
- public System.String Number
- {
- get
- {
- return number;
- }
-
- }
- public System.String TelURI
- {
- get
- {
- return telURI;
- }
-
- }
- public System.String Title
- {
- get
- {
- return title;
- }
-
- }
- override public System.String DisplayResult
- {
- get
- {
- System.Text.StringBuilder result = new System.Text.StringBuilder(20);
- maybeAppend(number, result);
- maybeAppend(title, result);
- return result.ToString();
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'number '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String number;
- //UPGRADE_NOTE: Final was removed from the declaration of 'telURI '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String telURI;
- //UPGRADE_NOTE: Final was removed from the declaration of 'title '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String title;
-
- public TelParsedResult(System.String number, System.String telURI, System.String title):base(ParsedResultType.TEL)
- {
- this.number = number;
- this.telURI = telURI;
- this.title = title;
- }
+
+ private readonly string number;
+ private readonly string telURI;
+ private readonly string title;
+
+ public TelParsedResult(string number, string telURI, string title) : base(ParsedResultType.TEL)
+ {
+ this.number = number;
+ this.telURI = telURI;
+ this.title = title;
+ }
+
+ public string Number
+ {
+ get
+ {
+ return number;
+ }
+ }
+
+ public string TelURI
+ {
+ get
+ {
+ return telURI;
+ }
+ }
+
+ public string Title
+ {
+ get
+ {
+ return title;
+ }
+ }
+
+ public override string DisplayResult
+ {
+ get
+ {
+ StringBuilder result = new StringBuilder(20);
+ maybeAppend(number, result);
+ maybeAppend(title, result);
+ return result.ToString();
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/TelResultParser.cs b/csharp/client/result/TelResultParser.cs
index 0a472dba5..39abb832a 100755
--- a/csharp/client/result/TelResultParser.cs
+++ b/csharp/client/result/TelResultParser.cs
@@ -1,51 +1,46 @@
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Parses a "tel:" URI result, which specifies a phone number.
+
+ using Result = com.google.zxing.Result;
+
+ ///
+ /// Parses a "tel:" URI result, which specifies a phone number.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class TelResultParser:ResultParser
+ public sealed class TelResultParser : ResultParser
{
-
- private TelResultParser()
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+ if (!rawText.StartsWith("tel:") && !rawText.StartsWith("TEL:"))
{
+ return null;
}
-
- public static TelParsedResult parse(Result result)
- {
- System.String rawText = result.Text;
- if (rawText == null || (!rawText.StartsWith("tel:") && !rawText.StartsWith("TEL:")))
- {
- return null;
- }
- // Normalize "TEL:" to "tel:"
- System.String telURI = rawText.StartsWith("TEL:")?"tel:" + rawText.Substring(4):rawText;
- // Drop tel, query portion
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- int queryStart = rawText.IndexOf('?', 4);
- System.String number = queryStart < 0?rawText.Substring(4):rawText.Substring(4, (queryStart) - (4));
- return new TelParsedResult(number, telURI, null);
- }
+ // Normalize "TEL:" to "tel:"
+ string telURI = rawText.StartsWith("TEL:") ? "tel:" + rawText.Substring(4) : rawText;
+ // Drop tel, query portion
+ int queryStart = rawText.IndexOf('?', 4);
+ string number = queryStart < 0 ? rawText.Substring(4) : rawText.Substring(4, queryStart - 4);
+ return new TelParsedResult(number, telURI, null);
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/TextParsedResult.cs b/csharp/client/result/TextParsedResult.cs
index 806eb2c38..e9a6c07be 100755
--- a/csharp/client/result/TextParsedResult.cs
+++ b/csharp/client/result/TextParsedResult.cs
@@ -1,66 +1,64 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// A simple result type encapsulating a string that has no further
+
+ ///
+ /// A simple result type encapsulating a string that has no further
/// interpretation.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class TextParsedResult:ParsedResult
+ public sealed class TextParsedResult : ParsedResult
{
- public System.String Text
- {
- get
- {
- return text;
- }
-
- }
- public System.String Language
- {
- get
- {
- return language;
- }
-
- }
- override public System.String DisplayResult
- {
- get
- {
- return text;
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'text '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String text;
- //UPGRADE_NOTE: Final was removed from the declaration of 'language '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String language;
-
- public TextParsedResult(System.String text, System.String language):base(ParsedResultType.TEXT)
- {
- this.text = text;
- this.language = language;
- }
+
+ private readonly string text;
+ private readonly string language;
+
+ public TextParsedResult(string text, string language) : base(ParsedResultType.TEXT)
+ {
+ this.text = text;
+ this.language = language;
+ }
+
+ public string Text
+ {
+ get
+ {
+ return text;
+ }
+ }
+
+ public string Language
+ {
+ get
+ {
+ return language;
+ }
+ }
+
+ public override string DisplayResult
+ {
+ get
+ {
+ return text;
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/URIParsedResult.cs b/csharp/client/result/URIParsedResult.cs
index ea8cdffa5..6aadaa580 100755
--- a/csharp/client/result/URIParsedResult.cs
+++ b/csharp/client/result/URIParsedResult.cs
@@ -1,148 +1,127 @@
+using System.Text;
+using System.Text.RegularExpressions;
+
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class URIParsedResult:ParsedResult
+
+
+ ///
+ /// @author Sean Owen
+ ///
+ public sealed class URIParsedResult : ParsedResult
{
- public System.String URI
- {
- get
- {
- return uri;
- }
-
- }
- public System.String Title
- {
- get
- {
- return title;
- }
-
- }
- /// true if the URI contains suspicious patterns that may suggest it intends to
- /// mislead the user about its true nature. At the moment this looks for the presence
- /// of user/password syntax in the host/authority portion of a URI which may be used
- /// in attempts to make the URI's host appear to be other than it is. Example:
- /// http://yourbank.com@phisher.com This URI connects to phisher.com but may appear
- /// to connect to yourbank.com at first glance.
- ///
- public bool PossiblyMaliciousURI
- {
- get
- {
- return containsUser();
- }
-
- }
- override public System.String DisplayResult
- {
- get
- {
- System.Text.StringBuilder result = new System.Text.StringBuilder(30);
- maybeAppend(title, result);
- maybeAppend(uri, result);
- return result.ToString();
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'uri '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String uri;
- //UPGRADE_NOTE: Final was removed from the declaration of 'title '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String title;
-
- public URIParsedResult(System.String uri, System.String title):base(ParsedResultType.URI)
- {
- this.uri = massageURI(uri);
- this.title = title;
- }
-
- private bool containsUser()
- {
- // This method is likely not 100% RFC compliant yet
- int hostStart = uri.IndexOf(':'); // we should always have scheme at this point
- hostStart++;
- // Skip slashes preceding host
- int uriLength = uri.Length;
- while (hostStart < uriLength && uri[hostStart] == '/')
- {
- hostStart++;
- }
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- int hostEnd = uri.IndexOf('/', hostStart);
- if (hostEnd < 0)
- {
- hostEnd = uriLength;
- }
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- int at = uri.IndexOf('@', hostStart);
- return at >= hostStart && at < hostEnd;
- }
-
- /// Transforms a string that represents a URI into something more proper, by adding or canonicalizing
- /// the protocol.
- ///
- private static System.String massageURI(System.String uri)
- {
- int protocolEnd = uri.IndexOf(':');
- if (protocolEnd < 0)
- {
- // No protocol, assume http
- uri = "http://" + uri;
- }
- else if (isColonFollowedByPortNumber(uri, protocolEnd))
- {
- // Found a colon, but it looks like it is after the host, so the protocol is still missing
- uri = "http://" + uri;
- }
- else
- {
- // Lowercase protocol to avoid problems
- uri = uri.Substring(0, (protocolEnd) - (0)).ToLower() + uri.Substring(protocolEnd);
- }
+
+ private static readonly string USER_IN_HOST = ":/*([^/@]+)@[^/]+";
+
+ private readonly string uri;
+ private readonly string title;
+
+ public URIParsedResult(string uri, string title) : base(ParsedResultType.URI)
+ {
+ this.uri = massageURI(uri);
+ this.title = title;
+ }
+
+ public string URI
+ {
+ get
+ {
return uri;
- }
-
- private static bool isColonFollowedByPortNumber(System.String uri, int protocolEnd)
+ }
+ }
+
+ public string Title
+ {
+ get
+ {
+ return title;
+ }
+ }
+
+ /// true if the URI contains suspicious patterns that may suggest it intends to
+ /// mislead the user about its true nature. At the moment this looks for the presence
+ /// of user/password syntax in the host/authority portion of a URI which may be used
+ /// in attempts to make the URI's host appear to be other than it is. Example:
+ /// http://yourbank.com@phisher.com This URI connects to phisher.com but may appear
+ /// to connect to yourbank.com at first glance.
+ public bool PossiblyMaliciousURI
+ {
+ get
+ {
+ //return USER_IN_HOST.matcher(uri).find();
+ return new Regex(USER_IN_HOST).IsMatch(uri);
+ }
+ }
+
+ public override string DisplayResult
+ {
+ get
+ {
+ StringBuilder result = new StringBuilder(30);
+ maybeAppend(title, result);
+ maybeAppend(uri, result);
+ return result.ToString();
+ }
+ }
+
+ ///
+ /// Transforms a string that represents a URI into something more proper, by adding or canonicalizing
+ /// the protocol.
+ ///
+ private static string massageURI(string uri)
+ {
+ uri = uri.Trim();
+ int protocolEnd = uri.IndexOf(':');
+ if (protocolEnd < 0)
{
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- int nextSlash = uri.IndexOf('/', protocolEnd + 1);
- if (nextSlash < 0)
- {
- nextSlash = uri.Length;
- }
- if (nextSlash <= protocolEnd + 1)
- {
- return false;
- }
- for (int x = protocolEnd + 1; x < nextSlash; x++)
- {
- if (uri[x] < '0' || uri[x] > '9')
- {
- return false;
- }
- }
- return true;
+ // No protocol, assume http
+ uri = "http://" + uri;
}
+ else if (isColonFollowedByPortNumber(uri, protocolEnd))
+ {
+ // Found a colon, but it looks like it is after the host, so the protocol is still missing
+ uri = "http://" + uri;
+ }
+ return uri;
+ }
+
+ private static bool isColonFollowedByPortNumber(string uri, int protocolEnd)
+ {
+ int nextSlash = uri.IndexOf('/', protocolEnd + 1);
+ if (nextSlash < 0)
+ {
+ nextSlash = uri.Length;
+ }
+ if (nextSlash <= protocolEnd + 1)
+ {
+ return false;
+ }
+ for (int x = protocolEnd + 1; x < nextSlash; x++)
+ {
+ if (uri[x] < '0' || uri[x] > '9')
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/URIResultParser.cs b/csharp/client/result/URIResultParser.cs
index 498513c76..0c97370aa 100755
--- a/csharp/client/result/URIResultParser.cs
+++ b/csharp/client/result/URIResultParser.cs
@@ -1,106 +1,62 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Text.RegularExpressions;
+
namespace com.google.zxing.client.result
{
-
- /// Tries to parse results that are a URI of some kind.
+
+ using Result = com.google.zxing.Result;
+
+
+ ///
+ /// Tries to parse results that are a URI of some kind.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class URIResultParser:ResultParser
+ public sealed class URIResultParser : ResultParser
{
-
- private URIResultParser()
+
+ private const string ALPHANUM_PART = "[a-zA-Z0-9\\-]";
+ private static readonly string URL_WITH_PROTOCOL_PATTERN = "[a-zA-Z0-9]{2,}:";
+ private static readonly string URL_WITHOUT_PROTOCOL_PATTERN = '(' + ALPHANUM_PART + "+\\.)+" + ALPHANUM_PART + "{2,}" + "(:\\d{1,5})?" + "(/|\\?|$)"; // query, path or nothing - maybe port - host name elements
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+ // We specifically handle the odd "URL" scheme here for simplicity and add "URI" for fun
+ // Assume anything starting this way really means to be a URI
+ if (rawText.StartsWith("URL:") || rawText.StartsWith("URI:"))
{
+ return new URIParsedResult(rawText.Substring(4).Trim(), null);
}
-
- public static URIParsedResult parse(Result result)
+ rawText = rawText.Trim();
+ return isBasicallyValidURI(rawText) ? new URIParsedResult(rawText, null) : null;
+ }
+
+ internal static bool isBasicallyValidURI(string uri)
+ {
+ Match m = Regex.Match(uri,URL_WITH_PROTOCOL_PATTERN) ;
+ if (m.Success && m.Index == 0) // match at start only
{
- System.String rawText = result.Text;
- // We specifically handle the odd "URL" scheme here for simplicity
- if (rawText != null && rawText.StartsWith("URL:"))
- {
- rawText = rawText.Substring(4);
- }
- if (!isBasicallyValidURI(rawText))
- {
- return null;
- }
- return new URIParsedResult(rawText, null);
- }
-
- /// Determines whether a string is not obviously not a URI. This implements crude checks; this class does not
- /// intend to strictly check URIs as its only function is to represent what is in a barcode, but, it does
- /// need to know when a string is obviously not a URI.
- ///
- internal static bool isBasicallyValidURI(System.String uri)
- {
- if (uri == null || uri.IndexOf(' ') >= 0 || uri.IndexOf('\n') >= 0)
- {
- return false;
- }
- // Look for period in a domain but followed by at least a two-char TLD
- // Forget strings that don't have a valid-looking protocol
- int period = uri.IndexOf('.');
- if (period >= uri.Length - 2)
- {
- return false;
- }
- int colon = uri.IndexOf(':');
- if (period < 0 && colon < 0)
- {
- return false;
- }
- if (colon >= 0)
- {
- if (period < 0 || period > colon)
- {
- // colon ends the protocol
- for (int i = 0; i < colon; i++)
- {
- char c = uri[i];
- if ((c < 'a' || c > 'z') && (c < 'A' || c > 'Z'))
- {
- return false;
- }
- }
- }
- else
- {
- // colon starts the port; crudely look for at least two numbers
- if (colon >= uri.Length - 2)
- {
- return false;
- }
- for (int i = colon + 1; i < colon + 3; i++)
- {
- char c = uri[i];
- if (c < '0' || c > '9')
- {
- return false;
- }
- }
- }
- }
- return true;
+ return true;
}
+ m = Regex.Match(uri,URL_WITHOUT_PROTOCOL_PATTERN);
+ return m.Success && m.Index == 0;
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/URLTOResultParser.cs b/csharp/client/result/URLTOResultParser.cs
index 9f3eea62b..8e36591ec 100755
--- a/csharp/client/result/URLTOResultParser.cs
+++ b/csharp/client/result/URLTOResultParser.cs
@@ -1,55 +1,50 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Parses the "URLTO" result format, which is of the form "URLTO:[title]:[url]".
+
+ using Result = com.google.zxing.Result;
+
+ ///
+ /// Parses the "URLTO" result format, which is of the form "URLTO:[title]:[url]".
/// This seems to be used sometimes, but I am not able to find documentation
/// on its origin or official format?
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class URLTOResultParser
+ public sealed class URLTOResultParser : ResultParser
{
-
- private URLTOResultParser()
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+ if (!rawText.StartsWith("urlto:") && !rawText.StartsWith("URLTO:"))
{
+ return null;
}
-
- public static URIParsedResult parse(Result result)
+ int titleEnd = rawText.IndexOf(':', 6);
+ if (titleEnd < 0)
{
- System.String rawText = result.Text;
- if (rawText == null || (!rawText.StartsWith("urlto:") && !rawText.StartsWith("URLTO:")))
- {
- return null;
- }
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- int titleEnd = rawText.IndexOf(':', 6);
- if (titleEnd < 0)
- {
- return null;
- }
- System.String title = titleEnd <= 6?null:rawText.Substring(6, (titleEnd) - (6));
- System.String uri = rawText.Substring(titleEnd + 1);
- return new URIParsedResult(uri, title);
+ return null;
}
+ string title = titleEnd <= 6 ? null : rawText.Substring(6, titleEnd - 6);
+ string uri = rawText.Substring(titleEnd + 1);
+ return new URIParsedResult(uri, title);
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/client/result/VCardResultParser.cs b/csharp/client/result/VCardResultParser.cs
index 66480e433..d55a5b529 100755
--- a/csharp/client/result/VCardResultParser.cs
+++ b/csharp/client/result/VCardResultParser.cs
@@ -1,230 +1,403 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using Result = com.google.zxing.Result;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using com.google.zxing.common;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Parses contact information formatted according to the VCard (2.1) format. This is not a complete
+
+ using Result = com.google.zxing.Result;
+
+
+ ///
+ /// Parses contact information formatted according to the VCard (2.1) format. This is not a complete
/// implementation but should parse information as commonly encoded in 2D barcodes.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class VCardResultParser:ResultParser
+ public sealed class VCardResultParser : ResultParser
{
-
- private VCardResultParser()
+
+ private static readonly string BEGIN_VCARD = "BEGIN:VCARD";
+ private static readonly string VCARD_LIKE_DATE = "\\d{4}-?\\d{2}-?\\d{2}";
+ private static readonly string CR_LF_SPACE_TAB = "\r\n[ \t]";
+ private static readonly string NEWLINE_ESCAPE = "\\\\[nN]";
+ private static readonly string VCARD_ESCAPES = "\\\\([,;\\\\])";
+ private static readonly string EQUALS = "=";
+ private static readonly string SEMICOLON = ";";
+ private static readonly string UNESCAPED_SEMICOLONS = "(?> names = matchVCardPrefixedField("FN", rawText, true, false);
+ if (names == null)
{
- // Although we should insist on the raw text ending with "END:VCARD", there's no reason
- // to throw out everything else we parsed just because this was omitted. In fact, Eclair
- // is doing just that, and we can't parse its contacts without this leniency.
- System.String rawText = result.Text;
- if (rawText == null || !rawText.StartsWith("BEGIN:VCARD"))
- {
- return null;
- }
- System.String[] names = matchVCardPrefixedField("FN", rawText, true);
- if (names == null)
- {
- // If no display names found, look for regular name fields and format them
- names = matchVCardPrefixedField("N", rawText, true);
- formatNames(names);
- }
- System.String[] phoneNumbers = matchVCardPrefixedField("TEL", rawText, true);
- System.String[] emails = matchVCardPrefixedField("EMAIL", rawText, true);
- System.String note = matchSingleVCardPrefixedField("NOTE", rawText, false);
- System.String[] addresses = matchVCardPrefixedField("ADR", rawText, true);
- if (addresses != null)
- {
- for (int i = 0; i < addresses.Length; i++)
- {
- addresses[i] = formatAddress(addresses[i]);
- }
- }
- System.String org = matchSingleVCardPrefixedField("ORG", rawText, true);
- System.String birthday = matchSingleVCardPrefixedField("BDAY", rawText, true);
- if (!isLikeVCardDate(birthday))
- {
- birthday = null;
- }
- System.String title = matchSingleVCardPrefixedField("TITLE", rawText, true);
- System.String url = matchSingleVCardPrefixedField("URL", rawText, true);
- return new AddressBookParsedResult(names, null, phoneNumbers, emails, note, addresses, org, birthday, title, url);
+ // If no display names found, look for regular name fields and format them
+ names = matchVCardPrefixedField("N", rawText, true, false);
+ formatNames(names);
}
-
- private static System.String[] matchVCardPrefixedField(System.String prefix, System.String rawText, bool trim)
+ IList> phoneNumbers = matchVCardPrefixedField("TEL", rawText, true, false);
+ IList> emails = matchVCardPrefixedField("EMAIL", rawText, true, false);
+ IList note = matchSingleVCardPrefixedField("NOTE", rawText, false, false);
+ IList> addresses = matchVCardPrefixedField("ADR", rawText, true, true);
+ IList org = matchSingleVCardPrefixedField("ORG", rawText, true, true);
+ IList birthday = matchSingleVCardPrefixedField("BDAY", rawText, true, false);
+ if (birthday != null && !isLikeVCardDate(birthday[0]))
{
- System.Collections.ArrayList matches = null;
- int i = 0;
- int max = rawText.Length;
- while (i < max)
- {
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- i = rawText.IndexOf(prefix, i);
- if (i < 0)
- {
- break;
- }
- if (i > 0 && rawText[i - 1] != '\n')
- {
- // then this didn't start a new token, we matched in the middle of something
- i++;
- continue;
- }
- i += prefix.Length; // Skip past this prefix we found to start
- if (rawText[i] != ':' && rawText[i] != ';')
- {
- continue;
- }
- while (rawText[i] != ':')
- {
- // Skip until a colon
- i++;
- }
- i++; // skip colon
- int start = i; // Found the start of a match here
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- i = rawText.IndexOf('\n', i); // Really, ends in \r\n
- if (i < 0)
- {
- // No terminating end character? uh, done. Set i such that loop terminates and break
- i = max;
- }
- else if (i > start)
- {
- // found a match
- if (matches == null)
- {
- matches = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(3)); // lazy init
- }
- System.String element = rawText.Substring(start, (i) - (start));
- if (trim)
- {
- element = element.Trim();
- }
- matches.Add(element);
- i++;
- }
- else
- {
- i++;
- }
- }
- if (matches == null || (matches.Count == 0))
- {
- return null;
- }
- return toStringArray(matches);
+ birthday = null;
}
-
- internal static System.String matchSingleVCardPrefixedField(System.String prefix, System.String rawText, bool trim)
+ IList title = matchSingleVCardPrefixedField("TITLE", rawText, true, false);
+ IList url = matchSingleVCardPrefixedField("URL", rawText, true, false);
+ IList instantMessenger = matchSingleVCardPrefixedField("IMPP", rawText, true, false);
+ return new AddressBookParsedResult(toPrimaryValues(names), null, toPrimaryValues(phoneNumbers), toTypes(phoneNumbers), toPrimaryValues(emails), toTypes(emails), toPrimaryValue(instantMessenger), toPrimaryValue(note), toPrimaryValues(addresses), toTypes(addresses), toPrimaryValue(org), toPrimaryValue(birthday), toPrimaryValue(title), toPrimaryValue(url));
+ }
+
+ internal static IList> matchVCardPrefixedField(string prefix, string rawText, bool trim, bool parseFieldDivider)
+ {
+ IList> matches = null;
+ int i = 0;
+ int max = rawText.Length;
+
+ while (i < max)
{
- System.String[] values = matchVCardPrefixedField(prefix, rawText, trim);
- return values == null?null:values[0];
- }
-
- private static bool isLikeVCardDate(System.String value_Renamed)
- {
- if (value_Renamed == null)
+
+ // At start or after newline, match prefix, followed by optional metadata
+ // (led by ;) ultimately ending in colon
+ //Matcher matcher = Pattern.compile("(?:^|\n)" + prefix + "(?:;([^:]*))?:", Pattern.CASE_INSENSITIVE).matcher(rawText);
+ Regex matcher = new Regex("(?:^|\n)" + prefix + "(?:;([^:]*))?:", RegexOptions.IgnoreCase);
+ //(rawText);
+ if (i > 0)
+ {
+ i--; // Find from i-1 not i since looking at the preceding character
+ }
+ //if (!matcher.find(i))
+ Match match = matcher.Match(rawText);
+ if (!match.Success)
+ {
+ break;
+ }
+ //i = matcher.end(0); // group 0 = whole pattern; end(0) is past final colon
+
+ i = match.Groups[0].Index + match.Groups[0].Length; // group 0 = whole pattern; end(0) is past final colon
+
+ string metadataString = match.Groups[1].Value; // group 1 = metadata substring
+ IList metadata = null;
+ bool quotedPrintable = false;
+ string quotedPrintableCharset = null;
+ if (metadataString != null)
+ {
+ foreach (string metadatum in SEMICOLON.Split(new string[] {metadataString},StringSplitOptions.None))
{
- return true;
- }
- // Not really sure this is true but matches practice
- // Mach YYYYMMDD
- if (isStringOfDigits(value_Renamed, 8))
- {
- return true;
- }
- // or YYYY-MM-DD
- return value_Renamed.Length == 10 && value_Renamed[4] == '-' && value_Renamed[7] == '-' && isSubstringOfDigits(value_Renamed, 0, 4) && isSubstringOfDigits(value_Renamed, 5, 2) && isSubstringOfDigits(value_Renamed, 8, 2);
- }
-
- private static System.String formatAddress(System.String address)
- {
- if (address == null)
- {
- return null;
- }
- int length = address.Length;
- System.Text.StringBuilder newAddress = new System.Text.StringBuilder(length);
- for (int j = 0; j < length; j++)
- {
- char c = address[j];
- if (c == ';')
+ if (metadata == null)
+ {
+ metadata = new List(1);
+ }
+ metadata.Add(metadatum);
+ //string[] metadatumTokens = EQUALS.Split(metadatum, 2);
+ string[] metadatumTokens = EQUALS.Split(new string[] {metadatum},2,StringSplitOptions.None);
+ if (metadatumTokens.Length > 1)
+ {
+ string key = metadatumTokens[0];
+ string value = metadatumTokens[1];
+ if ("ENCODING"== key.ToUpper() && "QUOTED-PRINTABLE"==value.ToUpper())
{
- newAddress.Append(' ');
+ quotedPrintable = true;
}
- else
+ else if ("CHARSET" == key.ToUpper())
{
- newAddress.Append(c);
+ quotedPrintableCharset = value;
}
+ }
}
- return newAddress.ToString().Trim();
- }
-
- /// Formats name fields of the form "Public;John;Q.;Reverend;III" into a form like
- /// "Reverend John Q. Public III".
- ///
- ///
- /// name values to format, in place
- ///
- private static void formatNames(System.String[] names)
- {
- if (names != null)
+ }
+
+ int matchStart = i; // Found the start of a match here
+
+ while ((i =(int) rawText.IndexOf( '\n', i)) >= 0) // Really, end in \r\n
+ {
+ if (i < rawText.Length - 1 && (rawText[i + 1] == ' ' || rawText[i + 1] == '\t')) // this is only a continuation - But if followed by tab or space,
{
- for (int i = 0; i < names.Length; i++)
+ i += 2; // Skip \n and continutation whitespace
+ } // If preceded by = in quoted printable
+ else if (quotedPrintable && ((i >= 1 && rawText[i - 1] == '=') || (i >= 2 && rawText[i - 2] == '='))) // this is a continuation
+ {
+ i++; // Skip \n
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ if (i < 0)
+ {
+ // No terminating end character? uh, done. Set i such that loop terminates and break
+ i = max;
+ }
+ else if (i > matchStart)
+ {
+ // found a match
+ if (matches == null)
+ {
+ matches = new List>(1); // lazy init
+ }
+ if (i >= 1 && rawText[i - 1] == '\r')
+ {
+ i--; // Back up over \r, which really should be there
+ }
+ string element = rawText.Substring(matchStart, i - matchStart);
+ if (trim)
+ {
+ element = element.Trim();
+ }
+ if (quotedPrintable)
+ {
+ element = decodeQuotedPrintable(element, quotedPrintableCharset);
+ if (parseFieldDivider)
+ {
+ //element = UNESCAPED_SEMICOLONS.matcher(element).replaceAll("\n").Trim();
+ element = new Regex(UNESCAPED_SEMICOLONS).Replace(element,("\n")).Trim();
+ }
+ }
+ else
+ {
+ if (parseFieldDivider)
+ {
+ //element = UNESCAPED_SEMICOLONS.matcher(element).replaceAll("\n").Trim();
+ element = new Regex(UNESCAPED_SEMICOLONS).Replace(element,"\n").Trim();
+ }
+ //element = CR_LF_SPACE_TAB.matcher(element).replaceAll("");
+ element = new Regex(CR_LF_SPACE_TAB).Replace(element,"");
+ //element = NEWLINE_ESCAPE.matcher(element).replaceAll("\n");
+ element = new Regex(NEWLINE_ESCAPE).Replace(element,"\n");
+ //element = VCARD_ESCAPES.matcher(element).replaceAll("$1");
+ element = new Regex(VCARD_ESCAPES).Replace(element,"$1");
+ }
+ if (metadata == null)
+ {
+ IList matchList = new List(1);
+ matchList.Add(element);
+ matches.Add(matchList);
+ }
+ else
+ {
+ metadata.Insert(0, element);
+ matches.Add(metadata);
+ }
+ i++;
+ }
+ else
+ {
+ i++;
+ }
+
+ }
+
+ return matches;
+ }
+
+ private static string decodeQuotedPrintable(string value, string charset)
+ {
+ int length = value.Length;
+ StringBuilder result = new StringBuilder(length);
+ MemoryStream fragmentBuffer = new MemoryStream();
+ for (int i = 0; i < length; i++)
+ {
+ char c = value[i];
+ switch (c)
+ {
+ case '\r':
+ case '\n':
+ break;
+ case '=':
+ if (i < length - 2)
+ {
+ char nextChar = value[i + 1];
+ if (nextChar != '\r' && nextChar != '\n')
{
- System.String name = names[i];
- System.String[] components = new System.String[5];
- int start = 0;
- int end;
- int componentIndex = 0;
- //UPGRADE_WARNING: Method 'java.lang.String.indexOf' was converted to 'System.String.IndexOf' which may throw an exception. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1101'"
- while ((end = name.IndexOf(';', start)) > 0)
- {
- components[componentIndex] = name.Substring(start, (end) - (start));
- componentIndex++;
- start = end + 1;
- }
- components[componentIndex] = name.Substring(start);
- System.Text.StringBuilder newName = new System.Text.StringBuilder(100);
- maybeAppendComponent(components, 3, newName);
- maybeAppendComponent(components, 1, newName);
- maybeAppendComponent(components, 2, newName);
- maybeAppendComponent(components, 0, newName);
- maybeAppendComponent(components, 4, newName);
- names[i] = newName.ToString().Trim();
+ char nextNextChar = value[i + 2];
+ int firstDigit = parseHexDigit(nextChar);
+ int secondDigit = parseHexDigit(nextNextChar);
+ if (firstDigit >= 0 && secondDigit >= 0)
+ {
+ fragmentBuffer.WriteByte((byte)((firstDigit << 4) + secondDigit));
+ } // else ignore it, assume it was incorrectly encoded
+ i += 2;
}
- }
+ }
+ break;
+ default:
+ maybeAppendFragment(fragmentBuffer, charset, result);
+ result.Append(c);
+ break;
+ }
}
-
- private static void maybeAppendComponent(System.String[] components, int i, System.Text.StringBuilder newName)
+ maybeAppendFragment(fragmentBuffer, charset, result);
+ return result.ToString();
+ }
+
+ private static void maybeAppendFragment(MemoryStream fragmentBuffer, string charset, StringBuilder result)
+ {
+ Encoding en = Encoding.GetEncoding(charset);
+ Encoding enFallback = Encoding.UTF8;
+ if (fragmentBuffer.Length > 0)
{
- if (components[i] != null)
+ sbyte[] fragmentBytes = fragmentBuffer.ToArray().ToSBytes();
+ string fragment;
+ if (charset == null)
+ {
+ fragment = en.GetString((byte[])(Array)fragmentBytes); ;
+ }
+ else
+ {
+ try
{
- newName.Append(' ');
- newName.Append(components[i]);
+ fragment = en.GetString((byte[])(Array)fragmentBytes); ;
}
+ catch (ArgumentException e)
+ {
+ // Yikes, well try anyway:
+ //fragment = new string(fragmentBytes);
+ fragment = enFallback.GetString((byte[]) (Array) fragmentBytes);
+ }
+ }
+ fragmentBuffer.Position=0;
+ result.Append(fragment);
}
+ }
+
+ internal static IList matchSingleVCardPrefixedField(string prefix, string rawText, bool trim, bool parseFieldDivider)
+ {
+ IList> values = matchVCardPrefixedField(prefix, rawText, trim, parseFieldDivider);
+ return values == null || values.Count == 0 ? null : values[0];
+ }
+
+ private static string toPrimaryValue(IList list)
+ {
+ return list == null || list.Count == 0 ? null : list[0];
+ }
+
+ private static string[] toPrimaryValues(ICollection> lists)
+ {
+ if (lists == null || lists.Count == 0)
+ {
+ return null;
+ }
+ List result = new List(lists.Count);
+ foreach (IList list in lists)
+ {
+ result.Add(list[0]);
+ }
+ return result.ToArray();
+ }
+
+ private static string[] toTypes(ICollection> lists)
+ {
+ if (lists == null || lists.Count == 0)
+ {
+ return null;
+ }
+ List result = new List(lists.Count);
+ foreach (IList list in lists)
+ {
+ string type = null;
+ for (int i = 1; i < list.Count; i++)
+ {
+ string metadatum = list[i];
+ int equals = metadatum.IndexOf('=');
+ if (equals < 0)
+ {
+ // take the whole thing as a usable label
+ type = metadatum;
+ break;
+ }
+ if ("TYPE" == (metadatum.Substring(0, equals)).ToUpper())
+ {
+ type = metadatum.Substring(equals + 1);
+ break;
+ }
+ }
+ result.Add(type);
+ }
+ return result.ToArray();
+ }
+
+ private static bool isLikeVCardDate(string value)
+ {
+ //return value == null || VCARD_LIKE_DATE.matcher(value).matches();
+ return value == null || new Regex(VCARD_LIKE_DATE).IsMatch(value);
+ }
+
+ ///
+ /// Formats name fields of the form "Public;John;Q.;Reverend;III" into a form like
+ /// "Reverend John Q. Public III".
+ ///
+ /// name values to format, in place
+ private static void formatNames(IEnumerable> names)
+ {
+ if (names != null)
+ {
+ foreach (IList list in names)
+ {
+ string name = list[0];
+ string[] components = new string[5];
+ int start = 0;
+ int end;
+ int componentIndex = 0;
+ while (componentIndex < components.Length - 1 && (end = name.IndexOf(';', start)) > 0)
+ {
+ components[componentIndex] = name.Substring(start, end - start);
+ componentIndex++;
+ start = end + 1;
+ }
+ components[componentIndex] = name.Substring(start);
+ StringBuilder newName = new StringBuilder(100);
+ maybeAppendComponent(components, 3, newName);
+ maybeAppendComponent(components, 1, newName);
+ maybeAppendComponent(components, 2, newName);
+ maybeAppendComponent(components, 0, newName);
+ maybeAppendComponent(components, 4, newName);
+ list[0] = newName.ToString().Trim();
+ }
+ }
+ }
+
+ private static void maybeAppendComponent(string[] components, int i, StringBuilder newName)
+ {
+ if (components[i] != null)
+ {
+ newName.Append(' ');
+ newName.Append(components[i]);
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/client/result/VEventResultParser.cs b/csharp/client/result/VEventResultParser.cs
index 2b331dd9d..4d9756d91 100755
--- a/csharp/client/result/VEventResultParser.cs
+++ b/csharp/client/result/VEventResultParser.cs
@@ -1,67 +1,129 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using Result = com.google.zxing.Result;
+using System.Collections.Generic;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.client.result
{
-
- /// Partially implements the iCalendar format's "VEVENT" format for specifying a
- /// calendar event. See RFC 2445. This supports SUMMARY, DTSTART and DTEND fields.
+
+ using Result = com.google.zxing.Result;
+
+
+ ///
+ /// Partially implements the iCalendar format's "VEVENT" format for specifying a
+ /// calendar event. See RFC 2445. This supports SUMMARY, LOCATION, GEO, DTSTART and DTEND fields.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class VEventResultParser:ResultParser
+ public sealed class VEventResultParser : ResultParser
{
-
- private VEventResultParser()
+
+ public override ParsedResult parse(Result result)
+ {
+ string rawText = getMassagedText(result);
+ int vEventStart = rawText.IndexOf("BEGIN:VEVENT");
+ if (vEventStart < 0)
{
+ return null;
}
-
- public static CalendarParsedResult parse(Result result)
+
+ string summary = matchSingleVCardPrefixedField("SUMMARY", rawText, true);
+ string start = matchSingleVCardPrefixedField("DTSTART", rawText, true);
+ if (start == null)
{
- System.String rawText = result.Text;
- if (rawText == null)
- {
- return null;
- }
- int vEventStart = rawText.IndexOf("BEGIN:VEVENT");
- if (vEventStart < 0)
- {
- return null;
- }
- int vEventEnd = rawText.IndexOf("END:VEVENT");
- if (vEventEnd < 0)
- {
- return null;
- }
-
- System.String summary = VCardResultParser.matchSingleVCardPrefixedField("SUMMARY", rawText, true);
- System.String start = VCardResultParser.matchSingleVCardPrefixedField("DTSTART", rawText, true);
- System.String end = VCardResultParser.matchSingleVCardPrefixedField("DTEND", rawText, true);
- try
- {
- return new CalendarParsedResult(summary, start, end, null, null, null);
- }
- catch (System.ArgumentException)
- {
- return null;
- }
+ return null;
}
+ string end = matchSingleVCardPrefixedField("DTEND", rawText, true);
+ string duration = matchSingleVCardPrefixedField("DURATION", rawText, true);
+ string location = matchSingleVCardPrefixedField("LOCATION", rawText, true);
+ string organizer = stripMailto(matchSingleVCardPrefixedField("ORGANIZER", rawText, true));
+
+ string[] attendees = matchVCardPrefixedField("ATTENDEE", rawText, true);
+ if (attendees != null)
+ {
+ for (int i = 0; i < attendees.Length; i++)
+ {
+ attendees[i] = stripMailto(attendees[i]);
+ }
+ }
+ string description = matchSingleVCardPrefixedField("DESCRIPTION", rawText, true);
+
+ string geoString = matchSingleVCardPrefixedField("GEO", rawText, true);
+ double latitude;
+ double longitude;
+ if (geoString == null)
+ {
+ latitude = double.NaN;
+ longitude = double.NaN;
+ }
+ else
+ {
+ int semicolon = geoString.IndexOf(';');
+ try
+ {
+ latitude = Convert.ToDouble(geoString.Substring(0, semicolon));
+ longitude = Convert.ToDouble(geoString.Substring(semicolon + 1));
+ }
+ catch (FormatException nfe)
+ {
+ return null;
+ }
+ }
+
+ try
+ {
+ return new CalendarParsedResult(summary, start, end, duration, location, organizer, attendees, description, latitude, longitude);
+ }
+ catch (System.ArgumentException iae)
+ {
+ return null;
+ }
+ }
+
+ private static string matchSingleVCardPrefixedField(string prefix, string rawText, bool trim)
+ {
+ IList values = VCardResultParser.matchSingleVCardPrefixedField(prefix, rawText, trim, false);
+ return values == null || values.Count == 0 ? null : values[0];
+ }
+
+ private static string[] matchVCardPrefixedField(string prefix, string rawText, bool trim)
+ {
+ IList> values = VCardResultParser.matchVCardPrefixedField(prefix, rawText, trim, false);
+ if (values == null || values.Count == 0)
+ {
+ return null;
+ }
+ int size = values.Count;
+ string[] result = new string[size];
+ for (int i = 0; i < size; i++)
+ {
+ result[i] = values[i][0];
+ }
+ return result;
+ }
+
+ private static string stripMailto(string s)
+ {
+ if (s != null && (s.StartsWith("mailto:") || s.StartsWith("MAILTO:")))
+ {
+ s = s.Substring(7);
+ }
+ return s;
+ }
+
}
-}
+}
\ No newline at end of file
diff --git a/csharp/common/BitArray.cs b/csharp/common/BitArray.cs
index 51f277690..81708c066 100755
--- a/csharp/common/BitArray.cs
+++ b/csharp/common/BitArray.cs
@@ -1,208 +1,382 @@
-/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
+using System.Collections;
+using System.Text;
+
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common
{
-
- /// A simple, fast array of bits, represented compactly by an array of ints internally.
+
+ ///
+ /// A simple, fast array of bits, represented compactly by an array of ints internally.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class BitArray
{
- public int Size
+
+ private int[] bits;
+ private int size;
+
+ public BitArray()
+ {
+ this.size = 0;
+ this.bits = new int[1];
+ }
+
+ public BitArray(int size)
+ {
+ this.size = size;
+ this.bits = makeArray(size);
+ }
+
+ public int Size
+ {
+ get
+ {
+ return size;
+ }
+ }
+
+ public int SizeInBytes
+ {
+ get
+ {
+ return (size + 7) >> 3;
+ }
+ }
+
+ private void ensureCapacity(int size)
+ {
+ if (size > bits.Length << 5)
{
- get
+ int[] newBits = makeArray(size);
+ Array.Copy(bits, 0, newBits, 0, bits.Length);
+ this.bits = newBits;
+ }
+ }
+
+ /// bit to get
+ /// true iff bit i is set
+ public bool get(int i)
+ {
+ return (bits[i >> 5] & (1 << (i & 0x1F))) != 0;
+ }
+
+ ///
+ /// Sets bit i.
+ ///
+ /// bit to set
+ public void set(int i)
+ {
+ bits[i >> 5] |= 1 << (i & 0x1F);
+ }
+
+ ///
+ /// Flips bit i.
+ ///
+ /// bit to set
+ public void flip(int i)
+ {
+ bits[i >> 5] ^= 1 << (i & 0x1F);
+ }
+
+ /// first bit to check
+ /// index of first bit that is set, starting from the given index, or size if none are set
+ /// at or beyond this given index
+ ///
+ public int getNextSet(int from)
+ {
+ if (from >= size)
+ {
+ return size;
+ }
+ int bitsOffset = from >> 5;
+ int currentBits = bits[bitsOffset];
+ // mask off lesser bits first
+ currentBits &= ~((1 << (from & 0x1F)) - 1);
+ while (currentBits == 0)
+ {
+ if (++bitsOffset == bits.Length)
+ {
+ return size;
+ }
+ currentBits = bits[bitsOffset];
+ }
+ //int result = (bitsOffset << 5) + int.numberOfTrailingZeros(currentBits);
+ int result = (bitsOffset << 5) + currentBits.NumberOfTrailingZeros();
+ return result > size ? size : result;
+ }
+
+ ///
+ public int getNextUnset(int from)
+ {
+ if (from >= size)
+ {
+ return size;
+ }
+ int bitsOffset = from >> 5;
+ int currentBits = ~bits[bitsOffset];
+ // mask off lesser bits first
+ currentBits &= ~((1 << (from & 0x1F)) - 1);
+ while (currentBits == 0)
+ {
+ if (++bitsOffset == bits.Length)
+ {
+ return size;
+ }
+ currentBits = ~bits[bitsOffset];
+ }
+ //int result = (bitsOffset << 5) + int.numberOfTrailingZeros(currentBits);
+ int result = (bitsOffset << 5) + currentBits.NumberOfTrailingZeros();
+ return result > size ? size : result;
+ }
+
+ ///
+ /// Sets a block of 32 bits, starting at bit i.
+ ///
+ /// first bit to set
+ /// the new value of the next 32 bits. Note again that the least-significant bit
+ /// corresponds to bit i, the next-least-significant to i+1, and so on.
+ public void setBulk(int i, int newBits)
+ {
+ bits[i >> 5] = newBits;
+ }
+
+ ///
+ /// Sets a range of bits.
+ ///
+ /// start of range, inclusive.
+ /// end of range, exclusive
+ public void setRange(int start, int end)
+ {
+ if (end < start)
+ {
+ throw new System.ArgumentException();
+ }
+ if (end == start)
+ {
+ return;
+ }
+ end--; // will be easier to treat this as the last actually set bit -- inclusive
+ int firstInt = start >> 5;
+ int lastInt = end >> 5;
+ for (int i = firstInt; i <= lastInt; i++)
+ {
+ int firstBit = i > firstInt ? 0 : start & 0x1F;
+ int lastBit = i < lastInt ? 31 : end & 0x1F;
+ int mask;
+ if (firstBit == 0 && lastBit == 31)
+ {
+ mask = -1;
+ }
+ else
+ {
+ mask = 0;
+ for (int j = firstBit; j <= lastBit; j++)
{
- return size;
+ mask |= 1 << j;
}
-
+ }
+ bits[i] |= mask;
}
-
- // TODO: I have changed these members to be public so ProGuard can inline get() and set(). Ideally
- // they'd be private and we'd use the -allowaccessmodification flag, but Dalvik rejects the
- // resulting binary at runtime on Android. If we find a solution to this, these should be changed
- // back to private.
- public int[] bits;
- //UPGRADE_NOTE: Final was removed from the declaration of 'size '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public int size;
-
- public BitArray(int size)
+ }
+
+ ///
+ /// Clears all bits (sets to false).
+ ///
+ public void clear()
+ {
+ int max = bits.Length;
+ for (int i = 0; i < max; i++)
{
- if (size < 1)
+ bits[i] = 0;
+ }
+ }
+
+ ///
+ /// Efficient method to check if a range of bits is set, or not set.
+ ///
+ /// start of range, inclusive.
+ /// end of range, exclusive
+ /// if true, checks that bits in range are set, otherwise checks that they are not set
+ /// true iff all bits are set or not set in range, according to value argument
+ /// if end is less than or equal to start
+ public bool isRange(int start, int end, bool value)
+ {
+ if (end < start)
+ {
+ throw new System.ArgumentException();
+ }
+ if (end == start)
+ {
+ return true; // empty range matches
+ }
+ end--; // will be easier to treat this as the last actually set bit -- inclusive
+ int firstInt = start >> 5;
+ int lastInt = end >> 5;
+ for (int i = firstInt; i <= lastInt; i++)
+ {
+ int firstBit = i > firstInt ? 0 : start & 0x1F;
+ int lastBit = i < lastInt ? 31 : end & 0x1F;
+ int mask;
+ if (firstBit == 0 && lastBit == 31)
+ {
+ mask = -1;
+ }
+ else
+ {
+ mask = 0;
+ for (int j = firstBit; j <= lastBit; j++)
{
- throw new System.ArgumentException("size must be at least 1");
+ mask |= 1 << j;
}
- this.size = size;
- this.bits = makeArray(size);
+ }
+
+ // Return false if we're looking for 1s and the masked bits[i] isn't all 1s (that is,
+ // equals the mask, or we're looking for 0s and the masked portion is not all 0s
+ if ((bits[i] & mask) != (value ? mask : 0))
+ {
+ return false;
+ }
}
-
- /// bit to get
- ///
- /// true iff bit i is set
- ///
- public bool get_Renamed(int i)
+ return true;
+ }
+
+ public void appendBit(bool bit)
+ {
+ ensureCapacity(size + 1);
+ if (bit)
{
- return (bits[i >> 5] & (1 << (i & 0x1F))) != 0;
+ bits[size >> 5] |= 1 << (size & 0x1F);
}
-
- /// Sets bit i.
- ///
- ///
- /// bit to set
- ///
- public void set_Renamed(int i)
+ size++;
+ }
+
+ ///
+ /// Appends the least-significant bits, from value, in order from most-significant to
+ /// least-significant. For example, appending 6 bits from 0x000001E will append the bits
+ /// 0, 1, 1, 1, 1, 0 in that order.
+ ///
+ public void appendBits(int value, int numBits)
+ {
+ if (numBits < 0 || numBits > 32)
{
- bits[i >> 5] |= 1 << (i & 0x1F);
+ throw new System.ArgumentException("Num bits must be between 0 and 32");
}
-
- /// Flips bit i.
- ///
- ///
- /// bit to set
- ///
- public void flip(int i)
+ ensureCapacity(size + numBits);
+ for (int numBitsLeft = numBits; numBitsLeft > 0; numBitsLeft--)
{
- bits[i >> 5] ^= 1 << (i & 0x1F);
+ appendBit(((value >> (numBitsLeft - 1)) & 0x01) == 1);
}
-
- /// Sets a block of 32 bits, starting at bit i.
- ///
- ///
- /// first bit to set
- ///
- /// the new value of the next 32 bits. Note again that the least-significant bit
- /// corresponds to bit i, the next-least-significant to i+1, and so on.
- ///
- public void setBulk(int i, int newBits)
+ }
+
+ public void appendBitArray(BitArray other)
+ {
+ int otherSize = other.size;
+ ensureCapacity(size + otherSize);
+ for (int i = 0; i < otherSize; i++)
{
- bits[i >> 5] = newBits;
+ appendBit(other.get(i));
}
-
- /// Clears all bits (sets to false).
- public void clear()
+ }
+
+ public void xor(BitArray other)
+ {
+ if (bits.Length != other.bits.Length)
{
- int max = bits.Length;
- for (int i = 0; i < max; i++)
+ throw new System.ArgumentException("Sizes don't match");
+ }
+ for (int i = 0; i < bits.Length; i++)
+ {
+ // The last byte could be incomplete (i.e. not have 8 bits in
+ // it) but there is no problem since 0 XOR 0 == 0.
+ bits[i] ^= other.bits[i];
+ }
+ }
+
+ ///
+ /// first bit to start writing
+ /// array to write into. Bytes are written most-significant byte first. This is the opposite
+ /// of the internal representation, which is exposed by
+ /// position in array to start writing
+ /// how many bytes to write
+ public void toBytes(int bitOffset, sbyte[] array, int offset, int numBytes)
+ {
+ for (int i = 0; i < numBytes; i++)
+ {
+ int theByte = 0;
+ for (int j = 0; j < 8; j++)
+ {
+ if (get(bitOffset))
{
- bits[i] = 0;
+ theByte |= 1 << (7 - j);
}
+ bitOffset++;
+ }
+ array[offset + i] = (sbyte) theByte;
}
-
- /// Efficient method to check if a range of bits is set, or not set.
- ///
- ///
- /// start of range, inclusive.
- ///
- /// end of range, exclusive
- ///
- /// if true, checks that bits in range are set, otherwise checks that they are not set
- ///
- /// true iff all bits are set or not set in range, according to value argument
- ///
- /// IllegalArgumentException if end is less than or equal to start
- public bool isRange(int start, int end, bool value_Renamed)
- {
- if (end < start)
- {
- throw new System.ArgumentException();
- }
- if (end == start)
- {
- return true; // empty range matches
- }
- end--; // will be easier to treat this as the last actually set bit -- inclusive
- int firstInt = start >> 5;
- int lastInt = end >> 5;
- for (int i = firstInt; i <= lastInt; i++)
- {
- int firstBit = i > firstInt?0:start & 0x1F;
- int lastBit = i < lastInt?31:end & 0x1F;
- int mask;
- if (firstBit == 0 && lastBit == 31)
- {
- mask = - 1;
- }
- else
- {
- mask = 0;
- for (int j = firstBit; j <= lastBit; j++)
- {
- mask |= 1 << j;
- }
- }
-
- // Return false if we're looking for 1s and the masked bits[i] isn't all 1s (that is,
- // equals the mask, or we're looking for 0s and the masked portion is not all 0s
- if ((bits[i] & mask) != (value_Renamed?mask:0))
- {
- return false;
- }
- }
- return true;
- }
-
- /// underlying array of ints. The first element holds the first 32 bits, and the least
- /// significant bit is bit 0.
- ///
- public int[] getBitArray()
- {
+ }
+
+ /// underlying array of ints. The first element holds the first 32 bits, and the least
+ /// significant bit is bit 0.
+ public int[] BitArrayBits
+ {
+ get
+ {
return bits;
- }
-
- /// Reverses all bits in the array.
- public void reverse()
+ }
+ }
+
+ ///
+ /// Reverses all bits in the array.
+ ///
+ public void reverse()
+ {
+ int[] newBits = new int[bits.Length];
+ int size = this.size;
+ for (int i = 0; i < size; i++)
{
- int[] newBits = new int[bits.Length];
- int size = this.size;
- for (int i = 0; i < size; i++)
- {
- if (get_Renamed(size - i - 1))
- {
- newBits[i >> 5] |= 1 << (i & 0x1F);
- }
- }
- bits = newBits;
+ if (get(size - i - 1))
+ {
+ newBits[i >> 5] |= 1 << (i & 0x1F);
+ }
}
-
- private static int[] makeArray(int size)
+ bits = newBits;
+ }
+
+ private static int[] makeArray(int size)
+ {
+ return new int[(size + 31) >> 5];
+ }
+
+ public override string ToString()
+ {
+ StringBuilder result = new StringBuilder(size);
+ for (int i = 0; i < size; i++)
{
- int arraySize = size >> 5;
- if ((size & 0x1F) != 0)
- {
- arraySize++;
- }
- return new int[arraySize];
- }
-
- public override System.String ToString()
- {
- System.Text.StringBuilder result = new System.Text.StringBuilder(size);
- for (int i = 0; i < size; i++)
- {
- if ((i & 0x07) == 0)
- {
- result.Append(' ');
- }
- result.Append(get_Renamed(i)?'X':'.');
- }
- return result.ToString();
+ if ((i & 0x07) == 0)
+ {
+ result.Append(' ');
+ }
+ result.Append(get(i) ? 'X' : '.');
}
+ return result.ToString();
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/common/BitMatrix.cs b/csharp/common/BitMatrix.cs
index 6612ff443..f999943f0 100755
--- a/csharp/common/BitMatrix.cs
+++ b/csharp/common/BitMatrix.cs
@@ -1,23 +1,28 @@
-/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
+using System.Collections;
+using System.Text;
+
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common
{
-
- /// Represents a 2D matrix of bits. In function arguments below, and throughout the common
+
+ ///
+ /// Represents a 2D matrix of bits. In function arguments below, and throughout the common
/// module, x is the column position, and y is the row position. The ordering is always x, y.
/// The origin is at the top-left.
///
@@ -28,210 +33,335 @@ namespace com.google.zxing.common
/// The ordering of bits is row-major. Within each int, the least significant bits are used first,
/// meaning they represent lower x values. This is compatible with BitArray's implementation.
///
+ /// @author Sean Owen
+ /// @author dswitkin@google.com (Daniel Switkin)
///
- /// Sean Owen
- ///
- /// dswitkin@google.com (Daniel Switkin)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class BitMatrix
{
- /// The width of the matrix
- ///
- public int Width
+
+ private readonly int width;
+ private readonly int height;
+ private readonly int rowSize;
+ private readonly int[] bits;
+
+ // A helper to construct a square matrix.
+ public BitMatrix(int dimension) : this(dimension, dimension)
+ {
+ }
+
+ public BitMatrix(int width, int height)
+ {
+ if (width < 1 || height < 1)
{
- get
- {
- return width;
- }
-
+ throw new System.ArgumentException("Both dimensions must be greater than 0");
}
- /// The height of the matrix
- ///
- public int Height
+ this.width = width;
+ this.height = height;
+ this.rowSize = (width + 31) >> 5;
+ bits = new int[rowSize * height];
+ }
+
+ ///
+ /// Gets the requested bit, where true means black.
+ ///
+ /// The horizontal component (i.e. which column)
+ /// The vertical component (i.e. which row)
+ /// value of given bit in matrix
+ public bool get(int x, int y)
+ {
+ int offset = y * rowSize + (x >> 5);
+ return (((int)((uint)bits[offset] >> (x & 0x1f))) & 1) != 0;
+ }
+
+ ///
+ /// Sets the given bit to true.
+ ///
+ /// The horizontal component (i.e. which column)
+ /// The vertical component (i.e. which row)
+ public void set(int x, int y)
+ {
+ int offset = y * rowSize + (x >> 5);
+ bits[offset] |= 1 << (x & 0x1f);
+ }
+
+ ///
+ /// Flips the given bit.
+ ///
+ /// The horizontal component (i.e. which column)
+ /// The vertical component (i.e. which row)
+ public void flip(int x, int y)
+ {
+ int offset = y * rowSize + (x >> 5);
+ bits[offset] ^= 1 << (x & 0x1f);
+ }
+
+ ///
+ /// Clears all bits (sets to false).
+ ///
+ public void clear()
+ {
+ int max = bits.Length;
+ for (int i = 0; i < max; i++)
{
- get
- {
- return height;
- }
-
+ bits[i] = 0;
}
- /// This method is for compatibility with older code. It's only logical to call if the matrix
- /// is square, so I'm throwing if that's not the case.
- ///
- ///
- /// row/column dimension of this matrix
- ///
- public int Dimension
+ }
+
+ ///
+ /// Sets a square region of the bit matrix to true.
+ ///
+ /// The horizontal position to begin at (inclusive)
+ /// The vertical position to begin at (inclusive)
+ /// The width of the region
+ /// The height of the region
+ public void setRegion(int left, int top, int width, int height)
+ {
+ if (top < 0 || left < 0)
{
- get
+ throw new System.ArgumentException("Left and top must be nonnegative");
+ }
+ if (height < 1 || width < 1)
+ {
+ throw new System.ArgumentException("Height and width must be at least 1");
+ }
+ int right = left + width;
+ int bottom = top + height;
+ if (bottom > this.height || right > this.width)
+ {
+ throw new System.ArgumentException("The region must fit inside the matrix");
+ }
+ for (int y = top; y < bottom; y++)
+ {
+ int offset = y * rowSize;
+ for (int x = left; x < right; x++)
+ {
+ bits[offset + (x >> 5)] |= 1 << (x & 0x1f);
+ }
+ }
+ }
+
+ ///
+ /// A fast method to retrieve one row of data from the matrix as a BitArray.
+ ///
+ /// The row to retrieve
+ /// An optional caller-allocated BitArray, will be allocated if null or too small
+ /// The resulting BitArray - this reference should always be used even when passing
+ /// your own row
+ public BitArray getRow(int y, BitArray row)
+ {
+ if (row == null || row.Size < width)
+ {
+ row = new BitArray(width);
+ }
+ int offset = y * rowSize;
+ for (int x = 0; x < rowSize; x++)
+ {
+ row.setBulk(x << 5, bits[offset + x]);
+ }
+ return row;
+ }
+
+ /// row to set
+ /// to copy from
+ public void setRow(int y, BitArray row)
+ {
+ Array.Copy(row.BitArrayBits, 0, bits, y * rowSize, rowSize);
+ }
+
+ ///
+ /// This is useful in detecting the enclosing rectangle of a 'pure' barcode.
+ ///
+ /// {left,top,width,height} enclosing rectangle of all 1 bits, or null if it is all white
+ public int[] EnclosingRectangle
+ {
+ get
+ {
+ int left = this.width;
+ int top = this.height;
+ int right = -1;
+ int bottom = -1;
+
+ for (int y = 0; y < this.height; y++)
{
- if (width != height)
+ for (int x32 = 0; x32 < rowSize; x32++)
+ {
+ int theBits = bits[y * rowSize + x32];
+ if (theBits != 0)
{
- throw new System.SystemException("Can't call getDimension() on a non-square matrix");
+ if (y < top)
+ {
+ top = y;
+ }
+ if (y > bottom)
+ {
+ bottom = y;
+ }
+ if (x32 * 32 < left)
+ {
+ int bit = 0;
+ while ((theBits << (31 - bit)) == 0)
+ {
+ bit++;
+ }
+ if ((x32 * 32 + bit) < left)
+ {
+ left = x32 * 32 + bit;
+ }
+ }
+ if (x32 * 32 + 31 > right)
+ {
+ int bit = 31;
+ while (((int)((uint)theBits >> bit)) == 0)
+ {
+ bit--;
+ }
+ if ((x32 * 32 + bit) > right)
+ {
+ right = x32 * 32 + bit;
+ }
+ }
}
- return width;
+ }
}
-
- }
-
- // TODO: Just like BitArray, these need to be public so ProGuard can inline them.
- //UPGRADE_NOTE: Final was removed from the declaration of 'width '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public int width;
- //UPGRADE_NOTE: Final was removed from the declaration of 'height '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public int height;
- //UPGRADE_NOTE: Final was removed from the declaration of 'rowSize '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public int rowSize;
- //UPGRADE_NOTE: Final was removed from the declaration of 'bits '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- public int[] bits;
-
- // A helper to construct a square matrix.
- public BitMatrix(int dimension):this(dimension, dimension)
+
+ int width = right - left;
+ int height = bottom - top;
+
+ if (width < 0 || height < 0)
+ {
+ return null;
+ }
+
+ return new int[] {left, top, width, height};
+ }
+ }
+
+ ///
+ /// This is useful in detecting a corner of a 'pure' barcode.
+ ///
+ /// {x,y} coordinate of top-left-most 1 bit, or null if it is all white
+ public int[] TopLeftOnBit
+ {
+ get
+ {
+ int bitsOffset = 0;
+ while (bitsOffset < bits.Length && bits[bitsOffset] == 0)
+ {
+ bitsOffset++;
+ }
+ if (bitsOffset == bits.Length)
+ {
+ return null;
+ }
+ int y = bitsOffset / rowSize;
+ int x = (bitsOffset % rowSize) << 5;
+
+ int theBits = bits[bitsOffset];
+ int bit = 0;
+ while ((theBits << (31 - bit)) == 0)
+ {
+ bit++;
+ }
+ x += bit;
+ return new int[] {x, y};
+ }
+ }
+
+ public int[] BottomRightOnBit
+ {
+ get
+ {
+ int bitsOffset = bits.Length - 1;
+ while (bitsOffset >= 0 && bits[bitsOffset] == 0)
+ {
+ bitsOffset--;
+ }
+ if (bitsOffset < 0)
+ {
+ return null;
+ }
+
+ int y = bitsOffset / rowSize;
+ int x = (bitsOffset % rowSize) << 5;
+
+ int theBits = bits[bitsOffset];
+ int bit = 31;
+ while (((int)((uint)theBits >> bit)) == 0)
+ {
+ bit--;
+ }
+ x += bit;
+
+ return new int[] {x, y};
+ }
+ }
+
+ /// The width of the matrix
+ public int Width
+ {
+ get
+ {
+ return width;
+ }
+ }
+
+ /// The height of the matrix
+ public int Height
+ {
+ get
+ {
+ return height;
+ }
+ }
+
+ public override bool Equals(object o)
+ {
+ if (!(o is BitMatrix))
{
+ return false;
}
-
- public BitMatrix(int width, int height)
+ BitMatrix other = (BitMatrix) o;
+ if (width != other.width || height != other.height || rowSize != other.rowSize || bits.Length != other.bits.Length)
{
- if (width < 1 || height < 1)
- {
- throw new System.ArgumentException("Both dimensions must be greater than 0");
- }
- this.width = width;
- this.height = height;
- int rowSize = width >> 5;
- if ((width & 0x1f) != 0)
- {
- rowSize++;
- }
- this.rowSize = rowSize;
- bits = new int[rowSize * height];
+ return false;
}
-
- /// Gets the requested bit, where true means black.
- ///
- ///
- /// The horizontal component (i.e. which column)
- ///
- /// The vertical component (i.e. which row)
- ///
- /// value of given bit in matrix
- ///
- public bool get_Renamed(int x, int y)
+ for (int i = 0; i < bits.Length; i++)
{
- int offset = y * rowSize + (x >> 5);
- return ((SupportClass.URShift(bits[offset], (x & 0x1f))) & 1) != 0;
+ if (bits[i] != other.bits[i])
+ {
+ return false;
+ }
}
-
- /// Sets the given bit to true.
- ///
- ///
- /// The horizontal component (i.e. which column)
- ///
- /// The vertical component (i.e. which row)
- ///
- public void set_Renamed(int x, int y)
+ return true;
+ }
+
+ public override int GetHashCode()
+ {
+ int hash = width;
+ hash = 31 * hash + width;
+ hash = 31 * hash + height;
+ hash = 31 * hash + rowSize;
+ foreach (int bit in bits)
{
- int offset = y * rowSize + (x >> 5);
- bits[offset] |= 1 << (x & 0x1f);
+ hash = 31 * hash + bit;
}
-
- /// Flips the given bit.
- ///
- ///
- /// The horizontal component (i.e. which column)
- ///
- /// The vertical component (i.e. which row)
- ///
- public void flip(int x, int y)
+ return hash;
+ }
+
+ public override string ToString()
+ {
+ StringBuilder result = new StringBuilder(height * (width + 1));
+ for (int y = 0; y < height; y++)
{
- int offset = y * rowSize + (x >> 5);
- bits[offset] ^= 1 << (x & 0x1f);
- }
-
- /// Clears all bits (sets to false).
- public void clear()
- {
- int max = bits.Length;
- for (int i = 0; i < max; i++)
- {
- bits[i] = 0;
- }
- }
-
- /// Sets a square region of the bit matrix to true.
- ///
- ///
- /// The horizontal position to begin at (inclusive)
- ///
- /// The vertical position to begin at (inclusive)
- ///
- /// The width of the region
- ///
- /// The height of the region
- ///
- public void setRegion(int left, int top, int width, int height)
- {
- if (top < 0 || left < 0)
- {
- throw new System.ArgumentException("Left and top must be nonnegative");
- }
- if (height < 1 || width < 1)
- {
- throw new System.ArgumentException("Height and width must be at least 1");
- }
- int right = left + width;
- int bottom = top + height;
- if (bottom > this.height || right > this.width)
- {
- throw new System.ArgumentException("The region must fit inside the matrix");
- }
- for (int y = top; y < bottom; y++)
- {
- int offset = y * rowSize;
- for (int x = left; x < right; x++)
- {
- bits[offset + (x >> 5)] |= 1 << (x & 0x1f);
- }
- }
- }
-
- /// A fast method to retrieve one row of data from the matrix as a BitArray.
- ///
- ///
- /// The row to retrieve
- ///
- /// An optional caller-allocated BitArray, will be allocated if null or too small
- ///
- /// The resulting BitArray - this reference should always be used even when passing
- /// your own row
- ///
- public BitArray getRow(int y, BitArray row)
- {
- if (row == null || row.Size < width)
- {
- row = new BitArray(width);
- }
- int offset = y * rowSize;
- for (int x = 0; x < rowSize; x++)
- {
- row.setBulk(x << 5, bits[offset + x]);
- }
- return row;
- }
-
- public override System.String ToString()
- {
- System.Text.StringBuilder result = new System.Text.StringBuilder(height * (width + 1));
- for (int y = 0; y < height; y++)
- {
- for (int x = 0; x < width; x++)
- {
- result.Append(get_Renamed(x, y)?"X ":" ");
- }
- result.Append('\n');
- }
- return result.ToString();
+ for (int x = 0; x < width; x++)
+ {
+ result.Append(get(x, y) ? "X " : " ");
+ }
+ result.Append('\n');
}
+ return result.ToString();
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/common/BitSource.cs b/csharp/common/BitSource.cs
index 983caa753..d978785b3 100755
--- a/csharp/common/BitSource.cs
+++ b/csharp/common/BitSource.cs
@@ -1,109 +1,124 @@
-/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
+
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common
{
-
- /// This provides an easy abstraction to read bits at a time from a sequence of bytes, where the
+
+ ///
+ /// This provides an easy abstraction to read bits at a time from a sequence of bytes, where the
/// number of bits read is not often a multiple of 8.
///
- /// This class is thread-safe but not reentrant. Unless the caller modifies the bytes array
+ ///
This class is thread-safe but not reentrant -- unless the caller modifies the bytes array
/// it passed in, in which case all bets are off.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class BitSource
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'bytes '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private sbyte[] bytes;
- private int byteOffset;
- private int bitOffset;
-
- /// bytes from which this will read bits. Bits will be read from the first byte first.
- /// Bits are read within a byte from most-significant to least-significant bit.
- ///
- public BitSource(sbyte[] bytes)
+
+ private readonly sbyte[] bytes;
+ private int byteOffset;
+ private int bitOffset;
+
+ /// bytes from which this will read bits. Bits will be read from the first byte first.
+ /// Bits are read within a byte from most-significant to least-significant bit.
+ public BitSource(sbyte[] bytes)
+ {
+ this.bytes = bytes;
+ }
+
+ /// index of next bit in current byte which would be read by the next call to .
+ public int BitOffset
+ {
+ get
+ {
+ return bitOffset;
+ }
+ }
+
+ /// index of next byte in input byte array which would be read by the next call to .
+ public int ByteOffset
+ {
+ get
+ {
+ return byteOffset;
+ }
+ }
+
+ /// number of bits to read
+ /// int representing the bits read. The bits will appear as the least-significant
+ /// bits of the int
+ /// if numBits isn't in [1,32] or more than is available
+ public int readBits(int numBits)
+ {
+ if (numBits < 1 || numBits > 32 || numBits > available())
{
- this.bytes = bytes;
+ throw new System.ArgumentException(Convert.ToString(numBits));
}
-
- /// number of bits to read
- ///
- /// int representing the bits read. The bits will appear as the least-significant
- /// bits of the int
- ///
- /// IllegalArgumentException if numBits isn't in [1,32]
- public int readBits(int numBits)
+
+ int result = 0;
+
+ // First, read remainder from current byte
+ if (bitOffset > 0)
{
- if (numBits < 1 || numBits > 32)
- {
- throw new System.ArgumentException();
- }
-
- int result = 0;
-
- // First, read remainder from current byte
- if (bitOffset > 0)
- {
- int bitsLeft = 8 - bitOffset;
- int toRead = numBits < bitsLeft?numBits:bitsLeft;
- int bitsToNotRead = bitsLeft - toRead;
- int mask = (0xFF >> (8 - toRead)) << bitsToNotRead;
- result = (bytes[byteOffset] & mask) >> bitsToNotRead;
- numBits -= toRead;
- bitOffset += toRead;
- if (bitOffset == 8)
- {
- bitOffset = 0;
- byteOffset++;
- }
- }
-
- // Next read whole bytes
- if (numBits > 0)
- {
- while (numBits >= 8)
- {
- result = (result << 8) | (bytes[byteOffset] & 0xFF);
- byteOffset++;
- numBits -= 8;
- }
-
- // Finally read a partial byte
- if (numBits > 0)
- {
- int bitsToNotRead = 8 - numBits;
- int mask = (0xFF >> bitsToNotRead) << bitsToNotRead;
- result = (result << numBits) | ((bytes[byteOffset] & mask) >> bitsToNotRead);
- bitOffset += numBits;
- }
- }
-
- return result;
+ int bitsLeft = 8 - bitOffset;
+ int toRead = numBits < bitsLeft ? numBits : bitsLeft;
+ int bitsToNotRead = bitsLeft - toRead;
+ int mask = (0xFF >> (8 - toRead)) << bitsToNotRead;
+ result = (bytes[byteOffset] & mask) >> bitsToNotRead;
+ numBits -= toRead;
+ bitOffset += toRead;
+ if (bitOffset == 8)
+ {
+ bitOffset = 0;
+ byteOffset++;
+ }
}
-
- /// number of bits that can be read successfully
- ///
- public int available()
+
+ // Next read whole bytes
+ if (numBits > 0)
{
- return 8 * (bytes.Length - byteOffset) - bitOffset;
+ while (numBits >= 8)
+ {
+ result = (result << 8) | (bytes[byteOffset] & 0xFF);
+ byteOffset++;
+ numBits -= 8;
+ }
+
+ // Finally read a partial byte
+ if (numBits > 0)
+ {
+ int bitsToNotRead = 8 - numBits;
+ int mask = (0xFF >> bitsToNotRead) << bitsToNotRead;
+ result = (result << numBits) | ((bytes[byteOffset] & mask) >> bitsToNotRead);
+ bitOffset += numBits;
+ }
}
+
+ return result;
+ }
+
+ /// number of bits that can be read successfully
+ public int available()
+ {
+ return 8 * (bytes.Length - byteOffset) - bitOffset;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/common/CharacterSetECI.cs b/csharp/common/CharacterSetECI.cs
index 54b8b98b1..517fa7f83 100755
--- a/csharp/common/CharacterSetECI.cs
+++ b/csharp/common/CharacterSetECI.cs
@@ -1,126 +1,224 @@
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
using System;
+using System.Collections.Generic;
+
namespace com.google.zxing.common
{
-
- /// Encapsulates a Character Set ECI, according to "Extended Channel Interpretations" 5.3.1.1
- /// of ISO 18004.
- ///
- ///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class CharacterSetECI:ECI
- {
- public System.String EncodingName
- {
- get
- {
- return encodingName;
- }
-
- }
-
- private static System.Collections.Hashtable VALUE_TO_ECI;
- private static System.Collections.Hashtable NAME_TO_ECI;
-
- private static void initialize()
- {
- VALUE_TO_ECI = System.Collections.Hashtable.Synchronized(new System.Collections.Hashtable(29));
- NAME_TO_ECI = System.Collections.Hashtable.Synchronized(new System.Collections.Hashtable(29));
- // TODO figure out if these values are even right!
- addCharacterSet(0, "Cp437");
- addCharacterSet(1, new System.String[]{"ISO8859_1", "ISO-8859-1"});
- addCharacterSet(2, "Cp437");
- addCharacterSet(3, new System.String[]{"ISO8859_1", "ISO-8859-1"});
- addCharacterSet(4, "ISO8859_2");
- addCharacterSet(5, "ISO8859_3");
- addCharacterSet(6, "ISO8859_4");
- addCharacterSet(7, "ISO8859_5");
- addCharacterSet(8, "ISO8859_6");
- addCharacterSet(9, "ISO8859_7");
- addCharacterSet(10, "ISO8859_8");
- addCharacterSet(11, "ISO8859_9");
- addCharacterSet(12, "ISO8859_10");
- addCharacterSet(13, "ISO8859_11");
- addCharacterSet(15, "ISO8859_13");
- addCharacterSet(16, "ISO8859_14");
- addCharacterSet(17, "ISO8859_15");
- addCharacterSet(18, "ISO8859_16");
- addCharacterSet(20, new System.String[]{"SJIS", "Shift_JIS"});
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'encodingName '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String encodingName;
-
- private CharacterSetECI(int value_Renamed, System.String encodingName):base(value_Renamed)
- {
- this.encodingName = encodingName;
- }
-
- private static void addCharacterSet(int value_Renamed, System.String encodingName)
- {
- CharacterSetECI eci = new CharacterSetECI(value_Renamed, encodingName);
- VALUE_TO_ECI[(System.Int32) value_Renamed] = eci; // can't use valueOf
- NAME_TO_ECI[encodingName] = eci;
- }
-
- private static void addCharacterSet(int value_Renamed, System.String[] encodingNames)
- {
- CharacterSetECI eci = new CharacterSetECI(value_Renamed, encodingNames[0]);
- VALUE_TO_ECI[(System.Int32) value_Renamed] = eci; // can't use valueOf
- for (int i = 0; i < encodingNames.Length; i++)
- {
- NAME_TO_ECI[encodingNames[i]] = eci;
- }
- }
-
- /// character set ECI value
- ///
- /// {@link CharacterSetECI} representing ECI of given value, or null if it is legal but
- /// unsupported
- ///
- /// IllegalArgumentException if ECI value is invalid
- public static CharacterSetECI getCharacterSetECIByValue(int value_Renamed)
- {
- if (VALUE_TO_ECI == null)
- {
- initialize();
- }
- if (value_Renamed < 0 || value_Renamed >= 900)
- {
- throw new System.ArgumentException("Bad ECI value: " + value_Renamed);
- }
- return (CharacterSetECI) VALUE_TO_ECI[(System.Int32) value_Renamed];
- }
-
- /// character set ECI encoding name
- ///
- /// {@link CharacterSetECI} representing ECI for character encoding, or null if it is legal
- /// but unsupported
- ///
- public static CharacterSetECI getCharacterSetECIByName(System.String name)
- {
- if (NAME_TO_ECI == null)
- {
- initialize();
- }
- return (CharacterSetECI) NAME_TO_ECI[name];
- }
- }
+
+ using FormatException = com.google.zxing.FormatException;
+
+
+ ///
+ /// Encapsulates a Character Set ECI, according to "Extended Channel Interpretations" 5.3.1.1
+ /// of ISO 18004.
+ ///
+ /// @author Sean Owen
+ ///
+ public abstract class CharacterSetECI
+ {
+ private CharacterSetECI()
+ {
+
+ }
+
+ private static object _syncLock;
+
+ static CharacterSetECI()
+ {
+ lock (_syncLock)
+ {
+ addSet((innerCharacterSetECI)Cp437);
+ addSet((innerCharacterSetECI)ISO8859_1);
+ addSet((innerCharacterSetECI)ISO8859_2);
+ addSet((innerCharacterSetECI)ISO8859_3);
+ addSet((innerCharacterSetECI)ISO8859_4);
+ addSet((innerCharacterSetECI)ISO8859_5);
+ addSet((innerCharacterSetECI)ISO8859_6);
+ addSet((innerCharacterSetECI)ISO8859_7);
+ addSet((innerCharacterSetECI)ISO8859_8);
+ addSet((innerCharacterSetECI)ISO8859_9);
+ addSet((innerCharacterSetECI)ISO8859_10);
+ addSet((innerCharacterSetECI)ISO8859_11);
+ addSet((innerCharacterSetECI)ISO8859_13);
+ addSet((innerCharacterSetECI)ISO8859_14);
+ addSet((innerCharacterSetECI)ISO8859_15);
+ addSet((innerCharacterSetECI)ISO8859_16);
+ addSet((innerCharacterSetECI)SJIS);
+ addSet((innerCharacterSetECI)Cp1250);
+ addSet((innerCharacterSetECI)Cp1251);
+ addSet((innerCharacterSetECI)Cp1252);
+ addSet((innerCharacterSetECI)Cp1256);
+ addSet((innerCharacterSetECI)UnicodeBigUnmarked);
+ addSet((innerCharacterSetECI)UTF8);
+ addSet((innerCharacterSetECI)ASCII);
+ addSet((innerCharacterSetECI)Big5);
+ addSet((innerCharacterSetECI)GB18030);
+ addSet((innerCharacterSetECI)EUC_KR);
+ }
+ }
+
+ private static void addSet(innerCharacterSetECI set)
+ {
+ foreach (int value in set.Values)
+ {
+ VALUE_TO_ECI[value] = set;
+ }
+
+ foreach (string name in set.OtherEncodingNames)
+ {
+ NAME_TO_ECI[name] = set;
+ }
+ }
+
+ private class innerCharacterSetECI : CharacterSetECI
+ {
+ private int[] values;
+ private string[] otherEncodingNames;
+
+
+
+ //internal Thing(int value)
+ //{
+ // setup(value);
+ //}
+
+ internal innerCharacterSetECI(int value, params string[] otherEncodingNames)
+ {
+ setup(value, otherEncodingNames);
+ }
+
+ internal innerCharacterSetECI(int[] values, params string[] otherEncodingNames)
+ {
+ setup(values, otherEncodingNames);
+ }
+
+ //void setup(int value)
+ //{
+ // setup(new int[] { value });
+ //}
+
+ void setup(int value, params string[] otherEncodingNames)
+ {
+ this.values = new int[] { value };
+ this.otherEncodingNames = otherEncodingNames;
+ }
+
+ void setup(int[] values, params string[] otherEncodingNames)
+ {
+ this.values = values;
+ this.otherEncodingNames = otherEncodingNames;
+ }
+
+ public override int Value
+ {
+ get { return values[0]; }
+ }
+
+ public override string name()
+ {
+ return otherEncodingNames[0];
+ }
+
+ public int[] Values
+ {
+ get { return values; }
+ }
+
+ public string[] OtherEncodingNames
+ {
+ get { return otherEncodingNames; }
+ }
+ }
+
+ public abstract string name();
+
+
+ // Enum name is a Java encoding valid for java.lang and java.io
+ public static readonly CharacterSetECI Cp437 = new innerCharacterSetECI(new int[] { 0, 2 },"Cp437","");
+ public static readonly CharacterSetECI ISO8859_1 = new innerCharacterSetECI(new int[] { 1, 3 }, "ISO-8859-1","");
+
+ public static readonly CharacterSetECI ISO8859_2 = new innerCharacterSetECI(4, "ISO-8859-2","ISO8859_2");
+ public static readonly CharacterSetECI ISO8859_3 = new innerCharacterSetECI(5, "ISO-8859-3","ISO8859_3");
+ public static readonly CharacterSetECI ISO8859_4 = new innerCharacterSetECI(6, "ISO-8859-4","ISO8859_4");
+ public static readonly CharacterSetECI ISO8859_5 = new innerCharacterSetECI(7, "ISO-8859-5","ISO8859_5");
+ public static readonly CharacterSetECI ISO8859_6 = new innerCharacterSetECI(8, "ISO-8859-6","ISO8859_6");
+ public static readonly CharacterSetECI ISO8859_7 = new innerCharacterSetECI(9, "ISO-8859-7","ISO8859_7");
+ public static readonly CharacterSetECI ISO8859_8 = new innerCharacterSetECI(10, "ISO-8859-8","ISO8859_8");
+ public static readonly CharacterSetECI ISO8859_9 = new innerCharacterSetECI(11, "ISO-8859-9","ISO8859_9");
+ public static readonly CharacterSetECI ISO8859_10 = new innerCharacterSetECI(12, "ISO-8859-10","ISO8859_10");
+ public static readonly CharacterSetECI ISO8859_11 = new innerCharacterSetECI(13, "ISO-8859-11","ISO8859_11");
+ public static readonly CharacterSetECI ISO8859_13 = new innerCharacterSetECI(15, "ISO-8859-13","ISO8859_13");
+ public static readonly CharacterSetECI ISO8859_14 = new innerCharacterSetECI(16, "ISO-8859-14","ISO8859_14");
+ public static readonly CharacterSetECI ISO8859_15 = new innerCharacterSetECI(17, "ISO-8859-15","ISO8859_15");
+ public static readonly CharacterSetECI ISO8859_16 = new innerCharacterSetECI(18, "ISO-8859-16","ISO8859_16");
+ public static readonly CharacterSetECI SJIS = new innerCharacterSetECI(20, "Shift_JIS","SJIS");
+ public static readonly CharacterSetECI Cp1250 = new innerCharacterSetECI(21, "windows-1250","Cp1250");
+ public static readonly CharacterSetECI Cp1251 = new innerCharacterSetECI(22, "windows-1251","Cp1251");
+ public static readonly CharacterSetECI Cp1252 = new innerCharacterSetECI(23, "windows-1252","Cp1252");
+ public static readonly CharacterSetECI Cp1256 = new innerCharacterSetECI(24, "windows-1256","Cp1256");
+ public static readonly CharacterSetECI UnicodeBigUnmarked = new innerCharacterSetECI(25, "UTF-16BE", "UnicodeBig","UnicodeBigUnmarked");
+ public static readonly CharacterSetECI UTF8 = new innerCharacterSetECI(26, "UTF-8","");
+ public static readonly CharacterSetECI ASCII = new innerCharacterSetECI(new int[] { 27, 170 }, "US-ASCII","ASCII");
+ public static readonly CharacterSetECI Big5 = new innerCharacterSetECI(28,"Big5","Big5");
+ public static readonly CharacterSetECI GB18030 = new innerCharacterSetECI(29, "GB2312", "EUC_CN", "GBK","GB18030");
+ public static readonly CharacterSetECI EUC_KR = new innerCharacterSetECI(30, "EUC-KR","EUC_KR");
+
+ private static readonly Dictionary VALUE_TO_ECI = new Dictionary();
+ private static readonly Dictionary NAME_TO_ECI = new Dictionary();
+
+ /// character set ECI value
+ /// CharacterSetECI representing ECI of given value, or null if it is legal but
+ /// unsupported
+ /// if ECI value is invalid
+ public static CharacterSetECI getCharacterSetECIByValue(int value)
+ {
+ if (value < 0 || value >= 900)
+ {
+ throw FormatException.FormatInstance;
+ }
+ if (VALUE_TO_ECI.ContainsKey(value))
+ {
+ return VALUE_TO_ECI[value];
+ }
+ return null;
+
+ }
+
+ /// character set ECI encoding name
+ /// CharacterSetECI representing ECI for character encoding, or null if it is legal
+ /// but unsupported
+ public static CharacterSetECI getCharacterSetECIByName(string name)
+ {
+ if (NAME_TO_ECI.ContainsKey(name))
+ {
+ return NAME_TO_ECI[name];
+ }
+ return null;
+ }
+
+ public virtual int Value { get { throw new NotImplementedException(); } }
+ }
+ //public static partial class EnumExtensionMethods
+ //{
+ // public static int getValue(this CharacterSetECI instanceJavaToDotNetTempPropertyGetValue)
+ // {
+ // return values[0];
+ // }
+ //}
+
}
\ No newline at end of file
diff --git a/csharp/common/DecoderResult.cs b/csharp/common/DecoderResult.cs
index 8cbf31aff..6a4999152 100755
--- a/csharp/common/DecoderResult.cs
+++ b/csharp/common/DecoderResult.cs
@@ -1,86 +1,79 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using ErrorCorrectionLevel = com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common
{
-
- /// Encapsulates the result of decoding a matrix of bits. This typically
+
+
+ ///
+ /// Encapsulates the result of decoding a matrix of bits. This typically
/// applies to 2D barcode formats. For now it contains the raw bytes obtained,
/// as well as a String interpretation of those bytes, if applicable.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class DecoderResult
{
- public sbyte[] RawBytes
- {
- get
- {
- return rawBytes;
- }
-
- }
- public System.String Text
- {
- get
- {
- return text;
- }
-
- }
- public System.Collections.ArrayList ByteSegments
- {
- get
- {
- return byteSegments;
- }
-
- }
- public ErrorCorrectionLevel ECLevel
- {
- get
- {
- return ecLevel;
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'rawBytes '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private sbyte[] rawBytes;
- //UPGRADE_NOTE: Final was removed from the declaration of 'text '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.String text;
- //UPGRADE_NOTE: Final was removed from the declaration of 'byteSegments '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.Collections.ArrayList byteSegments;
- //UPGRADE_NOTE: Final was removed from the declaration of 'ecLevel '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private ErrorCorrectionLevel ecLevel;
-
- public DecoderResult(sbyte[] rawBytes, System.String text, System.Collections.ArrayList byteSegments, ErrorCorrectionLevel ecLevel)
- {
- if (rawBytes == null && text == null)
- {
- throw new System.ArgumentException();
- }
- this.rawBytes = rawBytes;
- this.text = text;
- this.byteSegments = byteSegments;
- this.ecLevel = ecLevel;
- }
+
+ private readonly sbyte[] rawBytes;
+ private readonly string text;
+ private readonly IList byteSegments;
+ private readonly string ecLevel;
+
+ public DecoderResult(sbyte[] rawBytes, string text, IList byteSegments, string ecLevel)
+ {
+ this.rawBytes = rawBytes;
+ this.text = text;
+ this.byteSegments = byteSegments;
+ this.ecLevel = ecLevel;
+ }
+
+ public sbyte[] RawBytes
+ {
+ get
+ {
+ return rawBytes;
+ }
+ }
+
+ public string Text
+ {
+ get
+ {
+ return text;
+ }
+ }
+
+ public IList ByteSegments
+ {
+ get
+ {
+ return byteSegments;
+ }
+ }
+
+ public string ECLevel
+ {
+ get
+ {
+ return ecLevel;
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/common/DefaultGridSampler.cs b/csharp/common/DefaultGridSampler.cs
index 1a789cb02..f8e860650 100755
--- a/csharp/common/DefaultGridSampler.cs
+++ b/csharp/common/DefaultGridSampler.cs
@@ -1,82 +1,89 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using ReaderException = com.google.zxing.ReaderException;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common
{
-
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class DefaultGridSampler:GridSampler
+
+ using NotFoundException = com.google.zxing.NotFoundException;
+
+ ///
+ /// @author Sean Owen
+ ///
+ public sealed class DefaultGridSampler : GridSampler
{
-
- public override BitMatrix sampleGrid(BitMatrix image, int dimension, float p1ToX, float p1ToY, float p2ToX, float p2ToY, float p3ToX, float p3ToY, float p4ToX, float p4ToY, float p1FromX, float p1FromY, float p2FromX, float p2FromY, float p3FromX, float p3FromY, float p4FromX, float p4FromY)
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public BitMatrix sampleGrid(BitMatrix image, int dimensionX, int dimensionY, float p1ToX, float p1ToY, float p2ToX, float p2ToY, float p3ToX, float p3ToY, float p4ToX, float p4ToY, float p1FromX, float p1FromY, float p2FromX, float p2FromY, float p3FromX, float p3FromY, float p4FromX, float p4FromY) throws com.google.zxing.NotFoundException
+ public override BitMatrix sampleGrid(BitMatrix image, int dimensionX, int dimensionY, float p1ToX, float p1ToY, float p2ToX, float p2ToY, float p3ToX, float p3ToY, float p4ToX, float p4ToY, float p1FromX, float p1FromY, float p2FromX, float p2FromY, float p3FromX, float p3FromY, float p4FromX, float p4FromY)
+ {
+
+ PerspectiveTransform transform = PerspectiveTransform.quadrilateralToQuadrilateral(p1ToX, p1ToY, p2ToX, p2ToY, p3ToX, p3ToY, p4ToX, p4ToY, p1FromX, p1FromY, p2FromX, p2FromY, p3FromX, p3FromY, p4FromX, p4FromY);
+
+ return sampleGrid(image, dimensionX, dimensionY, transform);
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public BitMatrix sampleGrid(BitMatrix image, int dimensionX, int dimensionY, PerspectiveTransform transform) throws com.google.zxing.NotFoundException
+ public override BitMatrix sampleGrid(BitMatrix image, int dimensionX, int dimensionY, PerspectiveTransform transform)
+ {
+ if (dimensionX <= 0 || dimensionY <= 0)
{
-
- PerspectiveTransform transform = PerspectiveTransform.quadrilateralToQuadrilateral(p1ToX, p1ToY, p2ToX, p2ToY, p3ToX, p3ToY, p4ToX, p4ToY, p1FromX, p1FromY, p2FromX, p2FromY, p3FromX, p3FromY, p4FromX, p4FromY);
-
- return sampleGrid(image, dimension, transform);
+ throw NotFoundException.NotFoundInstance;
}
-
- public override BitMatrix sampleGrid(BitMatrix image, int dimension, PerspectiveTransform transform)
+ BitMatrix bits = new BitMatrix(dimensionX, dimensionY);
+ float[] points = new float[dimensionX << 1];
+ for (int y = 0; y < dimensionY; y++)
{
- BitMatrix bits = new BitMatrix(dimension);
- float[] points = new float[dimension << 1];
- for (int y = 0; y < dimension; y++)
+ int max = points.Length;
+ float iValue = (float) y + 0.5f;
+ for (int x = 0; x < max; x += 2)
+ {
+ points[x] = (float)(x >> 1) + 0.5f;
+ points[x + 1] = iValue;
+ }
+ transform.transformPoints(points);
+ // Quick check to see if points transformed to something inside the image;
+ // sufficient to check the endpoints
+ checkAndNudgePoints(image, points);
+ try
+ {
+ for (int x = 0; x < max; x += 2)
{
- int max = points.Length;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- float iValue = (float) y + 0.5f;
- for (int x = 0; x < max; x += 2)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- points[x] = (float) (x >> 1) + 0.5f;
- points[x + 1] = iValue;
- }
- transform.transformPoints(points);
- // Quick check to see if points transformed to something inside the image;
- // sufficient to check the endpoints
- checkAndNudgePoints(image, points);
- try
- {
- for (int x = 0; x < max; x += 2)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- if (image.get_Renamed((int) points[x], (int) points[x + 1]))
- {
- // Black(-ish) pixel
- bits.set_Renamed(x >> 1, y);
- }
- }
- }
- catch (System.IndexOutOfRangeException)
- {
- // 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
- // way to detect this about the transformation that I don't know yet.
- // This results in an ugly runtime exception despite our clever checks above -- can't have
- // that. We could check each point's coordinates but that feels duplicative. We settle for
- // catching and wrapping ArrayIndexOutOfBoundsException.
- throw ReaderException.Instance;
- }
+ if (image.get((int) points[x], (int) points[x + 1]))
+ {
+ // Black(-ish) pixel
+ bits.set(x >> 1, y);
+ }
}
- return bits;
+ }
+ catch (System.IndexOutOfRangeException aioobe)
+ {
+ // 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
+ // way to detect this about the transformation that I don't know yet.
+ // This results in an ugly runtime exception despite our clever checks above -- can't have
+ // that. We could check each point's coordinates but that feels duplicative. We settle for
+ // catching and wrapping ArrayIndexOutOfBoundsException.
+ throw NotFoundException.NotFoundInstance;
+ }
}
+ return bits;
+ }
+
}
-}
+
+}
\ No newline at end of file
diff --git a/csharp/common/DetectorResult.cs b/csharp/common/DetectorResult.cs
index 9a327a467..637a89c89 100755
--- a/csharp/common/DetectorResult.cs
+++ b/csharp/common/DetectorResult.cs
@@ -1,60 +1,58 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using ResultPoint = com.google.zxing.ResultPoint;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common
{
-
- /// Encapsulates the result of detecting a barcode in an image. This includes the raw
+
+ using ResultPoint = com.google.zxing.ResultPoint;
+
+ ///
+ /// Encapsulates the result of detecting a barcode in an image. This includes the raw
/// matrix of black/white pixels corresponding to the barcode, and possibly points of interest
/// in the image, like the location of finder patterns or corners of the barcode in the image.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class DetectorResult
+ public class DetectorResult
{
- public BitMatrix Bits
- {
- get
- {
- return bits;
- }
-
- }
- public ResultPoint[] Points
- {
- get
- {
- return points;
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'bits '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private BitMatrix bits;
- //UPGRADE_NOTE: Final was removed from the declaration of 'points '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private ResultPoint[] points;
-
- public DetectorResult(BitMatrix bits, ResultPoint[] points)
- {
- this.bits = bits;
- this.points = points;
- }
+
+ private readonly BitMatrix bits;
+ private readonly ResultPoint[] points;
+
+ public DetectorResult(BitMatrix bits, ResultPoint[] points)
+ {
+ this.bits = bits;
+ this.points = points;
+ }
+
+ public BitMatrix Bits
+ {
+ get
+ {
+ return bits;
+ }
+ }
+
+ public ResultPoint[] Points
+ {
+ get
+ {
+ return points;
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/common/GlobalHistogramBinarizer.cs b/csharp/common/GlobalHistogramBinarizer.cs
index f6d0ae276..58d16b3b4 100755
--- a/csharp/common/GlobalHistogramBinarizer.cs
+++ b/csharp/common/GlobalHistogramBinarizer.cs
@@ -1,250 +1,237 @@
+using System.Collections;
+
/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Binarizer = com.google.zxing.Binarizer;
-using LuminanceSource = com.google.zxing.LuminanceSource;
-using ReaderException = com.google.zxing.ReaderException;
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common
{
-
- /// This Binarizer implementation uses the old ZXing global histogram approach. It is suitable
+
+ using Binarizer = com.google.zxing.Binarizer;
+ using LuminanceSource = com.google.zxing.LuminanceSource;
+ using NotFoundException = com.google.zxing.NotFoundException;
+
+ ///
+ /// This Binarizer implementation uses the old ZXing global histogram approach. It is suitable
/// for low-end mobile devices which don't have enough CPU or memory to use a local thresholding
/// algorithm. However, because it picks a global black point, it cannot handle difficult shadows
/// and gradients.
///
/// Faster mobile devices and all desktop applications should probably use HybridBinarizer instead.
///
+ /// @author dswitkin@google.com (Daniel Switkin)
+ /// @author Sean Owen
///
- /// dswitkin@google.com (Daniel Switkin)
- ///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public class GlobalHistogramBinarizer:Binarizer
+ public class GlobalHistogramBinarizer : com.google.zxing.Binarizer
{
- override public BitMatrix BlackMatrix
- {
- // Does not sharpen the data, as this call is intended to only be used by 2D Readers.
-
- get
- {
- LuminanceSource source = LuminanceSource;
- // Redivivus.in Java to c# Porting update
- // 30/01/2010
- // Added
- // START
- sbyte[] localLuminances;
- //END
-
- int width = source.Width;
- int height = source.Height;
- BitMatrix matrix = new BitMatrix(width, height);
-
- // Quickly calculates the histogram by sampling four rows from the image. This proved to be
- // more robust on the blackbox tests than sampling a diagonal as we used to do.
- initArrays(width);
- int[] localBuckets = buckets;
- for (int y = 1; y < 5; y++)
- {
- int row = height * y / 5;
- // Redivivus.in Java to c# Porting update
- // 30/01/2010
- // Commented & Added
- // START
- //sbyte[] localLuminances = source.getRow(row, luminances);
- localLuminances = source.getRow(row, luminances);
- // END
- int right = (width << 2) / 5;
- for (int x = width / 5; x < right; x++)
- {
- int pixel = localLuminances[x] & 0xff;
- localBuckets[pixel >> LUMINANCE_SHIFT]++;
- }
- }
- int blackPoint = estimateBlackPoint(localBuckets);
-
- // We delay reading the entire image luminance until the black point estimation succeeds.
- // Although we end up reading four rows twice, it is consistent with our motto of
- // "fail quickly" which is necessary for continuous scanning.
- localLuminances = source.Matrix; // Govinda : Removed sbyte []
- for (int y = 0; y < height; y++)
- {
- int offset = y * width;
- for (int x = 0; x < width; x++)
- {
- int pixel = localLuminances[offset + x] & 0xff;
- if (pixel < blackPoint)
- {
- matrix.set_Renamed(x, y);
- }
- }
- }
-
- return matrix;
- }
-
- }
-
- private const int LUMINANCE_BITS = 5;
- //UPGRADE_NOTE: Final was removed from the declaration of 'LUMINANCE_SHIFT '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly int LUMINANCE_SHIFT = 8 - LUMINANCE_BITS;
- //UPGRADE_NOTE: Final was removed from the declaration of 'LUMINANCE_BUCKETS '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly int LUMINANCE_BUCKETS = 1 << LUMINANCE_BITS;
-
- private sbyte[] luminances = null;
- private int[] buckets = null;
-
- public GlobalHistogramBinarizer(LuminanceSource source):base(source)
+ private const int LUMINANCE_BITS = 5;
+ private static readonly int LUMINANCE_SHIFT = 8 - LUMINANCE_BITS;
+ private static readonly int LUMINANCE_BUCKETS = 1 << LUMINANCE_BITS;
+ private static readonly sbyte[] EMPTY = new sbyte[0];
+
+ private sbyte[] luminances;
+ private readonly int[] buckets;
+
+ public GlobalHistogramBinarizer(LuminanceSource source) : base(source)
+ {
+ luminances = EMPTY;
+ buckets = new int[LUMINANCE_BUCKETS];
+ }
+
+ // Applies simple sharpening to the row data to improve performance of the 1D Readers.
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public BitArray getBlackRow(int y, BitArray row) throws com.google.zxing.NotFoundException
+ public override BitArray getBlackRow(int y, BitArray row)
+ {
+ LuminanceSource source = LuminanceSource;
+ int width = source.Width;
+ if (row == null || row.Size < width)
{
+ row = new BitArray(width);
}
-
- // Applies simple sharpening to the row data to improve performance of the 1D Readers.
- public override BitArray getBlackRow(int y, BitArray row)
+ else
{
+ //row.SetAll(false);
+ row.clear();
+ }
+
+ initArrays(width);
+ sbyte[] localLuminances = source.getRow(y, luminances);
+ int[] localBuckets = buckets;
+ for (int x = 0; x < width; x++)
+ {
+ int pixel = localLuminances[x] & 0xff;
+ localBuckets[pixel >> LUMINANCE_SHIFT]++;
+ }
+ int blackPoint = estimateBlackPoint(localBuckets);
+
+ int left = localLuminances[0] & 0xff;
+ int center = localLuminances[1] & 0xff;
+ for (int x = 1; x < width - 1; x++)
+ {
+ int right = localLuminances[x + 1] & 0xff;
+ // A simple -1 4 -1 box filter with a weight of 2.
+ int luminance = ((center << 2) - left - right) >> 1;
+ if (luminance < blackPoint)
+ {
+ //row.Set(x, true);
+ row.set(x);
+ }
+ left = center;
+ center = right;
+ }
+ return row;
+ }
+
+ // Does not sharpen the data, as this call is intended to only be used by 2D Readers.
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public BitMatrix getBlackMatrix() throws com.google.zxing.NotFoundException
+ public override BitMatrix BlackMatrix
+ {
+ get
+ {
LuminanceSource source = LuminanceSource;
int width = source.Width;
- if (row == null || row.Size < width)
- {
- row = new BitArray(width);
- }
- else
- {
- row.clear();
- }
-
+ int height = source.Height;
+ BitMatrix matrix = new BitMatrix(width, height);
+
+ // Quickly calculates the histogram by sampling four rows from the image. This proved to be
+ // more robust on the blackbox tests than sampling a diagonal as we used to do.
initArrays(width);
- sbyte[] localLuminances = source.getRow(y, luminances);
int[] localBuckets = buckets;
- for (int x = 0; x < width; x++)
+ for (int y = 1; y < 5; y++)
{
- int pixel = localLuminances[x] & 0xff;
+ int row = height * y / 5;
+ sbyte[] localLuminances1 = source.getRow(row, luminances);
+ int right = (width << 2) / 5;
+ for (int x = width / 5; x < right; x++)
+ {
+ int pixel = localLuminances1[x] & 0xff;
localBuckets[pixel >> LUMINANCE_SHIFT]++;
+ }
}
int blackPoint = estimateBlackPoint(localBuckets);
-
- int left = localLuminances[0] & 0xff;
- int center = localLuminances[1] & 0xff;
- for (int x = 1; x < width - 1; x++)
+
+ // We delay reading the entire image luminance until the black point estimation succeeds.
+ // Although we end up reading four rows twice, it is consistent with our motto of
+ // "fail quickly" which is necessary for continuous scanning.
+ sbyte[] localLuminances = source.Matrix;
+ for (int y = 0; y < height; y++)
{
- int right = localLuminances[x + 1] & 0xff;
- // A simple -1 4 -1 box filter with a weight of 2.
- int luminance = ((center << 2) - left - right) >> 1;
- if (luminance < blackPoint)
+ int offset = y * width;
+ for (int x = 0; x < width; x++)
+ {
+ int pixel = localLuminances[offset + x] & 0xff;
+ if (pixel < blackPoint)
{
- row.set_Renamed(x);
+ matrix.set(x, y);
}
- left = center;
- center = right;
+ }
}
- return row;
- }
-
- public override Binarizer createBinarizer(LuminanceSource source)
+
+ return matrix;
+ }
+ }
+
+ public override Binarizer createBinarizer(LuminanceSource source)
+ {
+ return new GlobalHistogramBinarizer(source);
+ }
+
+ private void initArrays(int luminanceSize)
+ {
+ if (luminances.Length < luminanceSize)
{
- return new GlobalHistogramBinarizer(source);
+ luminances = new sbyte[luminanceSize];
}
-
- private void initArrays(int luminanceSize)
+ for (int x = 0; x < LUMINANCE_BUCKETS; x++)
{
- if (luminances == null || luminances.Length < luminanceSize)
- {
- luminances = new sbyte[luminanceSize];
- }
- if (buckets == null)
- {
- buckets = new int[LUMINANCE_BUCKETS];
- }
- else
- {
- for (int x = 0; x < LUMINANCE_BUCKETS; x++)
- {
- buckets[x] = 0;
- }
- }
+ buckets[x] = 0;
}
-
- private static int estimateBlackPoint(int[] buckets)
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static int estimateBlackPoint(int[] buckets) throws com.google.zxing.NotFoundException
+ private static int estimateBlackPoint(int[] buckets)
+ {
+ // Find the tallest peak in the histogram.
+ int numBuckets = buckets.Length;
+ int maxBucketCount = 0;
+ int firstPeak = 0;
+ int firstPeakSize = 0;
+ for (int x = 0; x < numBuckets; x++)
{
- // Find the tallest peak in the histogram.
- int numBuckets = buckets.Length;
- int maxBucketCount = 0;
- int firstPeak = 0;
- int firstPeakSize = 0;
- for (int x = 0; x < numBuckets; x++)
- {
- if (buckets[x] > firstPeakSize)
- {
- firstPeak = x;
- firstPeakSize = buckets[x];
- }
- if (buckets[x] > maxBucketCount)
- {
- maxBucketCount = buckets[x];
- }
- }
-
- // Find the second-tallest peak which is somewhat far from the tallest peak.
- int secondPeak = 0;
- int secondPeakScore = 0;
- for (int x = 0; x < numBuckets; x++)
- {
- int distanceToBiggest = x - firstPeak;
- // Encourage more distant second peaks by multiplying by square of distance.
- int score = buckets[x] * distanceToBiggest * distanceToBiggest;
- if (score > secondPeakScore)
- {
- secondPeak = x;
- secondPeakScore = score;
- }
- }
-
- // Make sure firstPeak corresponds to the black peak.
- if (firstPeak > secondPeak)
- {
- int temp = firstPeak;
- firstPeak = secondPeak;
- secondPeak = temp;
- }
-
- // If there is too little contrast in the image to pick a meaningful black point, throw rather
- // than waste time trying to decode the image, and risk false positives.
- // TODO: It might be worth comparing the brightest and darkest pixels seen, rather than the
- // two peaks, to determine the contrast.
- if (secondPeak - firstPeak <= numBuckets >> 4)
- {
- throw ReaderException.Instance;
- }
-
- // Find a valley between them that is low and closer to the white peak.
- int bestValley = secondPeak - 1;
- int bestValleyScore = - 1;
- for (int x = secondPeak - 1; x > firstPeak; x--)
- {
- int fromFirst = x - firstPeak;
- int score = fromFirst * fromFirst * (secondPeak - x) * (maxBucketCount - buckets[x]);
- if (score > bestValleyScore)
- {
- bestValley = x;
- bestValleyScore = score;
- }
- }
-
- return bestValley << LUMINANCE_SHIFT;
+ if (buckets[x] > firstPeakSize)
+ {
+ firstPeak = x;
+ firstPeakSize = buckets[x];
+ }
+ if (buckets[x] > maxBucketCount)
+ {
+ maxBucketCount = buckets[x];
+ }
}
+
+ // Find the second-tallest peak which is somewhat far from the tallest peak.
+ int secondPeak = 0;
+ int secondPeakScore = 0;
+ for (int x = 0; x < numBuckets; x++)
+ {
+ int distanceToBiggest = x - firstPeak;
+ // Encourage more distant second peaks by multiplying by square of distance.
+ int score = buckets[x] * distanceToBiggest * distanceToBiggest;
+ if (score > secondPeakScore)
+ {
+ secondPeak = x;
+ secondPeakScore = score;
+ }
+ }
+
+ // Make sure firstPeak corresponds to the black peak.
+ if (firstPeak > secondPeak)
+ {
+ int temp = firstPeak;
+ firstPeak = secondPeak;
+ secondPeak = temp;
+ }
+
+ // If there is too little contrast in the image to pick a meaningful black point, throw rather
+ // than waste time trying to decode the image, and risk false positives.
+ if (secondPeak - firstPeak <= numBuckets >> 4)
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ // Find a valley between them that is low and closer to the white peak.
+ int bestValley = secondPeak - 1;
+ int bestValleyScore = -1;
+ for (int x = secondPeak - 1; x > firstPeak; x--)
+ {
+ int fromFirst = x - firstPeak;
+ int score = fromFirst * fromFirst * (secondPeak - x) * (maxBucketCount - buckets[x]);
+ if (score > bestValleyScore)
+ {
+ bestValley = x;
+ bestValleyScore = score;
+ }
+ }
+
+ return bestValley << LUMINANCE_SHIFT;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/common/GridSampler.cs b/csharp/common/GridSampler.cs
index bec46b73a..13e779eea 100755
--- a/csharp/common/GridSampler.cs
+++ b/csharp/common/GridSampler.cs
@@ -1,193 +1,170 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using ReaderException = com.google.zxing.ReaderException;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common
{
-
- /// Implementations of this class can, given locations of finder patterns for a QR code in an
+
+ using NotFoundException = com.google.zxing.NotFoundException;
+
+ ///
+ /// Implementations of this class can, given locations of finder patterns for a QR code in an
/// image, sample the right points in the image to reconstruct the QR code, accounting for
/// perspective distortion. It is abstracted since it is relatively expensive and should be allowed
/// to take advantage of platform-specific optimized implementations, like Sun's Java Advanced
/// Imaging library, but which may not be available in other environments such as J2ME, and vice
/// versa.
///
- /// The implementation used can be controlled by calling {@link #setGridSampler(GridSampler)}
+ /// The implementation used can be controlled by calling
/// with an instance of a class which implements this interface.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public abstract class GridSampler
{
- /// the current implementation of {@link GridSampler}
- ///
- public static GridSampler Instance
+
+ private static GridSampler gridSampler = new DefaultGridSampler();
+
+ ///
+ /// Sets the implementation of GridSampler used by the library. One global
+ /// instance is stored, which may sound problematic. But, the implementation provided
+ /// ought to be appropriate for the entire platform, and all uses of this library
+ /// in the whole lifetime of the JVM. For instance, an Android activity can swap in
+ /// an implementation that takes advantage of native platform libraries.
+ ///
+ /// The platform-specific object to install.
+ public static GridSampler GridSampler2
+ {
+ set
+ {
+ gridSampler = value;
+ }
+ }
+
+ /// the current implementation of GridSampler
+ public static GridSampler Instance
+ {
+ get
+ {
+ return gridSampler;
+ }
+ }
+
+ ///
+ /// Samples an image for a rectangular matrix of bits of the given dimension.
+ /// image to sample
+ /// width of to sample from image
+ /// height of to sample from image
+ /// representing a grid of points sampled from the image within a region
+ /// defined by the "from" parameters
+ /// if image can't be sampled, for example, if the transformation defined
+ /// by the given points is invalid or results in sampling outside the image boundaries
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public abstract BitMatrix sampleGrid(BitMatrix image, int dimensionX, int dimensionY, float p1ToX, float p1ToY, float p2ToX, float p2ToY, float p3ToX, float p3ToY, float p4ToX, float p4ToY, float p1FromX, float p1FromY, float p2FromX, float p2FromY, float p3FromX, float p3FromY, float p4FromX, float p4FromY) throws com.google.zxing.NotFoundException;
+ public abstract BitMatrix sampleGrid(BitMatrix image, int dimensionX, int dimensionY, float p1ToX, float p1ToY, float p2ToX, float p2ToY, float p3ToX, float p3ToY, float p4ToX, float p4ToY, float p1FromX, float p1FromY, float p2FromX, float p2FromY, float p3FromX, float p3FromY, float p4FromX, float p4FromY);
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public abstract BitMatrix sampleGrid(BitMatrix image, int dimensionX, int dimensionY, PerspectiveTransform transform) throws com.google.zxing.NotFoundException;
+ public abstract BitMatrix sampleGrid(BitMatrix image, int dimensionX, int dimensionY, PerspectiveTransform transform);
+
+ ///
+ /// Checks a set of points that have been transformed to sample points on an image against
+ /// the image's dimensions to see if the point are even within the image.
+ ///
+ /// This method will actually "nudge" the endpoints back onto the image if they are found to be
+ /// barely (less than 1 pixel) off the image. This accounts for imperfect detection of finder
+ /// patterns in an image where the QR Code runs all the way to the image border.
+ ///
+ /// For efficiency, the method will check points from either end of the line until one is found
+ /// to be within the image. Because the set of points are assumed to be linear, this is valid.
+ ///
+ /// image into which the points should map
+ /// actual points in x1,y1,...,xn,yn form
+ /// if an endpoint is lies outside the image boundaries
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: protected static void checkAndNudgePoints(BitMatrix image, float[] points) throws com.google.zxing.NotFoundException
+ protected internal static void checkAndNudgePoints(BitMatrix image, float[] points)
+ {
+ int width = image.Width;
+ int height = image.Height;
+ // Check and nudge points from start until we see some that are OK:
+ bool nudged = true;
+ for (int offset = 0; offset < points.Length && nudged; offset += 2)
{
- get
- {
- return gridSampler;
- }
-
- }
-
- private static GridSampler gridSampler = new DefaultGridSampler();
-
- /// Sets the implementation of {@link GridSampler} used by the library. One global
- /// instance is stored, which may sound problematic. But, the implementation provided
- /// ought to be appropriate for the entire platform, and all uses of this library
- /// in the whole lifetime of the JVM. For instance, an Android activity can swap in
- /// an implementation that takes advantage of native platform libraries.
- ///
- ///
- /// The platform-specific object to install.
- ///
- public static void setGridSampler(GridSampler newGridSampler)
- {
- if (newGridSampler == null)
- {
- throw new System.ArgumentException();
- }
- gridSampler = newGridSampler;
- }
-
- /// Samples an image for a square matrix of bits of the given dimension. This is used to extract
- /// the black/white modules of a 2D barcode like a QR Code found in an image. Because this barcode
- /// may be rotated or perspective-distorted, the caller supplies four points in the source image
- /// that define known points in the barcode, so that the image may be sampled appropriately.
- ///
- /// The last eight "from" parameters are four X/Y coordinate pairs of locations of points in
- /// the image that define some significant points in the image to be sample. For example,
- /// these may be the location of finder pattern in a QR Code.
- ///
- /// The first eight "to" parameters are four X/Y coordinate pairs measured in the destination
- /// {@link BitMatrix}, from the top left, where the known points in the image given by the "from"
- /// parameters map to.
- ///
- /// These 16 parameters define the transformation needed to sample the image.
- ///
- ///
- /// image to sample
- ///
- /// width/height of {@link BitMatrix} to sample from image
- ///
- /// {@link BitMatrix} representing a grid of points sampled from the image within a region
- /// defined by the "from" parameters
- ///
- /// ReaderException if image can't be sampled, for example, if the transformation defined
- /// by the given points is invalid or results in sampling outside the image boundaries
- ///
- public abstract BitMatrix sampleGrid(BitMatrix image, int dimension, float p1ToX, float p1ToY, float p2ToX, float p2ToY, float p3ToX, float p3ToY, float p4ToX, float p4ToY, float p1FromX, float p1FromY, float p2FromX, float p2FromY, float p3FromX, float p3FromY, float p4FromX, float p4FromY);
-
- public virtual BitMatrix sampleGrid(BitMatrix image, int dimension, PerspectiveTransform transform)
- {
- throw new System.NotSupportedException();
- }
-
-
- /// Checks a set of points that have been transformed to sample points on an image against
- /// the image's dimensions to see if the point are even within the image.
- ///
- /// This method will actually "nudge" the endpoints back onto the image if they are found to be
- /// barely (less than 1 pixel) off the image. This accounts for imperfect detection of finder
- /// patterns in an image where the QR Code runs all the way to the image border.
- ///
- /// For efficiency, the method will check points from either end of the line until one is found
- /// to be within the image. Because the set of points are assumed to be linear, this is valid.
- ///
- ///
- /// image into which the points should map
- ///
- /// actual points in x1,y1,...,xn,yn form
- ///
- /// ReaderException if an endpoint is lies outside the image boundaries
- protected internal static void checkAndNudgePoints(BitMatrix image, float[] points)
- {
- int width = image.Width;
- int height = image.Height;
- // Check and nudge points from start until we see some that are OK:
- bool nudged = true;
- for (int offset = 0; offset < points.Length && nudged; offset += 2)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- int x = (int) points[offset];
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- int y = (int) points[offset + 1];
- if (x < - 1 || x > width || y < - 1 || y > height)
- {
- throw ReaderException.Instance;
- }
- nudged = false;
- if (x == - 1)
- {
- points[offset] = 0.0f;
- nudged = true;
- }
- else if (x == width)
- {
- points[offset] = width - 1;
- nudged = true;
- }
- if (y == - 1)
- {
- points[offset + 1] = 0.0f;
- nudged = true;
- }
- else if (y == height)
- {
- points[offset + 1] = height - 1;
- nudged = true;
- }
- }
- // Check and nudge points from end:
+ int x = (int) points[offset];
+ int y = (int) points[offset + 1];
+ if (x < -1 || x > width || y < -1 || y > height)
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+ nudged = false;
+ if (x == -1)
+ {
+ points[offset] = 0.0f;
nudged = true;
- for (int offset = points.Length - 2; offset >= 0 && nudged; offset -= 2)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- int x = (int) points[offset];
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- int y = (int) points[offset + 1];
- if (x < - 1 || x > width || y < - 1 || y > height)
- {
- throw ReaderException.Instance;
- }
- nudged = false;
- if (x == - 1)
- {
- points[offset] = 0.0f;
- nudged = true;
- }
- else if (x == width)
- {
- points[offset] = width - 1;
- nudged = true;
- }
- if (y == - 1)
- {
- points[offset + 1] = 0.0f;
- nudged = true;
- }
- else if (y == height)
- {
- points[offset + 1] = height - 1;
- nudged = true;
- }
- }
+ }
+ else if (x == width)
+ {
+ points[offset] = width - 1;
+ nudged = true;
+ }
+ if (y == -1)
+ {
+ points[offset + 1] = 0.0f;
+ nudged = true;
+ }
+ else if (y == height)
+ {
+ points[offset + 1] = height - 1;
+ nudged = true;
+ }
}
+ // Check and nudge points from end:
+ nudged = true;
+ for (int offset = points.Length - 2; offset >= 0 && nudged; offset -= 2)
+ {
+ int x = (int) points[offset];
+ int y = (int) points[offset + 1];
+ if (x < -1 || x > width || y < -1 || y > height)
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+ nudged = false;
+ if (x == -1)
+ {
+ points[offset] = 0.0f;
+ nudged = true;
+ }
+ else if (x == width)
+ {
+ points[offset] = width - 1;
+ nudged = true;
+ }
+ if (y == -1)
+ {
+ points[offset + 1] = 0.0f;
+ nudged = true;
+ }
+ else if (y == height)
+ {
+ points[offset + 1] = height - 1;
+ nudged = true;
+ }
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/common/HybridBinarizer.cs b/csharp/common/HybridBinarizer.cs
index 19d8fa371..d9a1698a2 100755
--- a/csharp/common/HybridBinarizer.cs
+++ b/csharp/common/HybridBinarizer.cs
@@ -1,26 +1,28 @@
/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Binarizer = com.google.zxing.Binarizer;
-using LuminanceSource = com.google.zxing.LuminanceSource;
-using ReaderException = com.google.zxing.ReaderException;
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common
{
-
- /// This class implements a local thresholding algorithm, which while slower than the
+
+ using Binarizer = com.google.zxing.Binarizer;
+ using LuminanceSource = com.google.zxing.LuminanceSource;
+ using NotFoundException = com.google.zxing.NotFoundException;
+
+ ///
+ /// This class implements a local thresholding algorithm, which while slower than the
/// GlobalHistogramBinarizer, is fairly efficient for what it does. It is designed for
/// high frequency images of barcodes with black data on white backgrounds. For this application,
/// it does a much better job than a global blackpoint with severe shadows and gradients.
@@ -34,154 +36,229 @@ namespace com.google.zxing.common
///
/// This Binarizer is the default for the unit tests and the recommended class for library users.
///
+ /// @author dswitkin@google.com (Daniel Switkin)
///
- /// dswitkin@google.com (Daniel Switkin)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class HybridBinarizer:GlobalHistogramBinarizer
+ public sealed class HybridBinarizer : GlobalHistogramBinarizer
{
- override public BitMatrix BlackMatrix
- {
- get
+
+ // This class uses 5x5 blocks to compute local luminance, where each block is 8x8 pixels.
+ // So this is the smallest dimension in each axis we can accept.
+ private const int BLOCK_SIZE_POWER = 3;
+ private static readonly int BLOCK_SIZE = 1 << BLOCK_SIZE_POWER; // ...0100...00
+ private static readonly int BLOCK_SIZE_MASK = BLOCK_SIZE - 1; // ...0011...11
+ private static readonly int MINIMUM_DIMENSION = BLOCK_SIZE * 5;
+ private const int MIN_DYNAMIC_RANGE = 24;
+
+ private BitMatrix matrix;
+
+ public HybridBinarizer(LuminanceSource source) : base(source)
+ {
+ }
+
+ ///
+ /// Calculates the final BitMatrix once for all requests. This could be called once from the
+ /// constructor instead, but there are some advantages to doing it lazily, such as making
+ /// profiling easier, and not doing heavy lifting when callers don't expect it.
+ ///
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public BitMatrix getBlackMatrix() throws com.google.zxing.NotFoundException
+ public override BitMatrix BlackMatrix
+ {
+ get
+ {
+ if (matrix != null)
{
- binarizeEntireImage();
- return matrix;
+ return matrix;
}
-
- }
-
- // This class uses 5x5 blocks to compute local luminance, where each block is 8x8 pixels.
- // So this is the smallest dimension in each axis we can accept.
- private const int MINIMUM_DIMENSION = 40;
-
- private BitMatrix matrix = null;
-
- public HybridBinarizer(LuminanceSource source):base(source)
- {
- }
-
- public override Binarizer createBinarizer(LuminanceSource source)
- {
- return new HybridBinarizer(source);
- }
-
- // Calculates the final BitMatrix once for all requests. This could be called once from the
- // constructor instead, but there are some advantages to doing it lazily, such as making
- // profiling easier, and not doing heavy lifting when callers don't expect it.
- private void binarizeEntireImage()
- {
- if (matrix == null)
+ LuminanceSource source = LuminanceSource;
+ int width = source.Width;
+ int height = source.Height;
+ if (width >= MINIMUM_DIMENSION && height >= MINIMUM_DIMENSION)
{
- LuminanceSource source = LuminanceSource;
- if (source.Width >= MINIMUM_DIMENSION && source.Height >= MINIMUM_DIMENSION)
+ sbyte[] luminances = source.Matrix;
+ int subWidth = width >> BLOCK_SIZE_POWER;
+ if ((width & BLOCK_SIZE_MASK) != 0)
+ {
+ subWidth++;
+ }
+ int subHeight = height >> BLOCK_SIZE_POWER;
+ if ((height & BLOCK_SIZE_MASK) != 0)
+ {
+ subHeight++;
+ }
+ int[][] blackPoints = calculateBlackPoints(luminances, subWidth, subHeight, width, height);
+
+ BitMatrix newMatrix = new BitMatrix(width, height);
+ calculateThresholdForBlock(luminances, subWidth, subHeight, width, height, blackPoints, newMatrix);
+ matrix = newMatrix;
+ }
+ else
+ {
+ // If the image is too small, fall back to the global histogram approach.
+ matrix = base.BlackMatrix;
+ }
+ return matrix;
+ }
+ }
+
+ public override Binarizer createBinarizer(LuminanceSource source)
+ {
+ return new HybridBinarizer(source);
+ }
+
+ ///
+ /// For each block in the image, calculate the average black point using a 5x5 grid
+ /// of the blocks around it. Also handles the corner cases (fractional blocks are computed based
+ /// on the last pixels in the row/column which are also used in the previous block).
+ ///
+ private static void calculateThresholdForBlock(sbyte[] luminances, int subWidth, int subHeight, int width, int height, int[][] blackPoints, BitMatrix matrix)
+ {
+ for (int y = 0; y < subHeight; y++)
+ {
+ int yoffset = y << BLOCK_SIZE_POWER;
+ int maxYOffset = height - BLOCK_SIZE;
+ if (yoffset > maxYOffset)
+ {
+ yoffset = maxYOffset;
+ }
+ for (int x = 0; x < subWidth; x++)
+ {
+ int xoffset = x << BLOCK_SIZE_POWER;
+ int maxXOffset = width - BLOCK_SIZE;
+ if (xoffset > maxXOffset)
+ {
+ xoffset = maxXOffset;
+ }
+ int left = cap(x, 2, subWidth - 3);
+ int top = cap(y, 2, subHeight - 3);
+ int sum = 0;
+ for (int z = -2; z <= 2; z++)
+ {
+ int[] blackRow = blackPoints[top + z];
+ sum += blackRow[left - 2] + blackRow[left - 1] + blackRow[left] + blackRow[left + 1] + blackRow[left + 2];
+ }
+ int average = sum / 25;
+ thresholdBlock(luminances, xoffset, yoffset, average, width, matrix);
+ }
+ }
+ }
+
+ private static int cap(int value, int min, int max)
+ {
+ return value < min ? min : value > max ? max : value;
+ }
+
+ ///
+ /// Applies a single threshold to a block of pixels.
+ ///
+ private static void thresholdBlock(sbyte[] luminances, int xoffset, int yoffset, int threshold, int stride, BitMatrix matrix)
+ {
+ for (int y = 0, offset = yoffset * stride + xoffset; y < BLOCK_SIZE; y++, offset += stride)
+ {
+ for (int x = 0; x < BLOCK_SIZE; x++)
+ {
+ // Comparison needs to be <= so that black == 0 pixels are black even if the threshold is 0.
+ if ((luminances[offset + x] & 0xFF) <= threshold)
+ {
+ matrix.set(xoffset + x, yoffset + y);
+ }
+ }
+ }
+ }
+
+ ///
+ /// Calculates a single black point for each block of pixels and saves it away.
+ /// See the following thread for a discussion of this algorithm:
+ /// http://groups.google.com/group/zxing/browse_thread/thread/d06efa2c35a7ddc0
+ ///
+ private static int[][] calculateBlackPoints(sbyte[] luminances, int subWidth, int subHeight, int width, int height)
+ {
+//JAVA TO C# CONVERTER NOTE: The following call to the 'RectangularArrays' helper class reproduces the rectangular array initialization that is automatic in Java:
+//ORIGINAL LINE: int[][] blackPoints = new int[subHeight][subWidth];
+ int[][] blackPoints = RectangularArrays.ReturnRectangularIntArray(subHeight, subWidth);
+ for (int y = 0; y < subHeight; y++)
+ {
+ int yoffset = y << BLOCK_SIZE_POWER;
+ int maxYOffset = height - BLOCK_SIZE;
+ if (yoffset > maxYOffset)
+ {
+ yoffset = maxYOffset;
+ }
+ for (int x = 0; x < subWidth; x++)
+ {
+ int xoffset = x << BLOCK_SIZE_POWER;
+ int maxXOffset = width - BLOCK_SIZE;
+ if (xoffset > maxXOffset)
+ {
+ xoffset = maxXOffset;
+ }
+ int sum = 0;
+ int min = 0xFF;
+ int max = 0;
+ for (int yy = 0, offset = yoffset * width + xoffset; yy < BLOCK_SIZE; yy++, offset += width)
+ {
+ for (int xx = 0; xx < BLOCK_SIZE; xx++)
+ {
+ int pixel = luminances[offset + xx] & 0xFF;
+ sum += pixel;
+ // still looking for good contrast
+ if (pixel < min)
{
- sbyte[] luminances = source.Matrix;
- int width = source.Width;
- int height = source.Height;
- int subWidth = width >> 3;
- int subHeight = height >> 3;
- int[][] blackPoints = calculateBlackPoints(luminances, subWidth, subHeight, width);
-
- matrix = new BitMatrix(width, height);
- calculateThresholdForBlock(luminances, subWidth, subHeight, width, blackPoints, matrix);
+ min = pixel;
}
- else
+ if (pixel > max)
{
- // If the image is too small, fall back to the global histogram approach.
- matrix = base.BlackMatrix;
+ max = pixel;
}
- }
- }
-
- // For each 8x8 block in the image, calculate the average black point using a 5x5 grid
- // of the blocks around it. Also handles the corner cases, but will ignore up to 7 pixels
- // on the right edge and 7 pixels at the bottom of the image if the overall dimensions are not
- // multiples of eight. In practice, leaving those pixels white does not seem to be a problem.
- private static void calculateThresholdForBlock(sbyte[] luminances, int subWidth, int subHeight, int stride, int[][] blackPoints, BitMatrix matrix)
- {
- for (int y = 0; y < subHeight; y++)
- {
- for (int x = 0; x < subWidth; x++)
+ }
+ // short-circuit min/max tests once dynamic range is met
+ if (max - min > MIN_DYNAMIC_RANGE)
+ {
+ // finish the rest of the rows quickly
+ for (yy++, offset += width; yy < BLOCK_SIZE; yy++, offset += width)
{
- int left = (x > 1)?x:2;
- left = (left < subWidth - 2)?left:subWidth - 3;
- int top = (y > 1)?y:2;
- top = (top < subHeight - 2)?top:subHeight - 3;
- int sum = 0;
- for (int z = - 2; z <= 2; z++)
- {
- int[] blackRow = blackPoints[top + z];
- sum += blackRow[left - 2];
- sum += blackRow[left - 1];
- sum += blackRow[left];
- sum += blackRow[left + 1];
- sum += blackRow[left + 2];
- }
- int average = sum / 25;
- threshold8x8Block(luminances, x << 3, y << 3, average, stride, matrix);
+ for (int xx = 0; xx < BLOCK_SIZE; xx++)
+ {
+ sum += luminances[offset + xx] & 0xFF;
+ }
}
+ }
}
- }
-
- // Applies a single threshold to an 8x8 block of pixels.
- private static void threshold8x8Block(sbyte[] luminances, int xoffset, int yoffset, int threshold, int stride, BitMatrix matrix)
- {
- for (int y = 0; y < 8; y++)
+
+ // The default estimate is the average of the values in the block.
+ int average = sum >> (BLOCK_SIZE_POWER * 2);
+ if (max - min <= MIN_DYNAMIC_RANGE)
{
- int offset = (yoffset + y) * stride + xoffset;
- for (int x = 0; x < 8; x++)
+ // If variation within the block is low, assume this is a block with only light or only
+ // dark pixels. In that case we do not want to use the average, as it would divide this
+ // low contrast area into black and white pixels, essentially creating data out of noise.
+ //
+ // The default assumption is that the block is light/background. Since no estimate for
+ // the level of dark pixels exists locally, use half the min for the block.
+ average = min >> 1;
+
+ if (y > 0 && x > 0)
+ {
+ // Correct the "white background" assumption for blocks that have neighbors by comparing
+ // the pixels in this block to the previously calculated black points. This is based on
+ // the fact that dark barcode symbology is always surrounded by some amount of light
+ // background for which reasonable black point estimates were made. The bp estimated at
+ // the boundaries is used for the interior.
+
+ // The (min < bp) is arbitrary but works better than other heuristics that were tried.
+ int averageNeighborBlackPoint = (blackPoints[y - 1][x] + (2 * blackPoints[y][x - 1]) + blackPoints[y - 1][x - 1]) >> 2;
+ if (min < averageNeighborBlackPoint)
{
- int pixel = luminances[offset + x] & 0xff;
- if (pixel < threshold)
- {
- matrix.set_Renamed(xoffset + x, yoffset + y);
- }
+ average = averageNeighborBlackPoint;
}
+ }
}
+ blackPoints[y][x] = average;
+ }
}
-
- // Calculates a single black point for each 8x8 block of pixels and saves it away.
- private static int[][] calculateBlackPoints(sbyte[] luminances, int subWidth, int subHeight, int stride)
- {
- int[][] blackPoints = new int[subHeight][];
- for (int i = 0; i < subHeight; i++)
- {
- blackPoints[i] = new int[subWidth];
- }
- for (int y = 0; y < subHeight; y++)
- {
- for (int x = 0; x < subWidth; x++)
- {
- int sum = 0;
- int min = 255;
- int max = 0;
- for (int yy = 0; yy < 8; yy++)
- {
- int offset = ((y << 3) + yy) * stride + (x << 3);
- for (int xx = 0; xx < 8; xx++)
- {
- int pixel = luminances[offset + xx] & 0xff;
- sum += pixel;
- if (pixel < min)
- {
- min = pixel;
- }
- if (pixel > max)
- {
- max = pixel;
- }
- }
- }
-
- // If the contrast is inadequate, use half the minimum, so that this block will be
- // treated as part of the white background, but won't drag down neighboring blocks
- // too much.
- int average = (max - min > 24)?(sum >> 6):(min >> 1);
- blackPoints[y][x] = average;
- }
- }
- return blackPoints;
- }
+ return blackPoints;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/common/PerspectiveTransform.cs b/csharp/common/PerspectiveTransform.cs
index b516ef735..7928d03a6 100755
--- a/csharp/common/PerspectiveTransform.cs
+++ b/csharp/common/PerspectiveTransform.cs
@@ -1,146 +1,140 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common
{
-
- /// This class implements a perspective transform in two dimensions. Given four source and four
+
+ ///
+ /// This class implements a perspective transform in two dimensions. Given four source and four
/// destination points, it will compute the transformation implied between them. The code is based
/// directly upon section 3.4.2 of George Wolberg's "Digital Image Warping"; see pages 54-56.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class PerspectiveTransform
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'a11 '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_NOTE: Final was removed from the declaration of 'a12 '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_NOTE: Final was removed from the declaration of 'a13 '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_NOTE: Final was removed from the declaration of 'a21 '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_NOTE: Final was removed from the declaration of 'a22 '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_NOTE: Final was removed from the declaration of 'a23 '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_NOTE: Final was removed from the declaration of 'a31 '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_NOTE: Final was removed from the declaration of 'a32 '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_NOTE: Final was removed from the declaration of 'a33 '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private float a11;
- private float a12;
- private float a13;
- private float a21;
- private float a22;
- private float a23;
- private float a31;
- private float a32;
- private float a33;
-
- private PerspectiveTransform(float a11, float a21, float a31, float a12, float a22, float a32, float a13, float a23, float a33)
+
+ private readonly float a11;
+ private readonly float a12;
+ private readonly float a13;
+ private readonly float a21;
+ private readonly float a22;
+ private readonly float a23;
+ private readonly float a31;
+ private readonly float a32;
+ private readonly float a33;
+
+ private PerspectiveTransform(float a11, float a21, float a31, float a12, float a22, float a32, float a13, float a23, float a33)
+ {
+ this.a11 = a11;
+ this.a12 = a12;
+ this.a13 = a13;
+ this.a21 = a21;
+ this.a22 = a22;
+ this.a23 = a23;
+ this.a31 = a31;
+ this.a32 = a32;
+ this.a33 = a33;
+ }
+
+ public static PerspectiveTransform quadrilateralToQuadrilateral(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3, float x0p, float y0p, float x1p, float y1p, float x2p, float y2p, float x3p, float y3p)
+ {
+
+ PerspectiveTransform qToS = quadrilateralToSquare(x0, y0, x1, y1, x2, y2, x3, y3);
+ PerspectiveTransform sToQ = squareToQuadrilateral(x0p, y0p, x1p, y1p, x2p, y2p, x3p, y3p);
+ return sToQ.times(qToS);
+ }
+
+ public void transformPoints(float[] points)
+ {
+ int max = points.Length;
+ float a11 = this.a11;
+ float a12 = this.a12;
+ float a13 = this.a13;
+ float a21 = this.a21;
+ float a22 = this.a22;
+ float a23 = this.a23;
+ float a31 = this.a31;
+ float a32 = this.a32;
+ float a33 = this.a33;
+ for (int i = 0; i < max; i += 2)
{
- this.a11 = a11;
- this.a12 = a12;
- this.a13 = a13;
- this.a21 = a21;
- this.a22 = a22;
- this.a23 = a23;
- this.a31 = a31;
- this.a32 = a32;
- this.a33 = a33;
+ float x = points[i];
+ float y = points[i + 1];
+ float denominator = a13 * x + a23 * y + a33;
+ points[i] = (a11 * x + a21 * y + a31) / denominator;
+ points[i + 1] = (a12 * x + a22 * y + a32) / denominator;
}
-
- public static PerspectiveTransform quadrilateralToQuadrilateral(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3, float x0p, float y0p, float x1p, float y1p, float x2p, float y2p, float x3p, float y3p)
+ }
+
+ ///
+ /// Convenience method, not optimized for performance.
+ public void transformPoints(float[] xValues, float[] yValues)
+ {
+ int n = xValues.Length;
+ for (int i = 0; i < n; i++)
{
-
- PerspectiveTransform qToS = quadrilateralToSquare(x0, y0, x1, y1, x2, y2, x3, y3);
- PerspectiveTransform sToQ = squareToQuadrilateral(x0p, y0p, x1p, y1p, x2p, y2p, x3p, y3p);
- return sToQ.times(qToS);
+ float x = xValues[i];
+ float y = yValues[i];
+ float denominator = a13 * x + a23 * y + a33;
+ xValues[i] = (a11 * x + a21 * y + a31) / denominator;
+ yValues[i] = (a12 * x + a22 * y + a32) / denominator;
}
-
- public void transformPoints(float[] points)
+ }
+
+ public static PerspectiveTransform squareToQuadrilateral(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3)
+ {
+ float dx3 = x0 - x1 + x2 - x3;
+ float dy3 = y0 - y1 + y2 - y3;
+ if (dx3 == 0.0f && dy3 == 0.0f)
{
- int max = points.Length;
- float a11 = this.a11;
- float a12 = this.a12;
- float a13 = this.a13;
- float a21 = this.a21;
- float a22 = this.a22;
- float a23 = this.a23;
- float a31 = this.a31;
- float a32 = this.a32;
- float a33 = this.a33;
- for (int i = 0; i < max; i += 2)
- {
- float x = points[i];
- float y = points[i + 1];
- float denominator = a13 * x + a23 * y + a33;
- points[i] = (a11 * x + a21 * y + a31) / denominator;
- points[i + 1] = (a12 * x + a22 * y + a32) / denominator;
- }
+ // Affine
+ return new PerspectiveTransform(x1 - x0, x2 - x1, x0, y1 - y0, y2 - y1, y0, 0.0f, 0.0f, 1.0f);
}
-
- /// Convenience method, not optimized for performance.
- public void transformPoints(float[] xValues, float[] yValues)
+ else
{
- int n = xValues.Length;
- for (int i = 0; i < n; i++)
- {
- float x = xValues[i];
- float y = yValues[i];
- float denominator = a13 * x + a23 * y + a33;
- xValues[i] = (a11 * x + a21 * y + a31) / denominator;
- yValues[i] = (a12 * x + a22 * y + a32) / denominator;
- }
- }
-
- public static PerspectiveTransform squareToQuadrilateral(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3)
- {
- float dy2 = y3 - y2;
- float dy3 = y0 - y1 + y2 - y3;
- if (dy2 == 0.0f && dy3 == 0.0f)
- {
- return new PerspectiveTransform(x1 - x0, x2 - x1, x0, y1 - y0, y2 - y1, y0, 0.0f, 0.0f, 1.0f);
- }
- else
- {
- float dx1 = x1 - x2;
- float dx2 = x3 - x2;
- float dx3 = x0 - x1 + x2 - x3;
- float dy1 = y1 - y2;
- float denominator = dx1 * dy2 - dx2 * dy1;
- float a13 = (dx3 * dy2 - dx2 * dy3) / denominator;
- float a23 = (dx1 * dy3 - dx3 * dy1) / denominator;
- return new PerspectiveTransform(x1 - x0 + a13 * x1, x3 - x0 + a23 * x3, x0, y1 - y0 + a13 * y1, y3 - y0 + a23 * y3, y0, a13, a23, 1.0f);
- }
- }
-
- public static PerspectiveTransform quadrilateralToSquare(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3)
- {
- // Here, the adjoint serves as the inverse:
- return squareToQuadrilateral(x0, y0, x1, y1, x2, y2, x3, y3).buildAdjoint();
- }
-
- internal PerspectiveTransform buildAdjoint()
- {
- // Adjoint is the transpose of the cofactor matrix:
- return new PerspectiveTransform(a22 * a33 - a23 * a32, a23 * a31 - a21 * a33, a21 * a32 - a22 * a31, a13 * a32 - a12 * a33, a11 * a33 - a13 * a31, a12 * a31 - a11 * a32, a12 * a23 - a13 * a22, a13 * a21 - a11 * a23, a11 * a22 - a12 * a21);
- }
-
- internal PerspectiveTransform times(PerspectiveTransform other)
- {
- return new PerspectiveTransform(a11 * other.a11 + a21 * other.a12 + a31 * other.a13, a11 * other.a21 + a21 * other.a22 + a31 * other.a23, a11 * other.a31 + a21 * other.a32 + a31 * other.a33, a12 * other.a11 + a22 * other.a12 + a32 * other.a13, a12 * other.a21 + a22 * other.a22 + a32 * other.a23, a12 * other.a31 + a22 * other.a32 + a32 * other.a33, a13 * other.a11 + a23 * other.a12 + a33 * other.a13, a13 * other.a21 + a23 * other.a22 + a33 * other.a23, a13 * other.a31 + a23 * other.a32 + a33 * other.a33);
+ float dx1 = x1 - x2;
+ float dx2 = x3 - x2;
+ float dy1 = y1 - y2;
+ float dy2 = y3 - y2;
+ float denominator = dx1 * dy2 - dx2 * dy1;
+ float a13 = (dx3 * dy2 - dx2 * dy3) / denominator;
+ float a23 = (dx1 * dy3 - dx3 * dy1) / denominator;
+ return new PerspectiveTransform(x1 - x0 + a13 * x1, x3 - x0 + a23 * x3, x0, y1 - y0 + a13 * y1, y3 - y0 + a23 * y3, y0, a13, a23, 1.0f);
}
+ }
+
+ public static PerspectiveTransform quadrilateralToSquare(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3)
+ {
+ // Here, the adjoint serves as the inverse:
+ return squareToQuadrilateral(x0, y0, x1, y1, x2, y2, x3, y3).buildAdjoint();
+ }
+
+ internal PerspectiveTransform buildAdjoint()
+ {
+ // Adjoint is the transpose of the cofactor matrix:
+ return new PerspectiveTransform(a22 * a33 - a23 * a32, a23 * a31 - a21 * a33, a21 * a32 - a22 * a31, a13 * a32 - a12 * a33, a11 * a33 - a13 * a31, a12 * a31 - a11 * a32, a12 * a23 - a13 * a22, a13 * a21 - a11 * a23, a11 * a22 - a12 * a21);
+ }
+
+ internal PerspectiveTransform times(PerspectiveTransform other)
+ {
+ return new PerspectiveTransform(a11 * other.a11 + a21 * other.a12 + a31 * other.a13, a11 * other.a21 + a21 * other.a22 + a31 * other.a23, a11 * other.a31 + a21 * other.a32 + a31 * other.a33, a12 * other.a11 + a22 * other.a12 + a32 * other.a13, a12 * other.a21 + a22 * other.a22 + a32 * other.a23, a12 * other.a31 + a22 * other.a32 + a32 * other.a33, a13 * other.a11 + a23 * other.a12 + a33 * other.a13, a13 * other.a21 + a23 * other.a22 + a33 * other.a23, a13 * other.a31 + a23 * other.a32 + a33 * other.a33);
+
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/common/detector/MonochromeRectangleDetector.cs b/csharp/common/detector/MonochromeRectangleDetector.cs
index eea5cb107..5f8b078a1 100755
--- a/csharp/common/detector/MonochromeRectangleDetector.cs
+++ b/csharp/common/detector/MonochromeRectangleDetector.cs
@@ -1,255 +1,237 @@
-/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using ReaderException = com.google.zxing.ReaderException;
-using ResultPoint = com.google.zxing.ResultPoint;
-using BitMatrix = com.google.zxing.common.BitMatrix;
+
+/*
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common.detector
{
-
- /// A somewhat generic detector that looks for a barcode-like rectangular region within an image.
+
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using ResultPoint = com.google.zxing.ResultPoint;
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+
+ ///
+ /// A somewhat generic detector that looks for a barcode-like rectangular region within an image.
/// It looks within a mostly white region of an image for a region of black and white, but mostly
/// black. It returns the four corners of the region, as best it can determine.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class MonochromeRectangleDetector
{
-
- private const int MAX_MODULES = 32;
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'image '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private BitMatrix image;
-
- public MonochromeRectangleDetector(BitMatrix image)
+
+ private const int MAX_MODULES = 32;
+
+ private readonly BitMatrix image;
+
+ public MonochromeRectangleDetector(BitMatrix image)
+ {
+ this.image = image;
+ }
+
+ ///
+ /// Detects a rectangular region of black and white -- mostly black -- with a region of mostly
+ /// white, in an image.
+ ///
+ /// [] describing the corners of the rectangular region. The first and
+ /// last points are opposed on the diagonal, as are the second and third. The first point will be
+ /// the topmost point and the last, the bottommost. The second point will be leftmost and the
+ /// third, the rightmost
+ /// if no Data Matrix Code can be found
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.ResultPoint[] detect() throws com.google.zxing.NotFoundException
+ public ResultPoint[] detect()
+ {
+ int height = image.Height;
+ int width = image.Width;
+ int halfHeight = height >> 1;
+ int halfWidth = width >> 1;
+ int deltaY = Math.Max(1, height / (MAX_MODULES << 3));
+ int deltaX = Math.Max(1, width / (MAX_MODULES << 3));
+
+ int top = 0;
+ int bottom = height;
+ int left = 0;
+ int right = width;
+ ResultPoint pointA = findCornerFromCenter(halfWidth, 0, left, right, halfHeight, -deltaY, top, bottom, halfWidth >> 1);
+ top = (int) pointA.Y - 1;
+ ResultPoint pointB = findCornerFromCenter(halfWidth, -deltaX, left, right, halfHeight, 0, top, bottom, halfHeight >> 1);
+ left = (int) pointB.X - 1;
+ ResultPoint pointC = findCornerFromCenter(halfWidth, deltaX, left, right, halfHeight, 0, top, bottom, halfHeight >> 1);
+ right = (int) pointC.X + 1;
+ ResultPoint pointD = findCornerFromCenter(halfWidth, 0, left, right, halfHeight, deltaY, top, bottom, halfWidth >> 1);
+ bottom = (int) pointD.Y + 1;
+
+ // Go try to find point A again with better information -- might have been off at first.
+ pointA = findCornerFromCenter(halfWidth, 0, left, right, halfHeight, -deltaY, top, bottom, halfWidth >> 2);
+
+ return new ResultPoint[] {pointA, pointB, pointC, pointD};
+ }
+
+ ///
+ /// Attempts to locate a corner of the barcode by scanning up, down, left or right from a center
+ /// point which should be within the barcode.
+ ///
+ /// center's x component (horizontal)
+ /// same as deltaY but change in x per step instead
+ /// minimum value of x
+ /// maximum value of x
+ /// center's y component (vertical)
+ /// change in y per step. If scanning up this is negative; down, positive;
+ /// left or right, 0
+ /// minimum value of y to search through (meaningless when di == 0)
+ /// maximum value of y
+ /// maximum run of white pixels that can still be considered to be within
+ /// the barcode
+ /// a encapsulating the corner that was found
+ /// if such a point cannot be found
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private com.google.zxing.ResultPoint findCornerFromCenter(int centerX, int deltaX, int left, int right, int centerY, int deltaY, int top, int bottom, int maxWhiteRun) throws com.google.zxing.NotFoundException
+ private ResultPoint findCornerFromCenter(int centerX, int deltaX, int left, int right, int centerY, int deltaY, int top, int bottom, int maxWhiteRun)
+ {
+ int[] lastRange = null;
+ for (int y = centerY, x = centerX; y < bottom && y >= top && x < right && x >= left; y += deltaY, x += deltaX)
{
- this.image = image;
- }
-
- /// Detects a rectangular region of black and white -- mostly black -- with a region of mostly
- /// white, in an image.
- ///
- ///
- /// {@link ResultPoint}[] describing the corners of the rectangular region. The first and
- /// last points are opposed on the diagonal, as are the second and third. The first point will be
- /// the topmost point and the last, the bottommost. The second point will be leftmost and the
- /// third, the rightmost
- ///
- /// ReaderException if no Data Matrix Code can be found
- public ResultPoint[] detect()
- {
- int height = image.Height;
- int width = image.Width;
- int halfHeight = height >> 1;
- int halfWidth = width >> 1;
- int deltaY = System.Math.Max(1, height / (MAX_MODULES << 3));
- int deltaX = System.Math.Max(1, width / (MAX_MODULES << 3));
-
- int top = 0;
- int bottom = height;
- int left = 0;
- int right = width;
- ResultPoint pointA = findCornerFromCenter(halfWidth, 0, left, right, halfHeight, - deltaY, top, bottom, halfWidth >> 1);
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- top = (int) pointA.Y - 1;
- ResultPoint pointB = findCornerFromCenter(halfWidth, - deltaX, left, right, halfHeight, 0, top, bottom, halfHeight >> 1);
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- left = (int) pointB.X - 1;
- ResultPoint pointC = findCornerFromCenter(halfWidth, deltaX, left, right, halfHeight, 0, top, bottom, halfHeight >> 1);
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- right = (int) pointC.X + 1;
- ResultPoint pointD = findCornerFromCenter(halfWidth, 0, left, right, halfHeight, deltaY, top, bottom, halfWidth >> 1);
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- bottom = (int) pointD.Y + 1;
-
- // Go try to find point A again with better information -- might have been off at first.
- pointA = findCornerFromCenter(halfWidth, 0, left, right, halfHeight, - deltaY, top, bottom, halfWidth >> 2);
-
- return new ResultPoint[]{pointA, pointB, pointC, pointD};
- }
-
- /// Attempts to locate a corner of the barcode by scanning up, down, left or right from a center
- /// point which should be within the barcode.
- ///
- ///
- /// center's x component (horizontal)
- ///
- /// same as deltaY but change in x per step instead
- ///
- /// minimum value of x
- ///
- /// maximum value of x
- ///
- /// center's y component (vertical)
- ///
- /// change in y per step. If scanning up this is negative; down, positive;
- /// left or right, 0
- ///
- /// minimum value of y to search through (meaningless when di == 0)
- ///
- /// maximum value of y
- ///
- /// maximum run of white pixels that can still be considered to be within
- /// the barcode
- ///
- /// a {@link com.google.zxing.ResultPoint} encapsulating the corner that was found
- ///
- /// com.google.zxing.ReaderException if such a point cannot be found
- private ResultPoint findCornerFromCenter(int centerX, int deltaX, int left, int right, int centerY, int deltaY, int top, int bottom, int maxWhiteRun)
- {
- int[] lastRange = null;
- for (int y = centerY, x = centerX; y < bottom && y >= top && x < right && x >= left; y += deltaY, x += deltaX)
+ int[] range;
+ if (deltaX == 0)
+ {
+ // horizontal slices, up and down
+ range = blackWhiteRange(y, maxWhiteRun, left, right, true);
+ }
+ else
+ {
+ // vertical slices, left and right
+ range = blackWhiteRange(x, maxWhiteRun, top, bottom, false);
+ }
+ if (range == null)
+ {
+ if (lastRange == null)
{
- int[] range;
- if (deltaX == 0)
- {
- // horizontal slices, up and down
- range = blackWhiteRange(y, maxWhiteRun, left, right, true);
- }
- else
- {
- // vertical slices, left and right
- range = blackWhiteRange(x, maxWhiteRun, top, bottom, false);
- }
- if (range == null)
- {
- if (lastRange == null)
- {
- throw ReaderException.Instance;
- }
- // lastRange was found
- if (deltaX == 0)
- {
- int lastY = y - deltaY;
- if (lastRange[0] < centerX)
- {
- if (lastRange[1] > centerX)
- {
- // straddle, choose one or the other based on direction
- return new ResultPoint(deltaY > 0?lastRange[0]:lastRange[1], lastY);
- }
- return new ResultPoint(lastRange[0], lastY);
- }
- else
- {
- return new ResultPoint(lastRange[1], lastY);
- }
- }
- else
- {
- int lastX = x - deltaX;
- if (lastRange[0] < centerY)
- {
- if (lastRange[1] > centerY)
- {
- return new ResultPoint(lastX, deltaX < 0?lastRange[0]:lastRange[1]);
- }
- return new ResultPoint(lastX, lastRange[0]);
- }
- else
- {
- return new ResultPoint(lastX, lastRange[1]);
- }
- }
- }
- lastRange = range;
+ throw NotFoundException.NotFoundInstance;
}
- throw ReaderException.Instance;
+ // lastRange was found
+ if (deltaX == 0)
+ {
+ int lastY = y - deltaY;
+ if (lastRange[0] < centerX)
+ {
+ if (lastRange[1] > centerX)
+ {
+ // straddle, choose one or the other based on direction
+ return new ResultPoint(deltaY > 0 ? lastRange[0] : lastRange[1], lastY);
+ }
+ return new ResultPoint(lastRange[0], lastY);
+ }
+ else
+ {
+ return new ResultPoint(lastRange[1], lastY);
+ }
+ }
+ else
+ {
+ int lastX = x - deltaX;
+ if (lastRange[0] < centerY)
+ {
+ if (lastRange[1] > centerY)
+ {
+ return new ResultPoint(lastX, deltaX < 0 ? lastRange[0] : lastRange[1]);
+ }
+ return new ResultPoint(lastX, lastRange[0]);
+ }
+ else
+ {
+ return new ResultPoint(lastX, lastRange[1]);
+ }
+ }
+ }
+ lastRange = range;
}
-
- /// Computes the start and end of a region of pixels, either horizontally or vertically, that could
- /// be part of a Data Matrix barcode.
- ///
- ///
- /// if scanning horizontally, this is the row (the fixed vertical location)
- /// where we are scanning. If scanning vertically it's the column, the fixed horizontal location
- ///
- /// largest run of white pixels that can still be considered part of the
- /// barcode region
- ///
- /// minimum pixel location, horizontally or vertically, to consider
- ///
- /// maximum pixel location, horizontally or vertically, to consider
- ///
- /// if true, we're scanning left-right, instead of up-down
- ///
- /// int[] with start and end of found range, or null if no such range is found
- /// (e.g. only white was found)
- ///
- private int[] blackWhiteRange(int fixedDimension, int maxWhiteRun, int minDim, int maxDim, bool horizontal)
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ ///
+ /// Computes the start and end of a region of pixels, either horizontally or vertically, that could
+ /// be part of a Data Matrix barcode.
+ ///
+ /// if scanning horizontally, this is the row (the fixed vertical location)
+ /// where we are scanning. If scanning vertically it's the column, the fixed horizontal location
+ /// largest run of white pixels that can still be considered part of the
+ /// barcode region
+ /// minimum pixel location, horizontally or vertically, to consider
+ /// maximum pixel location, horizontally or vertically, to consider
+ /// if true, we're scanning left-right, instead of up-down
+ /// int[] with start and end of found range, or null if no such range is found
+ /// (e.g. only white was found)
+ private int[] blackWhiteRange(int fixedDimension, int maxWhiteRun, int minDim, int maxDim, bool horizontal)
+ {
+
+ int center = (minDim + maxDim) >> 1;
+
+ // Scan left/up first
+ int start = center;
+ while (start >= minDim)
{
-
- int center = (minDim + maxDim) >> 1;
-
- // Scan left/up first
- int start = center;
- while (start >= minDim)
+ if (horizontal ? image.get(start, fixedDimension) : image.get(fixedDimension, start))
+ {
+ start--;
+ }
+ else
+ {
+ int whiteRunStart = start;
+ do
{
- if (horizontal?image.get_Renamed(start, fixedDimension):image.get_Renamed(fixedDimension, start))
- {
- start--;
- }
- else
- {
- int whiteRunStart = start;
- do
- {
- start--;
- }
- while (start >= minDim && !(horizontal?image.get_Renamed(start, fixedDimension):image.get_Renamed(fixedDimension, start)));
- int whiteRunSize = whiteRunStart - start;
- if (start < minDim || whiteRunSize > maxWhiteRun)
- {
- start = whiteRunStart;
- break;
- }
- }
- }
- start++;
-
- // Then try right/down
- int end = center;
- while (end < maxDim)
+ start--;
+ } while (start >= minDim && !(horizontal ? image.get(start, fixedDimension) : image.get(fixedDimension, start)));
+ int whiteRunSize = whiteRunStart - start;
+ if (start < minDim || whiteRunSize > maxWhiteRun)
{
- if (horizontal?image.get_Renamed(end, fixedDimension):image.get_Renamed(fixedDimension, end))
- {
- end++;
- }
- else
- {
- int whiteRunStart = end;
- do
- {
- end++;
- }
- while (end < maxDim && !(horizontal?image.get_Renamed(end, fixedDimension):image.get_Renamed(fixedDimension, end)));
- int whiteRunSize = end - whiteRunStart;
- if (end >= maxDim || whiteRunSize > maxWhiteRun)
- {
- end = whiteRunStart;
- break;
- }
- }
+ start = whiteRunStart;
+ break;
}
- end--;
-
- return end > start?new int[]{start, end}:null;
+ }
}
+ start++;
+
+ // Then try right/down
+ int end = center;
+ while (end < maxDim)
+ {
+ if (horizontal ? image.get(end, fixedDimension) : image.get(fixedDimension, end))
+ {
+ end++;
+ }
+ else
+ {
+ int whiteRunStart = end;
+ do
+ {
+ end++;
+ } while (end < maxDim && !(horizontal ? image.get(end, fixedDimension) : image.get(fixedDimension, end)));
+ int whiteRunSize = end - whiteRunStart;
+ if (end >= maxDim || whiteRunSize > maxWhiteRun)
+ {
+ end = whiteRunStart;
+ break;
+ }
+ }
+ }
+ end--;
+
+ return end > start ? new int[]{start, end} : null;
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/common/reedsolomon/ReedSolomonDecoder.cs b/csharp/common/reedsolomon/ReedSolomonDecoder.cs
index 18123116e..8aaa3625d 100755
--- a/csharp/common/reedsolomon/ReedSolomonDecoder.cs
+++ b/csharp/common/reedsolomon/ReedSolomonDecoder.cs
@@ -1,23 +1,24 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common.reedsolomon
{
-
- /// Implements Reed-Solomon decoding, as the name implies.
+
+ ///
+ /// Implements Reed-Solomon decoding, as the name implies.
///
/// The algorithm will not be explained here, but the following references were helpful
/// in creating this implementation:
@@ -34,184 +35,184 @@ namespace com.google.zxing.common.reedsolomon
/// Much credit is due to William Rucklidge since portions of this code are an indirect
/// port of his C++ Reed-Solomon implementation.
///
+ /// @author Sean Owen
+ /// @author William Rucklidge
+ /// @author sanfordsquires
///
- /// Sean Owen
- ///
- /// William Rucklidge
- ///
- /// sanfordsquires
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class ReedSolomonDecoder
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'field '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private GF256 field;
-
- public ReedSolomonDecoder(GF256 field)
+
+ private readonly GenericGF field;
+
+ public ReedSolomonDecoder(GenericGF field)
+ {
+ this.field = field;
+ }
+
+ ///
+ /// Decodes given set of received codewords, which include both data and error-correction
+ /// codewords. Really, this means it uses Reed-Solomon to detect and correct errors, in-place,
+ /// in the input.
+ ///
+ /// data and error-correction codewords
+ /// number of error-correction codewords available
+ /// if decoding fails for any reason
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public void decode(int[] received, int twoS) throws ReedSolomonException
+ public void decode(int[] received, int twoS)
+ {
+ GenericGFPoly poly = new GenericGFPoly(field, received);
+ int[] syndromeCoefficients = new int[twoS];
+ bool dataMatrix = field.Equals(GenericGF.DATA_MATRIX_FIELD_256);
+ bool noError = true;
+ for (int i = 0; i < twoS; i++)
{
- this.field = field;
+ // Thanks to sanfordsquires for this fix:
+ int eval = poly.evaluateAt(field.exp(dataMatrix ? i + 1 : i));
+ syndromeCoefficients[syndromeCoefficients.Length - 1 - i] = eval;
+ if (eval != 0)
+ {
+ noError = false;
+ }
}
-
- /// Decodes given set of received codewords, which include both data and error-correction
- /// codewords. Really, this means it uses Reed-Solomon to detect and correct errors, in-place,
- /// in the input.
- ///
- ///
- /// data and error-correction codewords
- ///
- /// number of error-correction codewords available
- ///
- /// ReedSolomonException if decoding fails for any reason
- public void decode(int[] received, int twoS)
+ if (noError)
{
- GF256Poly poly = new GF256Poly(field, received);
- int[] syndromeCoefficients = new int[twoS];
- bool dataMatrix = field.Equals(GF256.DATA_MATRIX_FIELD);
- bool noError = true;
- for (int i = 0; i < twoS; i++)
- {
- // Thanks to sanfordsquires for this fix:
- int eval = poly.evaluateAt(field.exp(dataMatrix?i + 1:i));
- syndromeCoefficients[syndromeCoefficients.Length - 1 - i] = eval;
- if (eval != 0)
- {
- noError = false;
- }
- }
- if (noError)
- {
- return ;
- }
- GF256Poly syndrome = new GF256Poly(field, syndromeCoefficients);
- GF256Poly[] sigmaOmega = runEuclideanAlgorithm(field.buildMonomial(twoS, 1), syndrome, twoS);
- GF256Poly sigma = sigmaOmega[0];
- GF256Poly omega = sigmaOmega[1];
- int[] errorLocations = findErrorLocations(sigma);
- int[] errorMagnitudes = findErrorMagnitudes(omega, errorLocations, dataMatrix);
- for (int i = 0; i < errorLocations.Length; i++)
- {
- int position = received.Length - 1 - field.log(errorLocations[i]);
- if (position < 0)
- {
- throw new ReedSolomonException("Bad error location");
- }
- received[position] = GF256.addOrSubtract(received[position], errorMagnitudes[i]);
- }
+ return;
}
-
- private GF256Poly[] runEuclideanAlgorithm(GF256Poly a, GF256Poly b, int R)
+ GenericGFPoly syndrome = new GenericGFPoly(field, syndromeCoefficients);
+ GenericGFPoly[] sigmaOmega = runEuclideanAlgorithm(field.buildMonomial(twoS, 1), syndrome, twoS);
+ GenericGFPoly sigma = sigmaOmega[0];
+ GenericGFPoly omega = sigmaOmega[1];
+ int[] errorLocations = findErrorLocations(sigma);
+ int[] errorMagnitudes = findErrorMagnitudes(omega, errorLocations, dataMatrix);
+ for (int i = 0; i < errorLocations.Length; i++)
{
- // Assume a's degree is >= b's
- if (a.Degree < b.Degree)
- {
- GF256Poly temp = a;
- a = b;
- b = temp;
- }
-
- GF256Poly rLast = a;
- GF256Poly r = b;
- GF256Poly sLast = field.One;
- GF256Poly s = field.Zero;
- GF256Poly tLast = field.Zero;
- GF256Poly t = field.One;
-
- // Run Euclidean algorithm until r's degree is less than R/2
- while (r.Degree >= R / 2)
- {
- GF256Poly rLastLast = rLast;
- GF256Poly sLastLast = sLast;
- GF256Poly tLastLast = tLast;
- rLast = r;
- sLast = s;
- tLast = t;
-
- // Divide rLastLast by rLast, with quotient in q and remainder in r
- if (rLast.Zero)
- {
- // Oops, Euclidean algorithm already terminated?
- throw new ReedSolomonException("r_{i-1} was zero");
- }
- r = rLastLast;
- GF256Poly q = field.Zero;
- int denominatorLeadingTerm = rLast.getCoefficient(rLast.Degree);
- int dltInverse = field.inverse(denominatorLeadingTerm);
- while (r.Degree >= rLast.Degree && !r.Zero)
- {
- int degreeDiff = r.Degree - rLast.Degree;
- int scale = field.multiply(r.getCoefficient(r.Degree), dltInverse);
- q = q.addOrSubtract(field.buildMonomial(degreeDiff, scale));
- r = r.addOrSubtract(rLast.multiplyByMonomial(degreeDiff, scale));
- }
-
- s = q.multiply(sLast).addOrSubtract(sLastLast);
- t = q.multiply(tLast).addOrSubtract(tLastLast);
- }
-
- int sigmaTildeAtZero = t.getCoefficient(0);
- if (sigmaTildeAtZero == 0)
- {
- throw new ReedSolomonException("sigmaTilde(0) was zero");
- }
-
- int inverse = field.inverse(sigmaTildeAtZero);
- GF256Poly sigma = t.multiply(inverse);
- GF256Poly omega = r.multiply(inverse);
- return new GF256Poly[]{sigma, omega};
+ int position = received.Length - 1 - field.log(errorLocations[i]);
+ if (position < 0)
+ {
+ throw new ReedSolomonException("Bad error location");
+ }
+ received[position] = GenericGF.addOrSubtract(received[position], errorMagnitudes[i]);
}
-
- private int[] findErrorLocations(GF256Poly errorLocator)
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private GenericGFPoly[] runEuclideanAlgorithm(GenericGFPoly a, GenericGFPoly b, int R) throws ReedSolomonException
+ private GenericGFPoly[] runEuclideanAlgorithm(GenericGFPoly a, GenericGFPoly b, int R)
+ {
+ // Assume a's degree is >= b's
+ if (a.Degree < b.Degree)
{
- // This is a direct application of Chien's search
- int numErrors = errorLocator.Degree;
- if (numErrors == 1)
- {
- // shortcut
- return new int[]{errorLocator.getCoefficient(1)};
- }
- int[] result = new int[numErrors];
- int e = 0;
- for (int i = 1; i < 256 && e < numErrors; i++)
- {
- if (errorLocator.evaluateAt(i) == 0)
- {
- result[e] = field.inverse(i);
- e++;
- }
- }
- if (e != numErrors)
- {
- throw new ReedSolomonException("Error locator degree does not match number of roots");
- }
- return result;
+ GenericGFPoly temp = a;
+ a = b;
+ b = temp;
}
-
- private int[] findErrorMagnitudes(GF256Poly errorEvaluator, int[] errorLocations, bool dataMatrix)
+
+ GenericGFPoly rLast = a;
+ GenericGFPoly r = b;
+ GenericGFPoly tLast = field.Zero;
+ GenericGFPoly t = field.One;
+
+ // Run Euclidean algorithm until r's degree is less than R/2
+ while (r.Degree >= R / 2)
{
- // This is directly applying Forney's Formula
- int s = errorLocations.Length;
- int[] result = new int[s];
- for (int i = 0; i < s; i++)
- {
- int xiInverse = field.inverse(errorLocations[i]);
- int denominator = 1;
- for (int j = 0; j < s; j++)
- {
- if (i != j)
- {
- denominator = field.multiply(denominator, GF256.addOrSubtract(1, field.multiply(errorLocations[j], xiInverse)));
- }
- }
- result[i] = field.multiply(errorEvaluator.evaluateAt(xiInverse), field.inverse(denominator));
- // Thanks to sanfordsquires for this fix:
- if (dataMatrix)
- {
- result[i] = field.multiply(result[i], xiInverse);
- }
- }
- return result;
+ GenericGFPoly rLastLast = rLast;
+ GenericGFPoly tLastLast = tLast;
+ rLast = r;
+ tLast = t;
+
+ // Divide rLastLast by rLast, with quotient in q and remainder in r
+ if (rLast.Zero)
+ {
+ // Oops, Euclidean algorithm already terminated?
+ throw new ReedSolomonException("r_{i-1} was zero");
+ }
+ r = rLastLast;
+ GenericGFPoly q = field.Zero;
+ int denominatorLeadingTerm = rLast.getCoefficient(rLast.Degree);
+ int dltInverse = field.inverse(denominatorLeadingTerm);
+ while (r.Degree >= rLast.Degree && !r.Zero)
+ {
+ int degreeDiff = r.Degree - rLast.Degree;
+ int scale = field.multiply(r.getCoefficient(r.Degree), dltInverse);
+ q = q.addOrSubtract(field.buildMonomial(degreeDiff, scale));
+ r = r.addOrSubtract(rLast.multiplyByMonomial(degreeDiff, scale));
+ }
+
+ t = q.multiply(tLast).addOrSubtract(tLastLast);
}
+
+ int sigmaTildeAtZero = t.getCoefficient(0);
+ if (sigmaTildeAtZero == 0)
+ {
+ throw new ReedSolomonException("sigmaTilde(0) was zero");
+ }
+
+ int inverse = field.inverse(sigmaTildeAtZero);
+ GenericGFPoly sigma = t.multiply(inverse);
+ GenericGFPoly omega = r.multiply(inverse);
+ return new GenericGFPoly[]{sigma, omega};
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private int[] findErrorLocations(GenericGFPoly errorLocator) throws ReedSolomonException
+ private int[] findErrorLocations(GenericGFPoly errorLocator)
+ {
+ // This is a direct application of Chien's search
+ int numErrors = errorLocator.Degree;
+ if (numErrors == 1) // shortcut
+ {
+ return new int[] {errorLocator.getCoefficient(1)};
+ }
+ int[] result = new int[numErrors];
+ int e = 0;
+ for (int i = 1; i < field.Size && e < numErrors; i++)
+ {
+ if (errorLocator.evaluateAt(i) == 0)
+ {
+ result[e] = field.inverse(i);
+ e++;
+ }
+ }
+ if (e != numErrors)
+ {
+ throw new ReedSolomonException("Error locator degree does not match number of roots");
+ }
+ return result;
+ }
+
+ private int[] findErrorMagnitudes(GenericGFPoly errorEvaluator, int[] errorLocations, bool dataMatrix)
+ {
+ // This is directly applying Forney's Formula
+ int s = errorLocations.Length;
+ int[] result = new int[s];
+ for (int i = 0; i < s; i++)
+ {
+ int xiInverse = field.inverse(errorLocations[i]);
+ int denominator = 1;
+ for (int j = 0; j < s; j++)
+ {
+ if (i != j)
+ {
+ //denominator = field.multiply(denominator,
+ // GenericGF.addOrSubtract(1, field.multiply(errorLocations[j], xiInverse)));
+ // Above should work but fails on some Apple and Linux JDKs due to a Hotspot bug.
+ // Below is a funny-looking workaround from Steven Parkes
+ int term = field.multiply(errorLocations[j], xiInverse);
+ int termPlus1 = (term & 0x1) == 0 ? term | 1 : term & ~1;
+ denominator = field.multiply(denominator, termPlus1);
+ }
+ }
+ result[i] = field.multiply(errorEvaluator.evaluateAt(xiInverse), field.inverse(denominator));
+ // Thanks to sanfordsquires for this fix:
+ if (dataMatrix)
+ {
+ result[i] = field.multiply(result[i], xiInverse);
+ }
+ }
+ return result;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/common/reedsolomon/ReedSolomonEncoder.cs b/csharp/common/reedsolomon/ReedSolomonEncoder.cs
index 162f80ebc..330e8757b 100755
--- a/csharp/common/reedsolomon/ReedSolomonEncoder.cs
+++ b/csharp/common/reedsolomon/ReedSolomonEncoder.cs
@@ -1,89 +1,90 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
+using System.Collections.Generic;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common.reedsolomon
{
-
- /// Implements Reed-Solomon enbcoding, as the name implies.
+
+
+ ///
+ /// Implements Reed-Solomon enbcoding, as the name implies.
///
+ /// @author Sean Owen
+ /// @author William Rucklidge
///
- /// Sean Owen
- ///
- /// William Rucklidge
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class ReedSolomonEncoder
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'field '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private GF256 field;
- //UPGRADE_NOTE: Final was removed from the declaration of 'cachedGenerators '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.Collections.ArrayList cachedGenerators;
-
- public ReedSolomonEncoder(GF256 field)
+
+ private readonly GenericGF field;
+ private readonly IList cachedGenerators;
+
+ public ReedSolomonEncoder(GenericGF field)
+ {
+ if (!GenericGF.QR_CODE_FIELD_256.Equals(field))
{
- if (!GF256.QR_CODE_FIELD.Equals(field))
- {
- throw new System.ArgumentException("Only QR Code is supported at this time");
- }
- this.field = field;
- this.cachedGenerators = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10));
- cachedGenerators.Add(new GF256Poly(field, new int[]{1}));
+ throw new System.ArgumentException("Only QR Code is supported at this time");
}
-
- private GF256Poly buildGenerator(int degree)
+ this.field = field;
+ this.cachedGenerators = new List();
+ cachedGenerators.Add(new GenericGFPoly(field, new int[]{1}));
+ }
+
+ private GenericGFPoly buildGenerator(int degree)
+ {
+ if (degree >= cachedGenerators.Count)
{
- if (degree >= cachedGenerators.Count)
- {
- GF256Poly lastGenerator = (GF256Poly) cachedGenerators[cachedGenerators.Count - 1];
- for (int d = cachedGenerators.Count; d <= degree; d++)
- {
- GF256Poly nextGenerator = lastGenerator.multiply(new GF256Poly(field, new int[]{1, field.exp(d - 1)}));
- cachedGenerators.Add(nextGenerator);
- lastGenerator = nextGenerator;
- }
- }
- return (GF256Poly) cachedGenerators[degree];
+ GenericGFPoly lastGenerator = cachedGenerators[cachedGenerators.Count - 1];
+ for (int d = cachedGenerators.Count; d <= degree; d++)
+ {
+ GenericGFPoly nextGenerator = lastGenerator.multiply(new GenericGFPoly(field, new int[] {1, field.exp(d - 1)}));
+ cachedGenerators.Add(nextGenerator);
+ lastGenerator = nextGenerator;
+ }
}
-
- public void encode(int[] toEncode, int ecBytes)
+ return cachedGenerators[degree];
+ }
+
+ public void encode(int[] toEncode, int ecBytes)
+ {
+ if (ecBytes == 0)
{
- if (ecBytes == 0)
- {
- throw new System.ArgumentException("No error correction bytes");
- }
- int dataBytes = toEncode.Length - ecBytes;
- if (dataBytes <= 0)
- {
- throw new System.ArgumentException("No data bytes provided");
- }
- GF256Poly generator = buildGenerator(ecBytes);
- int[] infoCoefficients = new int[dataBytes];
- Array.Copy(toEncode, 0, infoCoefficients, 0, dataBytes);
- GF256Poly info = new GF256Poly(field, infoCoefficients);
- info = info.multiplyByMonomial(ecBytes, 1);
- GF256Poly remainder = info.divide(generator)[1];
- int[] coefficients = remainder.Coefficients;
- int numZeroCoefficients = ecBytes - coefficients.Length;
- for (int i = 0; i < numZeroCoefficients; i++)
- {
- toEncode[dataBytes + i] = 0;
- }
- Array.Copy(coefficients, 0, toEncode, dataBytes + numZeroCoefficients, coefficients.Length);
+ throw new System.ArgumentException("No error correction bytes");
}
+ int dataBytes = toEncode.Length - ecBytes;
+ if (dataBytes <= 0)
+ {
+ throw new System.ArgumentException("No data bytes provided");
+ }
+ GenericGFPoly generator = buildGenerator(ecBytes);
+ int[] infoCoefficients = new int[dataBytes];
+ Array.Copy(toEncode, 0, infoCoefficients, 0, dataBytes);
+ GenericGFPoly info = new GenericGFPoly(field, infoCoefficients);
+ info = info.multiplyByMonomial(ecBytes, 1);
+ GenericGFPoly remainder = info.divide(generator)[1];
+ int[] coefficients = remainder.Coefficients;
+ int numZeroCoefficients = ecBytes - coefficients.Length;
+ for (int i = 0; i < numZeroCoefficients; i++)
+ {
+ toEncode[dataBytes + i] = 0;
+ }
+ Array.Copy(coefficients, 0, toEncode, dataBytes + numZeroCoefficients, coefficients.Length);
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/common/reedsolomon/ReedSolomonException.cs b/csharp/common/reedsolomon/ReedSolomonException.cs
index 964d0e6f5..a6c1e79f3 100755
--- a/csharp/common/reedsolomon/ReedSolomonException.cs
+++ b/csharp/common/reedsolomon/ReedSolomonException.cs
@@ -1,36 +1,36 @@
-/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
+
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.common.reedsolomon
{
-
- /// Thrown when an exception occurs during Reed-Solomon decoding, such as when
+
+ ///
+ /// Thrown when an exception occurs during Reed-Solomon decoding, such as when
/// there are too many errors to correct.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- [Serializable]
- public sealed class ReedSolomonException:System.Exception
+ public sealed class ReedSolomonException : Exception
{
-
- public ReedSolomonException(System.String message):base(message)
- {
- }
+
+ public ReedSolomonException(string message) : base(message)
+ {
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/datamatrix/DataMatrixReader.cs b/csharp/datamatrix/DataMatrixReader.cs
index 25f2dbb99..5473c7889 100755
--- a/csharp/datamatrix/DataMatrixReader.cs
+++ b/csharp/datamatrix/DataMatrixReader.cs
@@ -1,171 +1,184 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using DecodeHintType = com.google.zxing.DecodeHintType;
-using BinaryBitmap = com.google.zxing.BinaryBitmap;
-using Reader = com.google.zxing.Reader;
-using ReaderException = com.google.zxing.ReaderException;
-using Result = com.google.zxing.Result;
-using ResultPoint = com.google.zxing.ResultPoint;
-using ResultMetadataType = com.google.zxing.ResultMetadataType;
-using BitMatrix = com.google.zxing.common.BitMatrix;
-using DecoderResult = com.google.zxing.common.DecoderResult;
-using DetectorResult = com.google.zxing.common.DetectorResult;
-using Decoder = com.google.zxing.datamatrix.decoder.Decoder;
-using Detector = com.google.zxing.datamatrix.detector.Detector;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.datamatrix
{
-
- /// This implementation can detect and decode Data Matrix codes in an image.
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using BinaryBitmap = com.google.zxing.BinaryBitmap;
+ using ChecksumException = com.google.zxing.ChecksumException;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using FormatException = com.google.zxing.FormatException;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using Reader = com.google.zxing.Reader;
+ using Result = com.google.zxing.Result;
+ using ResultMetadataType = com.google.zxing.ResultMetadataType;
+ using ResultPoint = com.google.zxing.ResultPoint;
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+ using DecoderResult = com.google.zxing.common.DecoderResult;
+ using DetectorResult = com.google.zxing.common.DetectorResult;
+ using Decoder = com.google.zxing.datamatrix.decoder.Decoder;
+ using Detector = com.google.zxing.datamatrix.detector.Detector;
+
+
+ ///
+ /// This implementation can detect and decode Data Matrix codes in an image.
///
+ /// @author bbrown@google.com (Brian Brown)
///
- /// bbrown@google.com (Brian Brown)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class DataMatrixReader : Reader
+ public sealed class DataMatrixReader : com.google.zxing.Reader
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'NO_POINTS '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly ResultPoint[] NO_POINTS = new ResultPoint[0];
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'decoder '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private Decoder decoder = new Decoder();
-
- /// Locates and decodes a Data Matrix code in an image.
- ///
- ///
- /// a String representing the content encoded by the Data Matrix code
- ///
- /// ReaderException if a Data Matrix code cannot be found, or cannot be decoded
- public Result decode(BinaryBitmap image)
+
+ private static readonly ResultPoint[] NO_POINTS = new ResultPoint[0];
+
+ private readonly Decoder decoder = new Decoder();
+
+ ///
+ /// Locates and decodes a Data Matrix code in an image.
+ ///
+ /// a String representing the content encoded by the Data Matrix code
+ /// if a Data Matrix code cannot be found
+ /// if a Data Matrix code cannot be decoded
+ /// if error correction fails
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decode(com.google.zxing.BinaryBitmap image) throws com.google.zxing.NotFoundException, com.google.zxing.ChecksumException, com.google.zxing.FormatException
+ public Result decode(BinaryBitmap image)
+ {
+ return decode(image, null);
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decode(com.google.zxing.BinaryBitmap image, java.util.Map hints) throws com.google.zxing.NotFoundException, com.google.zxing.ChecksumException, com.google.zxing.FormatException
+ public Result decode(BinaryBitmap image, IDictionary hints)
+ {
+ DecoderResult decoderResult;
+ ResultPoint[] points;
+ if (hints != null && hints.ContainsKey(DecodeHintType.PURE_BARCODE))
{
- return decode(image, null);
+ BitMatrix bits = extractPureBits(image.BlackMatrix);
+ decoderResult = decoder.decode(bits);
+ points = NO_POINTS;
}
-
- public Result decode(BinaryBitmap image, System.Collections.Hashtable hints)
+ else
{
- DecoderResult decoderResult;
- ResultPoint[] points;
- if (hints != null && hints.ContainsKey(DecodeHintType.PURE_BARCODE))
- {
- BitMatrix bits = extractPureBits(image.BlackMatrix);
- decoderResult = decoder.decode(bits);
- points = NO_POINTS;
- }
- else
- {
- DetectorResult detectorResult = new Detector(image.BlackMatrix).detect();
- decoderResult = decoder.decode(detectorResult.Bits);
- points = detectorResult.Points;
- }
- Result result = new Result(decoderResult.Text, decoderResult.RawBytes, points, BarcodeFormat.DATAMATRIX);
- if (decoderResult.ByteSegments != null)
- {
- result.putMetadata(ResultMetadataType.BYTE_SEGMENTS, decoderResult.ByteSegments);
- }
- if (decoderResult.ECLevel != null)
- {
- result.putMetadata(ResultMetadataType.ERROR_CORRECTION_LEVEL, decoderResult.ECLevel.ToString());
- }
- return result;
+ DetectorResult detectorResult = (new Detector(image.BlackMatrix)).detect();
+ decoderResult = decoder.decode(detectorResult.Bits);
+ points = detectorResult.Points;
}
-
- /// This method detects a Data Matrix code in a "pure" image -- that is, pure monochrome image
- /// which contains only an unrotated, unskewed, image of a Data Matrix code, with some white border
- /// around it. This is a specialized method that works exceptionally fast in this special
- /// case.
- ///
- private static BitMatrix extractPureBits(BitMatrix image)
+ Result result = new Result(decoderResult.Text, decoderResult.RawBytes, points, BarcodeFormat.DATA_MATRIX);
+ IList byteSegments = decoderResult.ByteSegments;
+ if (byteSegments != null)
{
- // Now need to determine module size in pixels
-
- int height = image.Height;
- int width = image.Width;
- int minDimension = System.Math.Min(height, width);
-
- // First, skip white border by tracking diagonally from the top left down and to the right:
- int borderWidth = 0;
- while (borderWidth < minDimension && !image.get_Renamed(borderWidth, borderWidth))
- {
- borderWidth++;
- }
- if (borderWidth == minDimension)
- {
- throw ReaderException.Instance;
- }
-
- // And then keep tracking across the top-left black module to determine module size
- int moduleEnd = borderWidth + 1;
- while (moduleEnd < width && image.get_Renamed(moduleEnd, borderWidth))
- {
- moduleEnd++;
- }
- if (moduleEnd == width)
- {
- throw ReaderException.Instance;
- }
-
- int moduleSize = moduleEnd - borderWidth;
-
- // And now find where the bottommost black module on the first column ends
- int columnEndOfSymbol = height - 1;
- while (columnEndOfSymbol >= 0 && !image.get_Renamed(borderWidth, columnEndOfSymbol))
- {
- columnEndOfSymbol--;
- }
- if (columnEndOfSymbol < 0)
- {
- throw ReaderException.Instance;
- }
- columnEndOfSymbol++;
-
- // Make sure width of barcode is a multiple of module size
- if ((columnEndOfSymbol - borderWidth) % moduleSize != 0)
- {
- throw ReaderException.Instance;
- }
- int dimension = (columnEndOfSymbol - borderWidth) / moduleSize;
-
- // Push in the "border" by half the module width so that we start
- // sampling in the middle of the module. Just in case the image is a
- // little off, this will help recover.
- borderWidth += (moduleSize >> 1);
-
- int sampleDimension = borderWidth + (dimension - 1) * moduleSize;
- if (sampleDimension >= width || sampleDimension >= height)
- {
- throw ReaderException.Instance;
- }
-
- // Now just read off the bits
- BitMatrix bits = new BitMatrix(dimension);
- for (int i = 0; i < dimension; i++)
- {
- int iOffset = borderWidth + i * moduleSize;
- for (int j = 0; j < dimension; j++)
- {
- if (image.get_Renamed(borderWidth + j * moduleSize, iOffset))
- {
- bits.set_Renamed(j, i);
- }
- }
- }
- return bits;
+ result.putMetadata(ResultMetadataType.BYTE_SEGMENTS, byteSegments);
}
+ string ecLevel = decoderResult.ECLevel;
+ if (ecLevel != null)
+ {
+ result.putMetadata(ResultMetadataType.ERROR_CORRECTION_LEVEL, ecLevel);
+ }
+ return result;
+ }
+
+ public void reset()
+ {
+ // do nothing
+ }
+
+ ///
+ /// This method detects a code in a "pure" image -- that is, pure monochrome image
+ /// which contains only an unrotated, unskewed, image of a code, with some white border
+ /// around it. This is a specialized method that works exceptionally fast in this special
+ /// case.
+ ///
+ ///
+ ///
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static com.google.zxing.common.BitMatrix extractPureBits(com.google.zxing.common.BitMatrix image) throws com.google.zxing.NotFoundException
+ private static BitMatrix extractPureBits(BitMatrix image)
+ {
+
+ int[] leftTopBlack = image.TopLeftOnBit;
+ int[] rightBottomBlack = image.BottomRightOnBit;
+ if (leftTopBlack == null || rightBottomBlack == null)
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ int moduleSize = getModuleSize(leftTopBlack, image);
+
+ int top = leftTopBlack[1];
+ int bottom = rightBottomBlack[1];
+ int left = leftTopBlack[0];
+ int right = rightBottomBlack[0];
+
+ int matrixWidth = (right - left + 1) / moduleSize;
+ int matrixHeight = (bottom - top + 1) / moduleSize;
+ if (matrixWidth <= 0 || matrixHeight <= 0)
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ // Push in the "border" by half the module width so that we start
+ // sampling in the middle of the module. Just in case the image is a
+ // little off, this will help recover.
+ int nudge = moduleSize >> 1;
+ top += nudge;
+ left += nudge;
+
+ // Now just read off the bits
+ BitMatrix bits = new BitMatrix(matrixWidth, matrixHeight);
+ for (int y = 0; y < matrixHeight; y++)
+ {
+ int iOffset = top + y * moduleSize;
+ for (int x = 0; x < matrixWidth; x++)
+ {
+ if (image.get(left + x * moduleSize, iOffset))
+ {
+ bits.set(x, y);
+ }
+ }
+ }
+ return bits;
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static int moduleSize(int[] leftTopBlack, com.google.zxing.common.BitMatrix image) throws com.google.zxing.NotFoundException
+ private static int getModuleSize(int[] leftTopBlack, BitMatrix image)
+ {
+ int width = image.Width;
+ int x = leftTopBlack[0];
+ int y = leftTopBlack[1];
+ while (x < width && image.get(x, y))
+ {
+ x++;
+ }
+ if (x == width)
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ int moduleSize = x - leftTopBlack[0];
+ if (moduleSize == 0)
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+ return moduleSize;
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/datamatrix/decoder/BitMatrixParser.cs b/csharp/datamatrix/decoder/BitMatrixParser.cs
index b94a682f1..2158e61db 100755
--- a/csharp/datamatrix/decoder/BitMatrixParser.cs
+++ b/csharp/datamatrix/decoder/BitMatrixParser.cs
@@ -1,547 +1,516 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using ReaderException = com.google.zxing.ReaderException;
-using BitMatrix = com.google.zxing.common.BitMatrix;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.datamatrix.decoder
{
-
- /// bbrown@google.com (Brian Brown)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class BitMatrixParser
+
+ using FormatException = com.google.zxing.FormatException;
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+
+ ///
+ /// @author bbrown@google.com (Brian Brown)
+ ///
+ internal sealed class BitMatrixParser
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'mappingBitMatrix '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private BitMatrix mappingBitMatrix;
- //UPGRADE_NOTE: Final was removed from the declaration of 'readMappingMatrix '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private BitMatrix readMappingMatrix;
- //UPGRADE_NOTE: Final was removed from the declaration of 'version '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private Version version;
-
- /// {@link BitMatrix} to parse
- ///
- /// ReaderException if dimension is < 10 or > 144 or not 0 mod 2
- internal BitMatrixParser(BitMatrix bitMatrix)
+
+ private readonly BitMatrix mappingBitMatrix;
+ private readonly BitMatrix readMappingMatrix;
+ private readonly Version version;
+
+ /// to parse
+ /// if dimension is < 8 or > 144 or not 0 mod 2
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: BitMatrixParser(com.google.zxing.common.BitMatrix bitMatrix) throws com.google.zxing.FormatException
+ internal BitMatrixParser(BitMatrix bitMatrix)
+ {
+ int dimension = bitMatrix.Height;
+ if (dimension < 8 || dimension > 144 || (dimension & 0x01) != 0)
{
- int dimension = bitMatrix.Dimension;
- if (dimension < 10 || dimension > 144 || (dimension & 0x01) != 0)
- {
- throw ReaderException.Instance;
- }
-
- version = readVersion(bitMatrix);
- this.mappingBitMatrix = extractDataRegion(bitMatrix);
- // TODO(bbrown): Make this work for rectangular symbols
- this.readMappingMatrix = new BitMatrix(this.mappingBitMatrix.Dimension);
+ throw FormatException.FormatInstance;
}
-
- /// Creates the version object based on the dimension of the original bit matrix from
- /// the datamatrix code.
- ///
- /// See ISO 16022:2006 Table 7 - ECC 200 symbol attributes
- ///
- ///
- /// Original {@link BitMatrix} including alignment patterns
- ///
- /// {@link Version} encapsulating the Data Matrix Code's "version"
- ///
- /// ReaderException if the dimensions of the mapping matrix are not valid
- /// Data Matrix dimensions.
- ///
- internal Version readVersion(BitMatrix bitMatrix)
+
+ version = readVersion(bitMatrix);
+ this.mappingBitMatrix = extractDataRegion(bitMatrix);
+ this.readMappingMatrix = new BitMatrix(this.mappingBitMatrix.Width, this.mappingBitMatrix.Height);
+ }
+
+ internal Version Version
+ {
+ get
+ {
+ return version;
+ }
+ }
+
+ ///
+ /// Creates the version object based on the dimension of the original bit matrix from
+ /// the datamatrix code.
+ ///
+ /// See ISO 16022:2006 Table 7 - ECC 200 symbol attributes
+ ///
+ /// Original including alignment patterns
+ /// encapsulating the Data Matrix Code's "version"
+ /// if the dimensions of the mapping matrix are not valid
+ /// Data Matrix dimensions.
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static Version readVersion(com.google.zxing.common.BitMatrix bitMatrix) throws com.google.zxing.FormatException
+ private static Version readVersion(BitMatrix bitMatrix)
+ {
+ int numRows = bitMatrix.Height;
+ int numColumns = bitMatrix.Width;
+ return Version.getVersionForDimensions(numRows, numColumns);
+ }
+
+ ///
+ /// Reads the bits in the representing the mapping matrix (No alignment patterns)
+ /// in the correct order in order to reconstitute the codewords bytes contained within the
+ /// Data Matrix Code.
+ ///
+ /// bytes encoded within the Data Matrix Code
+ /// if the exact number of bytes expected is not read
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: byte[] readCodewords() throws com.google.zxing.FormatException
+ internal sbyte[] readCodewords()
+ {
+
+ sbyte[] result = new sbyte[version.TotalCodewords];
+ int resultOffset = 0;
+
+ int row = 4;
+ int column = 0;
+
+ int numRows = mappingBitMatrix.Height;
+ int numColumns = mappingBitMatrix.Width;
+
+ bool corner1Read = false;
+ bool corner2Read = false;
+ bool corner3Read = false;
+ bool corner4Read = false;
+
+ // Read all of the codewords
+ do
{
-
- if (version != null)
+ // Check the four corner cases
+ if ((row == numRows) && (column == 0) && !corner1Read)
+ {
+ result[resultOffset++] = (sbyte) readCorner1(numRows, numColumns);
+ row -= 2;
+ column += 2;
+ corner1Read = true;
+ }
+ else if ((row == numRows - 2) && (column == 0) && ((numColumns & 0x03) != 0) && !corner2Read)
+ {
+ result[resultOffset++] = (sbyte) readCorner2(numRows, numColumns);
+ row -= 2;
+ column += 2;
+ corner2Read = true;
+ }
+ else if ((row == numRows + 4) && (column == 2) && ((numColumns & 0x07) == 0) && !corner3Read)
+ {
+ result[resultOffset++] = (sbyte) readCorner3(numRows, numColumns);
+ row -= 2;
+ column += 2;
+ corner3Read = true;
+ }
+ else if ((row == numRows - 2) && (column == 0) && ((numColumns & 0x07) == 4) && !corner4Read)
+ {
+ result[resultOffset++] = (sbyte) readCorner4(numRows, numColumns);
+ row -= 2;
+ column += 2;
+ corner4Read = true;
+ }
+ else
+ {
+ // Sweep upward diagonally to the right
+ do
{
- return version;
- }
-
- // TODO(bbrown): make this work for rectangular dimensions as well.
- int numRows = bitMatrix.Dimension;
- int numColumns = numRows;
-
- return Version.getVersionForDimensions(numRows, numColumns);
+ if ((row < numRows) && (column >= 0) && !readMappingMatrix.get(column, row))
+ {
+ result[resultOffset++] = (sbyte) readUtah(row, column, numRows, numColumns);
+ }
+ row -= 2;
+ column += 2;
+ } while ((row >= 0) && (column < numColumns));
+ row += 1;
+ column += 3;
+
+ // Sweep downward diagonally to the left
+ do
+ {
+ if ((row >= 0) && (column < numColumns) && !readMappingMatrix.get(column, row))
+ {
+ result[resultOffset++] = (sbyte) readUtah(row, column, numRows, numColumns);
+ }
+ row += 2;
+ column -= 2;
+ } while ((row < numRows) && (column >= 0));
+ row += 3;
+ column += 1;
+ }
+ } while ((row < numRows) || (column < numColumns));
+
+ if (resultOffset != version.TotalCodewords)
+ {
+ throw FormatException.FormatInstance;
}
-
- /// Reads the bits in the {@link BitMatrix} representing the mapping matrix (No alignment patterns)
- /// in the correct order in order to reconstitute the codewords bytes contained within the
- /// Data Matrix Code.
- ///
- ///
- /// bytes encoded within the Data Matrix Code
- ///
- /// ReaderException if the exact number of bytes expected is not read
- internal sbyte[] readCodewords()
+ return result;
+ }
+
+ ///
+ /// Reads a bit of the mapping matrix accounting for boundary wrapping.
+ ///
+ /// Row to read in the mapping matrix
+ /// Column to read in the mapping matrix
+ /// Number of rows in the mapping matrix
+ /// Number of columns in the mapping matrix
+ /// value of the given bit in the mapping matrix
+ internal bool readModule(int row, int column, int numRows, int numColumns)
+ {
+ // Adjust the row and column indices based on boundary wrapping
+ if (row < 0)
{
-
- sbyte[] result = new sbyte[version.TotalCodewords];
- int resultOffset = 0;
-
- int row = 4;
- int column = 0;
- // TODO(bbrown): Data Matrix can be rectangular, assuming square for now
- int numRows = mappingBitMatrix.Dimension;
- int numColumns = numRows;
-
- bool corner1Read = false;
- bool corner2Read = false;
- bool corner3Read = false;
- bool corner4Read = false;
-
- // Read all of the codewords
- do
+ row += numRows;
+ column += 4 - ((numRows + 4) & 0x07);
+ }
+ if (column < 0)
+ {
+ column += numColumns;
+ row += 4 - ((numColumns + 4) & 0x07);
+ }
+ readMappingMatrix.set(column, row);
+ return mappingBitMatrix.get(column, row);
+ }
+
+ ///
+ /// Reads the 8 bits of the standard Utah-shaped pattern.
+ ///
+ /// See ISO 16022:2006, 5.8.1 Figure 6
+ ///
+ /// Current row in the mapping matrix, anchored at the 8th bit (LSB) of the pattern
+ /// Current column in the mapping matrix, anchored at the 8th bit (LSB) of the pattern
+ /// Number of rows in the mapping matrix
+ /// Number of columns in the mapping matrix
+ /// byte from the utah shape
+ internal int readUtah(int row, int column, int numRows, int numColumns)
+ {
+ int currentByte = 0;
+ if (readModule(row - 2, column - 2, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row - 2, column - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row - 1, column - 2, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row - 1, column - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row - 1, column, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row, column - 2, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row, column - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row, column, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ return currentByte;
+ }
+
+ ///
+ /// Reads the 8 bits of the special corner condition 1.
+ ///
+ /// See ISO 16022:2006, Figure F.3
+ ///
+ /// Number of rows in the mapping matrix
+ /// Number of columns in the mapping matrix
+ /// byte from the Corner condition 1
+ internal int readCorner1(int numRows, int numColumns)
+ {
+ int currentByte = 0;
+ if (readModule(numRows - 1, 0, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 1, 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 1, 2, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 2, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(2, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(3, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ return currentByte;
+ }
+
+ ///
+ /// Reads the 8 bits of the special corner condition 2.
+ ///
+ /// See ISO 16022:2006, Figure F.4
+ ///
+ /// Number of rows in the mapping matrix
+ /// Number of columns in the mapping matrix
+ /// byte from the Corner condition 2
+ internal int readCorner2(int numRows, int numColumns)
+ {
+ int currentByte = 0;
+ if (readModule(numRows - 3, 0, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 2, 0, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 1, 0, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 4, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 3, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 2, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ return currentByte;
+ }
+
+ ///
+ /// Reads the 8 bits of the special corner condition 3.
+ ///
+ /// See ISO 16022:2006, Figure F.5
+ ///
+ /// Number of rows in the mapping matrix
+ /// Number of columns in the mapping matrix
+ /// byte from the Corner condition 3
+ internal int readCorner3(int numRows, int numColumns)
+ {
+ int currentByte = 0;
+ if (readModule(numRows - 1, 0, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 1, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 3, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 2, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 3, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 2, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ return currentByte;
+ }
+
+ ///
+ /// Reads the 8 bits of the special corner condition 4.
+ ///
+ /// See ISO 16022:2006, Figure F.6
+ ///
+ /// Number of rows in the mapping matrix
+ /// Number of columns in the mapping matrix
+ /// byte from the Corner condition 4
+ internal int readCorner4(int numRows, int numColumns)
+ {
+ int currentByte = 0;
+ if (readModule(numRows - 3, 0, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 2, 0, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 1, 0, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 2, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(2, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(3, numColumns - 1, numRows, numColumns))
+ {
+ currentByte |= 1;
+ }
+ return currentByte;
+ }
+
+ ///
+ /// Extracts the data region from a that contains
+ /// alignment patterns.
+ ///
+ /// Original with alignment patterns
+ /// BitMatrix that has the alignment patterns removed
+ internal BitMatrix extractDataRegion(BitMatrix bitMatrix)
+ {
+ int symbolSizeRows = version.SymbolSizeRows;
+ int symbolSizeColumns = version.SymbolSizeColumns;
+
+ if (bitMatrix.Height != symbolSizeRows)
+ {
+ throw new System.ArgumentException("Dimension of bitMarix must match the version size");
+ }
+
+ int dataRegionSizeRows = version.DataRegionSizeRows;
+ int dataRegionSizeColumns = version.DataRegionSizeColumns;
+
+ int numDataRegionsRow = symbolSizeRows / dataRegionSizeRows;
+ int numDataRegionsColumn = symbolSizeColumns / dataRegionSizeColumns;
+
+ int sizeDataRegionRow = numDataRegionsRow * dataRegionSizeRows;
+ int sizeDataRegionColumn = numDataRegionsColumn * dataRegionSizeColumns;
+
+ BitMatrix bitMatrixWithoutAlignment = new BitMatrix(sizeDataRegionColumn, sizeDataRegionRow);
+ for (int dataRegionRow = 0; dataRegionRow < numDataRegionsRow; ++dataRegionRow)
+ {
+ int dataRegionRowOffset = dataRegionRow * dataRegionSizeRows;
+ for (int dataRegionColumn = 0; dataRegionColumn < numDataRegionsColumn; ++dataRegionColumn)
+ {
+ int dataRegionColumnOffset = dataRegionColumn * dataRegionSizeColumns;
+ for (int i = 0; i < dataRegionSizeRows; ++i)
{
- // Check the four corner cases
- if ((row == numRows) && (column == 0) && !corner1Read)
+ int readRowOffset = dataRegionRow * (dataRegionSizeRows + 2) + 1 + i;
+ int writeRowOffset = dataRegionRowOffset + i;
+ for (int j = 0; j < dataRegionSizeColumns; ++j)
+ {
+ int readColumnOffset = dataRegionColumn * (dataRegionSizeColumns + 2) + 1 + j;
+ if (bitMatrix.get(readColumnOffset, readRowOffset))
{
- result[resultOffset++] = (sbyte) readCorner1(numRows, numColumns);
- row -= 2;
- column += 2;
- corner1Read = true;
- }
- else if ((row == numRows - 2) && (column == 0) && ((numColumns & 0x03) != 0) && !corner2Read)
- {
- result[resultOffset++] = (sbyte) readCorner2(numRows, numColumns);
- row -= 2;
- column += 2;
- corner2Read = true;
- }
- else if ((row == numRows + 4) && (column == 2) && ((numColumns & 0x07) == 0) && !corner3Read)
- {
- result[resultOffset++] = (sbyte) readCorner3(numRows, numColumns);
- row -= 2;
- column += 2;
- corner3Read = true;
- }
- else if ((row == numRows - 2) && (column == 0) && ((numColumns & 0x07) == 4) && !corner4Read)
- {
- result[resultOffset++] = (sbyte) readCorner4(numRows, numColumns);
- row -= 2;
- column += 2;
- corner4Read = true;
- }
- else
- {
- // Sweep upward diagonally to the right
- do
- {
- if ((row < numRows) && (column >= 0) && !readMappingMatrix.get_Renamed(column, row))
- {
- result[resultOffset++] = (sbyte) readUtah(row, column, numRows, numColumns);
- }
- row -= 2;
- column += 2;
- }
- while ((row >= 0) && (column < numColumns));
- row += 1;
- column += 3;
-
- // Sweep downward diagonally to the left
- do
- {
- if ((row >= 0) && (column < numColumns) && !readMappingMatrix.get_Renamed(column, row))
- {
- result[resultOffset++] = (sbyte) readUtah(row, column, numRows, numColumns);
- }
- row += 2;
- column -= 2;
- }
- while ((row < numRows) && (column >= 0));
- row += 3;
- column += 1;
+ int writeColumnOffset = dataRegionColumnOffset + j;
+ bitMatrixWithoutAlignment.set(writeColumnOffset, writeRowOffset);
}
+ }
}
- while ((row < numRows) || (column < numColumns));
-
- if (resultOffset != version.TotalCodewords)
- {
- throw ReaderException.Instance;
- }
- return result;
- }
-
- /// Reads a bit of the mapping matrix accounting for boundary wrapping.
- ///
- ///
- /// Row to read in the mapping matrix
- ///
- /// Column to read in the mapping matrix
- ///
- /// Number of rows in the mapping matrix
- ///
- /// Number of columns in the mapping matrix
- ///
- /// value of the given bit in the mapping matrix
- ///
- internal bool readModule(int row, int column, int numRows, int numColumns)
- {
- // Adjust the row and column indices based on boundary wrapping
- if (row < 0)
- {
- row += numRows;
- column += 4 - ((numRows + 4) & 0x07);
- }
- if (column < 0)
- {
- column += numColumns;
- row += 4 - ((numColumns + 4) & 0x07);
- }
- readMappingMatrix.set_Renamed(column, row);
- return mappingBitMatrix.get_Renamed(column, row);
- }
-
- /// Reads the 8 bits of the standard Utah-shaped pattern.
- ///
- /// See ISO 16022:2006, 5.8.1 Figure 6
- ///
- ///
- /// Current row in the mapping matrix, anchored at the 8th bit (LSB) of the pattern
- ///
- /// Current column in the mapping matrix, anchored at the 8th bit (LSB) of the pattern
- ///
- /// Number of rows in the mapping matrix
- ///
- /// Number of columns in the mapping matrix
- ///
- /// byte from the utah shape
- ///
- internal int readUtah(int row, int column, int numRows, int numColumns)
- {
- int currentByte = 0;
- if (readModule(row - 2, column - 2, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row - 2, column - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row - 1, column - 2, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row - 1, column - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row - 1, column, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row, column - 2, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row, column - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row, column, numRows, numColumns))
- {
- currentByte |= 1;
- }
- return currentByte;
- }
-
- /// Reads the 8 bits of the special corner condition 1.
- ///
- /// See ISO 16022:2006, Figure F.3
- ///
- ///
- /// Number of rows in the mapping matrix
- ///
- /// Number of columns in the mapping matrix
- ///
- /// byte from the Corner condition 1
- ///
- internal int readCorner1(int numRows, int numColumns)
- {
- int currentByte = 0;
- if (readModule(numRows - 1, 0, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 1, 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 1, 2, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 2, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(2, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(3, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- return currentByte;
- }
-
- /// Reads the 8 bits of the special corner condition 2.
- ///
- /// See ISO 16022:2006, Figure F.4
- ///
- ///
- /// Number of rows in the mapping matrix
- ///
- /// Number of columns in the mapping matrix
- ///
- /// byte from the Corner condition 2
- ///
- internal int readCorner2(int numRows, int numColumns)
- {
- int currentByte = 0;
- if (readModule(numRows - 3, 0, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 2, 0, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 1, 0, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 4, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 3, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 2, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- return currentByte;
- }
-
- /// Reads the 8 bits of the special corner condition 3.
- ///
- /// See ISO 16022:2006, Figure F.5
- ///
- ///
- /// Number of rows in the mapping matrix
- ///
- /// Number of columns in the mapping matrix
- ///
- /// byte from the Corner condition 3
- ///
- internal int readCorner3(int numRows, int numColumns)
- {
- int currentByte = 0;
- if (readModule(numRows - 1, 0, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 1, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 3, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 2, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 3, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 2, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- return currentByte;
- }
-
- /// Reads the 8 bits of the special corner condition 4.
- ///
- /// See ISO 16022:2006, Figure F.6
- ///
- ///
- /// Number of rows in the mapping matrix
- ///
- /// Number of columns in the mapping matrix
- ///
- /// byte from the Corner condition 4
- ///
- internal int readCorner4(int numRows, int numColumns)
- {
- int currentByte = 0;
- if (readModule(numRows - 3, 0, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 2, 0, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 1, 0, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 2, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(2, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(3, numColumns - 1, numRows, numColumns))
- {
- currentByte |= 1;
- }
- return currentByte;
- }
-
- /// Extracts the data region from a {@link BitMatrix} that contains
- /// alignment patterns.
- ///
- ///
- /// Original {@link BitMatrix} with alignment patterns
- ///
- /// BitMatrix that has the alignment patterns removed
- ///
- internal BitMatrix extractDataRegion(BitMatrix bitMatrix)
- {
- int symbolSizeRows = version.SymbolSizeRows;
- int symbolSizeColumns = version.SymbolSizeColumns;
-
- // TODO(bbrown): Make this work with rectangular codes
- if (bitMatrix.Dimension != symbolSizeRows)
- {
- throw new System.ArgumentException("Dimension of bitMarix must match the version size");
- }
-
- int dataRegionSizeRows = version.DataRegionSizeRows;
- int dataRegionSizeColumns = version.DataRegionSizeColumns;
-
- int numDataRegionsRow = symbolSizeRows / dataRegionSizeRows;
- int numDataRegionsColumn = symbolSizeColumns / dataRegionSizeColumns;
-
- int sizeDataRegionRow = numDataRegionsRow * dataRegionSizeRows;
- //int sizeDataRegionColumn = numDataRegionsColumn * dataRegionSizeColumns;
-
- // TODO(bbrown): Make this work with rectangular codes
- BitMatrix bitMatrixWithoutAlignment = new BitMatrix(sizeDataRegionRow);
- for (int dataRegionRow = 0; dataRegionRow < numDataRegionsRow; ++dataRegionRow)
- {
- int dataRegionRowOffset = dataRegionRow * dataRegionSizeRows;
- for (int dataRegionColumn = 0; dataRegionColumn < numDataRegionsColumn; ++dataRegionColumn)
- {
- int dataRegionColumnOffset = dataRegionColumn * dataRegionSizeColumns;
- for (int i = 0; i < dataRegionSizeRows; ++i)
- {
- int readRowOffset = dataRegionRow * (dataRegionSizeRows + 2) + 1 + i;
- int writeRowOffset = dataRegionRowOffset + i;
- for (int j = 0; j < dataRegionSizeColumns; ++j)
- {
- int readColumnOffset = dataRegionColumn * (dataRegionSizeColumns + 2) + 1 + j;
- if (bitMatrix.get_Renamed(readColumnOffset, readRowOffset))
- {
- int writeColumnOffset = dataRegionColumnOffset + j;
- bitMatrixWithoutAlignment.set_Renamed(writeColumnOffset, writeRowOffset);
- }
- }
- }
- }
- }
- return bitMatrixWithoutAlignment;
+ }
}
+ return bitMatrixWithoutAlignment;
+ }
+
}
}
\ No newline at end of file
diff --git a/csharp/datamatrix/decoder/DataBlock.cs b/csharp/datamatrix/decoder/DataBlock.cs
index 28d48a19d..9a0305c8d 100755
--- a/csharp/datamatrix/decoder/DataBlock.cs
+++ b/csharp/datamatrix/decoder/DataBlock.cs
@@ -1,144 +1,138 @@
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.datamatrix.decoder
{
-
- /// Encapsulates a block of data within a Data Matrix Code. Data Matrix Codes may split their data into
+
+ ///
+ /// Encapsulates a block of data within a Data Matrix Code. Data Matrix Codes may split their data into
/// multiple blocks, each of which is a unit of data and error-correction codewords. Each
/// is represented by an instance of this class.
///
+ /// @author bbrown@google.com (Brian Brown)
///
- /// bbrown@google.com (Brian Brown)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class DataBlock
+ internal sealed class DataBlock
{
- internal int NumDataCodewords
+
+ private readonly int numDataCodewords;
+ private readonly sbyte[] codewords;
+
+ private DataBlock(int numDataCodewords, sbyte[] codewords)
+ {
+ this.numDataCodewords = numDataCodewords;
+ this.codewords = codewords;
+ }
+
+ ///
+ /// When Data Matrix Codes use multiple data blocks, they actually interleave the bytes of each of them.
+ /// That is, the first byte of data block 1 to n is written, then the second bytes, and so on. This
+ /// method will separate the data into original blocks.
+ ///
+ /// bytes as read directly from the Data Matrix Code
+ /// version of the Data Matrix Code
+ /// DataBlocks containing original bytes, "de-interleaved" from representation in the
+ /// Data Matrix Code
+ internal static DataBlock[] getDataBlocks(sbyte[] rawCodewords, Version version)
+ {
+ // Figure out the number and size of data blocks used by this version
+ Version.ECBlocks ecBlocks = version.ECBlocks2;
+
+ // First count the total number of data blocks
+ int totalBlocks = 0;
+ Version.ECB[] ecBlockArray = ecBlocks.GetECB;
+ foreach (Version.ECB ecBlock in ecBlockArray)
{
- get
- {
- return numDataCodewords;
- }
-
+ totalBlocks += ecBlock.Count;
}
- internal sbyte[] Codewords
+
+ // Now establish DataBlocks of the appropriate size and number of data codewords
+ DataBlock[] result = new DataBlock[totalBlocks];
+ int numResultBlocks = 0;
+ foreach (Version.ECB ecBlock in ecBlockArray)
{
- get
- {
- return codewords;
- }
-
+ for (int i = 0; i < ecBlock.Count; i++)
+ {
+ int numDataCodewords = ecBlock.DataCodewords;
+ int numBlockCodewords = ecBlocks.ECCodewords + numDataCodewords;
+ result[numResultBlocks++] = new DataBlock(numDataCodewords, new sbyte[numBlockCodewords]);
+ }
}
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'numDataCodewords '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int numDataCodewords;
- //UPGRADE_NOTE: Final was removed from the declaration of 'codewords '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private sbyte[] codewords;
-
- private DataBlock(int numDataCodewords, sbyte[] codewords)
+
+ // All blocks have the same amount of data, except that the last n
+ // (where n may be 0) have 1 less byte. Figure out where these start.
+ // TODO(bbrown): There is only one case where there is a difference for Data Matrix for size 144
+ int longerBlocksTotalCodewords = result[0].codewords.Length;
+ //int shorterBlocksTotalCodewords = longerBlocksTotalCodewords - 1;
+
+ int longerBlocksNumDataCodewords = longerBlocksTotalCodewords - ecBlocks.ECCodewords;
+ int shorterBlocksNumDataCodewords = longerBlocksNumDataCodewords - 1;
+ // The last elements of result may be 1 element shorter for 144 matrix
+ // first fill out as many elements as all of them have minus 1
+ int rawCodewordsOffset = 0;
+ for (int i = 0; i < shorterBlocksNumDataCodewords; i++)
{
- this.numDataCodewords = numDataCodewords;
- this.codewords = codewords;
+ for (int j = 0; j < numResultBlocks; j++)
+ {
+ result[j].codewords[i] = rawCodewords[rawCodewordsOffset++];
+ }
}
-
- /// When Data Matrix Codes use multiple data blocks, they actually interleave the bytes of each of them.
- /// That is, the first byte of data block 1 to n is written, then the second bytes, and so on. This
- /// method will separate the data into original blocks.
- ///
- ///
- /// bytes as read directly from the Data Matrix Code
- ///
- /// version of the Data Matrix Code
- ///
- /// {@link DataBlock}s containing original bytes, "de-interleaved" from representation in the
- /// Data Matrix Code
- ///
- internal static DataBlock[] getDataBlocks(sbyte[] rawCodewords, Version version)
+
+ // Fill out the last data block in the longer ones
+ bool specialVersion = version.VersionNumber == 24;
+ int numLongerBlocks = specialVersion ? 8 : numResultBlocks;
+ for (int j = 0; j < numLongerBlocks; j++)
{
- // Figure out the number and size of data blocks used by this version
- Version.ECBlocks ecBlocks = version.getECBlocks();
-
- // First count the total number of data blocks
- int totalBlocks = 0;
- Version.ECB[] ecBlockArray = ecBlocks.getECBlocks();
- for (int i = 0; i < ecBlockArray.Length; i++)
- {
- totalBlocks += ecBlockArray[i].Count;
- }
-
- // Now establish DataBlocks of the appropriate size and number of data codewords
- DataBlock[] result = new DataBlock[totalBlocks];
- int numResultBlocks = 0;
- for (int j = 0; j < ecBlockArray.Length; j++)
- {
- Version.ECB ecBlock = ecBlockArray[j];
- for (int i = 0; i < ecBlock.Count; i++)
- {
- int numDataCodewords = ecBlock.DataCodewords;
- int numBlockCodewords = ecBlocks.ECCodewords + numDataCodewords;
- result[numResultBlocks++] = new DataBlock(numDataCodewords, new sbyte[numBlockCodewords]);
- }
- }
-
- // All blocks have the same amount of data, except that the last n
- // (where n may be 0) have 1 less byte. Figure out where these start.
- // TODO(bbrown): There is only one case where there is a difference for Data Matrix for size 144
- int longerBlocksTotalCodewords = result[0].codewords.Length;
- //int shorterBlocksTotalCodewords = longerBlocksTotalCodewords - 1;
-
- int longerBlocksNumDataCodewords = longerBlocksTotalCodewords - ecBlocks.ECCodewords;
- int shorterBlocksNumDataCodewords = longerBlocksNumDataCodewords - 1;
- // The last elements of result may be 1 element shorter for 144 matrix
- // first fill out as many elements as all of them have minus 1
- int rawCodewordsOffset = 0;
- for (int i = 0; i < shorterBlocksNumDataCodewords; i++)
- {
- for (int j = 0; j < numResultBlocks; j++)
- {
- result[j].codewords[i] = rawCodewords[rawCodewordsOffset++];
- }
- }
-
- // Fill out the last data block in the longer ones
- bool specialVersion = version.VersionNumber == 24;
- int numLongerBlocks = specialVersion?8:numResultBlocks;
- for (int j = 0; j < numLongerBlocks; j++)
- {
- result[j].codewords[longerBlocksNumDataCodewords - 1] = rawCodewords[rawCodewordsOffset++];
- }
-
- // Now add in error correction blocks
- int max = result[0].codewords.Length;
- for (int i = longerBlocksNumDataCodewords; i < max; i++)
- {
- for (int j = 0; j < numResultBlocks; j++)
- {
- int iOffset = (specialVersion && j > 7)?i - 1:i;
- result[j].codewords[iOffset] = rawCodewords[rawCodewordsOffset++];
- }
- }
-
- if (rawCodewordsOffset != rawCodewords.Length)
- {
- throw new System.ArgumentException();
- }
-
- return result;
+ result[j].codewords[longerBlocksNumDataCodewords - 1] = rawCodewords[rawCodewordsOffset++];
}
+
+ // Now add in error correction blocks
+ int max = result[0].codewords.Length;
+ for (int i = longerBlocksNumDataCodewords; i < max; i++)
+ {
+ for (int j = 0; j < numResultBlocks; j++)
+ {
+ int iOffset = specialVersion && j > 7 ? i - 1 : i;
+ result[j].codewords[iOffset] = rawCodewords[rawCodewordsOffset++];
+ }
+ }
+
+ if (rawCodewordsOffset != rawCodewords.Length)
+ {
+ throw new System.ArgumentException();
+ }
+
+ return result;
+ }
+
+ internal int NumDataCodewords
+ {
+ get
+ {
+ return numDataCodewords;
+ }
+ }
+
+ internal sbyte[] Codewords
+ {
+ get
+ {
+ return codewords;
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/datamatrix/decoder/DecodedBitStreamParser.cs b/csharp/datamatrix/decoder/DecodedBitStreamParser.cs
index 12e3faa72..b7d958498 100755
--- a/csharp/datamatrix/decoder/DecodedBitStreamParser.cs
+++ b/csharp/datamatrix/decoder/DecodedBitStreamParser.cs
@@ -1,625 +1,644 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using ReaderException = com.google.zxing.ReaderException;
-using BitSource = com.google.zxing.common.BitSource;
-using DecoderResult = com.google.zxing.common.DecoderResult;
+using System.Collections.Generic;
+using System.Text;
+using com.google.zxing.common;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.datamatrix.decoder
{
-
- /// Data Matrix Codes can encode text as bits in one of several modes, and can use multiple modes
+
+ using FormatException = com.google.zxing.FormatException;
+ using BitSource = com.google.zxing.common.BitSource;
+ using DecoderResult = com.google.zxing.common.DecoderResult;
+
+
+ ///
+ /// Data Matrix Codes can encode text as bits in one of several modes, and can use multiple modes
/// in one Data Matrix Code. This class decodes the bits back into text.
///
/// See ISO 16022:2006, 5.2.1 - 5.2.9.2
///
+ /// @author bbrown@google.com (Brian Brown)
+ /// @author Sean Owen
///
- /// bbrown@google.com (Brian Brown)
- ///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- sealed class DecodedBitStreamParser
+ internal sealed class DecodedBitStreamParser
{
-
- /// See ISO 16022:2006, Annex C Table C.1
- /// The C40 Basic Character Set (*'s used for placeholders for the shift values)
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'C40_BASIC_SET_CHARS'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly char[] C40_BASIC_SET_CHARS = new char[]{'*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'};
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'C40_SHIFT2_SET_CHARS'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly char[] C40_SHIFT2_SET_CHARS = new char[]{'!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', ':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', '^', '_'};
-
- /// See ISO 16022:2006, Annex C Table C.2
- /// The Text Basic Character Set (*'s used for placeholders for the shift values)
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'TEXT_BASIC_SET_CHARS'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly char[] TEXT_BASIC_SET_CHARS = new char[]{'*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
-
- private static char[] TEXT_SHIFT3_SET_CHARS = new char[]{'\'', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~', (char) 127};
-
- private const int PAD_ENCODE = 0; // Not really an encoding
- private const int ASCII_ENCODE = 1;
- private const int C40_ENCODE = 2;
- private const int TEXT_ENCODE = 3;
- private const int ANSIX12_ENCODE = 4;
- private const int EDIFACT_ENCODE = 5;
- private const int BASE256_ENCODE = 6;
-
- private DecodedBitStreamParser()
+
+ private enum Mode
+ {
+ PAD_ENCODE, // Not really a mode
+ ASCII_ENCODE,
+ C40_ENCODE,
+ TEXT_ENCODE,
+ ANSIX12_ENCODE,
+ EDIFACT_ENCODE,
+ BASE256_ENCODE
+ }
+
+ ///
+ /// See ISO 16022:2006, Annex C Table C.1
+ /// The C40 Basic Character Set (*'s used for placeholders for the shift values)
+ ///
+ private static readonly char[] C40_BASIC_SET_CHARS = {'*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'};
+
+ private static readonly char[] C40_SHIFT2_SET_CHARS = {'!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', ':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', '^', '_'};
+
+ ///
+ /// See ISO 16022:2006, Annex C Table C.2
+ /// The Text Basic Character Set (*'s used for placeholders for the shift values)
+ ///
+ private static readonly char[] TEXT_BASIC_SET_CHARS = {'*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
+
+ private static readonly char[] TEXT_SHIFT3_SET_CHARS = {'\'', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~', (char) 127};
+
+ private DecodedBitStreamParser()
+ {
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: static com.google.zxing.common.DecoderResult decode(byte[] bytes) throws com.google.zxing.FormatException
+ internal static DecoderResult decode(sbyte[] bytes)
+ {
+ BitSource bits = new BitSource(bytes);
+ StringBuilder result = new StringBuilder(100);
+ StringBuilder resultTrailer = new StringBuilder(0);
+ IList byteSegments = new List(1);
+ Mode mode = Mode.ASCII_ENCODE;
+ do
{
- }
-
- internal static DecoderResult decode(sbyte[] bytes)
- {
- BitSource bits = new BitSource(bytes);
- System.Text.StringBuilder result = new System.Text.StringBuilder(100);
- System.Text.StringBuilder resultTrailer = new System.Text.StringBuilder(0);
- System.Collections.ArrayList byteSegments = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(1));
- int mode = ASCII_ENCODE;
- do
+ if (mode == Mode.ASCII_ENCODE)
+ {
+ mode = decodeAsciiSegment(bits, result, resultTrailer);
+ }
+ else
+ {
+ switch (mode)
{
- if (mode == ASCII_ENCODE)
+ case com.google.zxing.datamatrix.decoder.DecodedBitStreamParser.Mode.C40_ENCODE:
+ decodeC40Segment(bits, result);
+ break;
+ case com.google.zxing.datamatrix.decoder.DecodedBitStreamParser.Mode.TEXT_ENCODE:
+ decodeTextSegment(bits, result);
+ break;
+ case com.google.zxing.datamatrix.decoder.DecodedBitStreamParser.Mode.ANSIX12_ENCODE:
+ decodeAnsiX12Segment(bits, result);
+ break;
+ case com.google.zxing.datamatrix.decoder.DecodedBitStreamParser.Mode.EDIFACT_ENCODE:
+ decodeEdifactSegment(bits, result);
+ break;
+ case com.google.zxing.datamatrix.decoder.DecodedBitStreamParser.Mode.BASE256_ENCODE:
+ decodeBase256Segment(bits, result, byteSegments);
+ break;
+ default:
+ throw FormatException.FormatInstance;
+ }
+ mode = Mode.ASCII_ENCODE;
+ }
+ } while (mode != Mode.PAD_ENCODE && bits.available() > 0);
+ if (resultTrailer.Length > 0)
+ {
+ result.Append(resultTrailer.ToString());
+ }
+ return new DecoderResult(bytes, result.ToString(), byteSegments.Count == 0 ? null : byteSegments, null);
+ }
+
+ ///
+ /// See ISO 16022:2006, 5.2.3 and Annex C, Table C.2
+ ///
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static Mode decodeAsciiSegment(com.google.zxing.common.BitSource bits, StringBuilder result, StringBuilder resultTrailer) throws com.google.zxing.FormatException
+ private static Mode decodeAsciiSegment(BitSource bits, StringBuilder result, StringBuilder resultTrailer)
+ {
+ bool upperShift = false;
+ do
+ {
+ int oneByte = bits.readBits(8);
+ if (oneByte == 0)
+ {
+ throw FormatException.FormatInstance;
+ } // ASCII data (ASCII value + 1)
+ else if (oneByte <= 128)
+ {
+ if (upperShift)
+ {
+ oneByte += 128;
+ //upperShift = false;
+ }
+ result.Append((char)(oneByte - 1));
+ return Mode.ASCII_ENCODE;
+ } // Pad
+ else if (oneByte == 129)
+ {
+ return Mode.PAD_ENCODE;
+ } // 2-digit data 00-99 (Numeric Value + 130)
+ else if (oneByte <= 229)
+ {
+ int value = oneByte - 130;
+ if (value < 10) // padd with '0' for single digit values
+ {
+ result.Append('0');
+ }
+ result.Append(value);
+ } // Latch to C40 encodation
+ else if (oneByte == 230)
+ {
+ return Mode.C40_ENCODE;
+ } // Latch to Base 256 encodation
+ else if (oneByte == 231)
+ {
+ return Mode.BASE256_ENCODE;
+ }
+ else if (oneByte == 232)
+ {
+ // FNC1
+ result.Append((char) 29); // translate as ASCII 29
+ }
+ else if (oneByte == 233 || oneByte == 234)
+ {
+ // Structured Append, Reader Programming
+ // Ignore these symbols for now
+ //throw ReaderException.getInstance();
+ } // Upper Shift (shift to Extended ASCII)
+ else if (oneByte == 235)
+ {
+ upperShift = true;
+ } // 05 Macro
+ else if (oneByte == 236)
+ {
+ result.Append("[)>\u001E05\u001D");
+ resultTrailer.Insert(0, "\u001E\u0004");
+ } // 06 Macro
+ else if (oneByte == 237)
+ {
+ result.Append("[)>\u001E06\u001D");
+ resultTrailer.Insert(0, "\u001E\u0004");
+ } // Latch to ANSI X12 encodation
+ else if (oneByte == 238)
+ {
+ return Mode.ANSIX12_ENCODE;
+ } // Latch to Text encodation
+ else if (oneByte == 239)
+ {
+ return Mode.TEXT_ENCODE;
+ } // Latch to EDIFACT encodation
+ else if (oneByte == 240)
+ {
+ return Mode.EDIFACT_ENCODE;
+ } // ECI Character
+ else if (oneByte == 241)
+ {
+ // TODO(bbrown): I think we need to support ECI
+ //throw ReaderException.getInstance();
+ // Ignore this symbol for now
+ } // Not to be used in ASCII encodation
+ else if (oneByte >= 242)
+ {
+ // ... but work around encoders that end with 254, latch back to ASCII
+ if (oneByte != 254 || bits.available() != 0)
+ {
+ throw FormatException.FormatInstance;
+ }
+ }
+ } while (bits.available() > 0);
+ return Mode.ASCII_ENCODE;
+ }
+
+ ///
+ /// See ISO 16022:2006, 5.2.5 and Annex C, Table C.1
+ ///
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static void decodeC40Segment(com.google.zxing.common.BitSource bits, StringBuilder result) throws com.google.zxing.FormatException
+ private static void decodeC40Segment(BitSource bits, StringBuilder result)
+ {
+ // Three C40 values are encoded in a 16-bit value as
+ // (1600 * C1) + (40 * C2) + C3 + 1
+ // TODO(bbrown): The Upper Shift with C40 doesn't work in the 4 value scenario all the time
+ bool upperShift = false;
+
+ int[] cValues = new int[3];
+ int shift = 0;
+
+ do
+ {
+ // If there is only one byte left then it will be encoded as ASCII
+ if (bits.available() == 8)
+ {
+ return;
+ }
+ int firstByte = bits.readBits(8);
+ if (firstByte == 254) // Unlatch codeword
+ {
+ return;
+ }
+
+ parseTwoBytes(firstByte, bits.readBits(8), cValues);
+
+ for (int i = 0; i < 3; i++)
+ {
+ int cValue = cValues[i];
+ switch (shift)
+ {
+ case 0:
+ if (cValue < 3)
{
- mode = decodeAsciiSegment(bits, result, resultTrailer);
+ shift = cValue + 1;
+ }
+ else if (cValue < C40_BASIC_SET_CHARS.Length)
+ {
+ char c40char = C40_BASIC_SET_CHARS[cValue];
+ if (upperShift)
+ {
+ result.Append((char)(c40char + 128));
+ upperShift = false;
+ }
+ else
+ {
+ result.Append(c40char);
+ }
}
else
{
- switch (mode)
- {
-
- case C40_ENCODE:
- decodeC40Segment(bits, result);
- break;
-
- case TEXT_ENCODE:
- decodeTextSegment(bits, result);
- break;
-
- case ANSIX12_ENCODE:
- decodeAnsiX12Segment(bits, result);
- break;
-
- case EDIFACT_ENCODE:
- decodeEdifactSegment(bits, result);
- break;
-
- case BASE256_ENCODE:
- decodeBase256Segment(bits, result, byteSegments);
- break;
-
- default:
- throw ReaderException.Instance;
-
- }
- mode = ASCII_ENCODE;
+ throw FormatException.FormatInstance;
}
- }
- while (mode != PAD_ENCODE && bits.available() > 0);
- if (resultTrailer.Length > 0)
- {
- result.Append(resultTrailer.ToString());
- }
- return new DecoderResult(bytes, result.ToString(), (byteSegments.Count == 0)?null:byteSegments, null);
- }
-
- /// See ISO 16022:2006, 5.2.3 and Annex C, Table C.2
- private static int decodeAsciiSegment(BitSource bits, System.Text.StringBuilder result, System.Text.StringBuilder resultTrailer)
- {
- bool upperShift = false;
- do
- {
- int oneByte = bits.readBits(8);
- if (oneByte == 0)
+ break;
+ case 1:
+ if (upperShift)
{
- throw ReaderException.Instance;
+ result.Append((char)(cValue + 128));
+ upperShift = false;
}
- else if (oneByte <= 128)
+ else
{
- // ASCII data (ASCII value + 1)
- oneByte = upperShift?(oneByte + 128):oneByte;
+ result.Append((char) cValue);
+ }
+ shift = 0;
+ break;
+ case 2:
+ if (cValue < C40_SHIFT2_SET_CHARS.Length)
+ {
+ char c40char = C40_SHIFT2_SET_CHARS[cValue];
+ if (upperShift)
+ {
+ result.Append((char)(c40char + 128));
upperShift = false;
- result.Append((char) (oneByte - 1));
- return ASCII_ENCODE;
- }
- else if (oneByte == 129)
+ }
+ else
+ {
+ result.Append(c40char);
+ }
+ } // FNC1
+ else if (cValue == 27)
{
- // Pad
- return PAD_ENCODE;
- }
- else if (oneByte <= 229)
+ result.Append((char) 29); // translate as ASCII 29
+ } // Upper Shift
+ else if (cValue == 30)
{
- // 2-digit data 00-99 (Numeric Value + 130)
- int value_Renamed = oneByte - 130;
- if (value_Renamed < 10)
- {
- // padd with '0' for single digit values
- result.Append('0');
- }
- result.Append(value_Renamed);
+ upperShift = true;
}
- else if (oneByte == 230)
+ else
{
- // Latch to C40 encodation
- return C40_ENCODE;
+ throw FormatException.FormatInstance;
}
- else if (oneByte == 231)
+ shift = 0;
+ break;
+ case 3:
+ if (upperShift)
{
- // Latch to Base 256 encodation
- return BASE256_ENCODE;
+ result.Append((char)(cValue + 224));
+ upperShift = false;
}
- else if (oneByte == 232)
+ else
{
- // FNC1
- //throw ReaderException.getInstance();
- // Ignore this symbol for now
- }
- else if (oneByte == 233)
- {
- // Structured Append
- //throw ReaderException.getInstance();
- // Ignore this symbol for now
- }
- else if (oneByte == 234)
- {
- // Reader Programming
- //throw ReaderException.getInstance();
- // Ignore this symbol for now
- }
- else if (oneByte == 235)
- {
- // Upper Shift (shift to Extended ASCII)
- upperShift = true;
- }
- else if (oneByte == 236)
- {
- // 05 Macro
- result.Append("[)>\u001E05\u001D");
- resultTrailer.Insert(0, "\u001E\u0004");
- }
- else if (oneByte == 237)
- {
- // 06 Macro
- result.Append("[)>\u001E06\u001D");
- resultTrailer.Insert(0, "\u001E\u0004");
- }
- else if (oneByte == 238)
- {
- // Latch to ANSI X12 encodation
- return ANSIX12_ENCODE;
- }
- else if (oneByte == 239)
- {
- // Latch to Text encodation
- return TEXT_ENCODE;
- }
- else if (oneByte == 240)
- {
- // Latch to EDIFACT encodation
- return EDIFACT_ENCODE;
- }
- else if (oneByte == 241)
- {
- // ECI Character
- // TODO(bbrown): I think we need to support ECI
- //throw ReaderException.getInstance();
- // Ignore this symbol for now
- }
- else if (oneByte >= 242)
- {
- // Not to be used in ASCII encodation
- throw ReaderException.Instance;
+ result.Append((char)(cValue + 96));
}
+ shift = 0;
+ break;
+ default:
+ throw FormatException.FormatInstance;
}
- while (bits.available() > 0);
- return ASCII_ENCODE;
- }
-
- /// See ISO 16022:2006, 5.2.5 and Annex C, Table C.1
- private static void decodeC40Segment(BitSource bits, System.Text.StringBuilder result)
+ }
+ } while (bits.available() > 0);
+ }
+
+ ///
+ /// See ISO 16022:2006, 5.2.6 and Annex C, Table C.2
+ ///
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static void decodeTextSegment(com.google.zxing.common.BitSource bits, StringBuilder result) throws com.google.zxing.FormatException
+ private static void decodeTextSegment(BitSource bits, StringBuilder result)
+ {
+ // Three Text values are encoded in a 16-bit value as
+ // (1600 * C1) + (40 * C2) + C3 + 1
+ // TODO(bbrown): The Upper Shift with Text doesn't work in the 4 value scenario all the time
+ bool upperShift = false;
+
+ int[] cValues = new int[3];
+ int shift = 0;
+ do
{
- // Three C40 values are encoded in a 16-bit value as
- // (1600 * C1) + (40 * C2) + C3 + 1
- // TODO(bbrown): The Upper Shift with C40 doesn't work in the 4 value scenario all the time
- bool upperShift = false;
-
- int[] cValues = new int[3];
- do
+ // If there is only one byte left then it will be encoded as ASCII
+ if (bits.available() == 8)
+ {
+ return;
+ }
+ int firstByte = bits.readBits(8);
+ if (firstByte == 254) // Unlatch codeword
+ {
+ return;
+ }
+
+ parseTwoBytes(firstByte, bits.readBits(8), cValues);
+
+ for (int i = 0; i < 3; i++)
+ {
+ int cValue = cValues[i];
+ switch (shift)
{
- // If there is only one byte left then it will be encoded as ASCII
- if (bits.available() == 8)
+ case 0:
+ if (cValue < 3)
{
- return ;
+ shift = cValue + 1;
}
- int firstByte = bits.readBits(8);
- if (firstByte == 254)
+ else if (cValue < TEXT_BASIC_SET_CHARS.Length)
{
- // Unlatch codeword
- return ;
+ char textChar = TEXT_BASIC_SET_CHARS[cValue];
+ if (upperShift)
+ {
+ result.Append((char)(textChar + 128));
+ upperShift = false;
+ }
+ else
+ {
+ result.Append(textChar);
+ }
}
-
- parseTwoBytes(firstByte, bits.readBits(8), cValues);
-
- int shift = 0;
- for (int i = 0; i < 3; i++)
+ else
{
- int cValue = cValues[i];
- switch (shift)
- {
-
- case 0:
- if (cValue < 3)
- {
- shift = cValue + 1;
- }
- else
- {
- if (upperShift)
- {
- result.Append((char) (C40_BASIC_SET_CHARS[cValue] + 128));
- upperShift = false;
- }
- else
- {
- result.Append(C40_BASIC_SET_CHARS[cValue]);
- }
- }
- break;
-
- case 1:
- if (upperShift)
- {
- result.Append((char) (cValue + 128));
- upperShift = false;
- }
- else
- {
- result.Append(cValue);
- }
- shift = 0;
- break;
-
- case 2:
- if (cValue < 27)
- {
- if (upperShift)
- {
- result.Append((char) (C40_SHIFT2_SET_CHARS[cValue] + 128));
- upperShift = false;
- }
- else
- {
- result.Append(C40_SHIFT2_SET_CHARS[cValue]);
- }
- }
- else if (cValue == 27)
- {
- // FNC1
- throw ReaderException.Instance;
- }
- else if (cValue == 30)
- {
- // Upper Shift
- upperShift = true;
- }
- else
- {
- throw ReaderException.Instance;
- }
- shift = 0;
- break;
-
- case 3:
- if (upperShift)
- {
- result.Append((char) (cValue + 224));
- upperShift = false;
- }
- else
- {
- result.Append((char) (cValue + 96));
- }
- shift = 0;
- break;
-
- default:
- throw ReaderException.Instance;
-
- }
+ throw FormatException.FormatInstance;
}
+ break;
+ case 1:
+ if (upperShift)
+ {
+ result.Append((char)(cValue + 128));
+ upperShift = false;
+ }
+ else
+ {
+ result.Append((char) cValue);
+ }
+ shift = 0;
+ break;
+ case 2:
+ // Shift 2 for Text is the same encoding as C40
+ if (cValue < C40_SHIFT2_SET_CHARS.Length)
+ {
+ char c40char = C40_SHIFT2_SET_CHARS[cValue];
+ if (upperShift)
+ {
+ result.Append((char)(c40char + 128));
+ upperShift = false;
+ }
+ else
+ {
+ result.Append(c40char);
+ }
+ } // FNC1
+ else if (cValue == 27)
+ {
+ result.Append((char) 29); // translate as ASCII 29
+ } // Upper Shift
+ else if (cValue == 30)
+ {
+ upperShift = true;
+ }
+ else
+ {
+ throw FormatException.FormatInstance;
+ }
+ shift = 0;
+ break;
+ case 3:
+ if (cValue < TEXT_SHIFT3_SET_CHARS.Length)
+ {
+ char textChar = TEXT_SHIFT3_SET_CHARS[cValue];
+ if (upperShift)
+ {
+ result.Append((char)(textChar + 128));
+ upperShift = false;
+ }
+ else
+ {
+ result.Append(textChar);
+ }
+ shift = 0;
+ }
+ else
+ {
+ throw FormatException.FormatInstance;
+ }
+ break;
+ default:
+ throw FormatException.FormatInstance;
}
- while (bits.available() > 0);
- }
-
- /// See ISO 16022:2006, 5.2.6 and Annex C, Table C.2
- private static void decodeTextSegment(BitSource bits, System.Text.StringBuilder result)
+ }
+ } while (bits.available() > 0);
+ }
+
+ ///
+ /// See ISO 16022:2006, 5.2.7
+ ///
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static void decodeAnsiX12Segment(com.google.zxing.common.BitSource bits, StringBuilder result) throws com.google.zxing.FormatException
+ private static void decodeAnsiX12Segment(BitSource bits, StringBuilder result)
+ {
+ // Three ANSI X12 values are encoded in a 16-bit value as
+ // (1600 * C1) + (40 * C2) + C3 + 1
+
+ int[] cValues = new int[3];
+ do
{
- // Three Text values are encoded in a 16-bit value as
- // (1600 * C1) + (40 * C2) + C3 + 1
- // TODO(bbrown): The Upper Shift with Text doesn't work in the 4 value scenario all the time
- bool upperShift = false;
-
- int[] cValues = new int[3];
- do
+ // If there is only one byte left then it will be encoded as ASCII
+ if (bits.available() == 8)
+ {
+ return;
+ }
+ int firstByte = bits.readBits(8);
+ if (firstByte == 254) // Unlatch codeword
+ {
+ return;
+ }
+
+ parseTwoBytes(firstByte, bits.readBits(8), cValues);
+
+ for (int i = 0; i < 3; i++)
+ {
+ int cValue = cValues[i];
+ if (cValue == 0) // X12 segment terminator
{
- // If there is only one byte left then it will be encoded as ASCII
- if (bits.available() == 8)
- {
- return ;
- }
- int firstByte = bits.readBits(8);
- if (firstByte == 254)
- {
- // Unlatch codeword
- return ;
- }
-
- parseTwoBytes(firstByte, bits.readBits(8), cValues);
-
- int shift = 0;
- for (int i = 0; i < 3; i++)
- {
- int cValue = cValues[i];
- switch (shift)
- {
-
- case 0:
- if (cValue < 3)
- {
- shift = cValue + 1;
- }
- else
- {
- if (upperShift)
- {
- result.Append((char) (TEXT_BASIC_SET_CHARS[cValue] + 128));
- upperShift = false;
- }
- else
- {
- result.Append(TEXT_BASIC_SET_CHARS[cValue]);
- }
- }
- break;
-
- case 1:
- if (upperShift)
- {
- result.Append((char) (cValue + 128));
- upperShift = false;
- }
- else
- {
- result.Append(cValue);
- }
- shift = 0;
- break;
-
- case 2:
- // Shift 2 for Text is the same encoding as C40
- if (cValue < 27)
- {
- if (upperShift)
- {
- result.Append((char) (C40_SHIFT2_SET_CHARS[cValue] + 128));
- upperShift = false;
- }
- else
- {
- result.Append(C40_SHIFT2_SET_CHARS[cValue]);
- }
- }
- else if (cValue == 27)
- {
- // FNC1
- throw ReaderException.Instance;
- }
- else if (cValue == 30)
- {
- // Upper Shift
- upperShift = true;
- }
- else
- {
- throw ReaderException.Instance;
- }
- shift = 0;
- break;
-
- case 3:
- if (upperShift)
- {
- result.Append((char) (TEXT_SHIFT3_SET_CHARS[cValue] + 128));
- upperShift = false;
- }
- else
- {
- result.Append(TEXT_SHIFT3_SET_CHARS[cValue]);
- }
- shift = 0;
- break;
-
- default:
- throw ReaderException.Instance;
-
- }
- }
- }
- while (bits.available() > 0);
- }
-
- /// See ISO 16022:2006, 5.2.7
- private static void decodeAnsiX12Segment(BitSource bits, System.Text.StringBuilder result)
- {
- // Three ANSI X12 values are encoded in a 16-bit value as
- // (1600 * C1) + (40 * C2) + C3 + 1
-
- int[] cValues = new int[3];
- do
+ result.Append('\r');
+ } // X12 segment separator *
+ else if (cValue == 1)
{
- // If there is only one byte left then it will be encoded as ASCII
- if (bits.available() == 8)
- {
- return ;
- }
- int firstByte = bits.readBits(8);
- if (firstByte == 254)
- {
- // Unlatch codeword
- return ;
- }
-
- parseTwoBytes(firstByte, bits.readBits(8), cValues);
-
- for (int i = 0; i < 3; i++)
- {
- int cValue = cValues[i];
- if (cValue == 0)
- {
- // X12 segment terminator
- result.Append('\r');
- }
- else if (cValue == 1)
- {
- // X12 segment separator *
- result.Append('*');
- }
- else if (cValue == 2)
- {
- // X12 sub-element separator >
- result.Append('>');
- }
- else if (cValue == 3)
- {
- // space
- result.Append(' ');
- }
- else if (cValue < 14)
- {
- // 0 - 9
- result.Append((char) (cValue + 44));
- }
- else if (cValue < 40)
- {
- // A - Z
- result.Append((char) (cValue + 51));
- }
- else
- {
- throw ReaderException.Instance;
- }
- }
- }
- while (bits.available() > 0);
- }
-
- private static void parseTwoBytes(int firstByte, int secondByte, int[] result)
- {
- int fullBitValue = (firstByte << 8) + secondByte - 1;
- int temp = fullBitValue / 1600;
- result[0] = temp;
- fullBitValue -= temp * 1600;
- temp = fullBitValue / 40;
- result[1] = temp;
- result[2] = fullBitValue - temp * 40;
- }
-
- /// See ISO 16022:2006, 5.2.8 and Annex C Table C.3
- private static void decodeEdifactSegment(BitSource bits, System.Text.StringBuilder result)
- {
- bool unlatch = false;
- do
+ result.Append('*');
+ } // X12 sub-element separator >
+ else if (cValue == 2)
{
- // If there is only two or less bytes left then it will be encoded as ASCII
- if (bits.available() <= 16)
- {
- return ;
- }
-
- for (int i = 0; i < 4; i++)
- {
- int edifactValue = bits.readBits(6);
-
- // Check for the unlatch character
- if (edifactValue == 0x2B67)
- {
- // 011111
- unlatch = true;
- // If we encounter the unlatch code then continue reading because the Codeword triple
- // is padded with 0's
- }
-
- if (!unlatch)
- {
- if ((edifactValue & 32) == 0)
- {
- // no 1 in the leading (6th) bit
- edifactValue |= 64; // Add a leading 01 to the 6 bit binary value
- }
- result.Append(edifactValue);
- }
- }
- }
- while (!unlatch && bits.available() > 0);
- }
-
- /// See ISO 16022:2006, 5.2.9 and Annex B, B.2
- private static void decodeBase256Segment(BitSource bits, System.Text.StringBuilder result, System.Collections.ArrayList byteSegments)
- {
- // Figure out how long the Base 256 Segment is.
- int d1 = bits.readBits(8);
- int count;
- if (d1 == 0)
+ result.Append('>');
+ } // space
+ else if (cValue == 3)
{
- // Read the remainder of the symbol
- count = bits.available() / 8;
- }
- else if (d1 < 250)
+ result.Append(' ');
+ } // 0 - 9
+ else if (cValue < 14)
{
- count = d1;
+ result.Append((char)(cValue + 44));
+ } // A - Z
+ else if (cValue < 40)
+ {
+ result.Append((char)(cValue + 51));
}
else
{
- count = 250 * (d1 - 249) + bits.readBits(8);
+ throw FormatException.FormatInstance;
}
- sbyte[] bytes = new sbyte[count];
- for (int i = 0; i < count; i++)
- {
- bytes[i] = unrandomize255State(bits.readBits(8), i);
- }
- byteSegments.Add(SupportClass.ToByteArray(bytes));
- try
- {
- //UPGRADE_TODO: The differences in the Format of parameters for constructor 'java.lang.String.String' may cause compilation errors. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1092'"
- result.Append(System.Text.Encoding.GetEncoding("ISO8859_1").GetString(SupportClass.ToByteArray(bytes)));
- }
- catch (System.IO.IOException uee)
- {
- //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Throwable.toString' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
- throw new System.SystemException("Platform does not support required encoding: " + uee);
- }
- }
-
- /// See ISO 16022:2006, Annex B, B.2
- private static sbyte unrandomize255State(int randomizedBase256Codeword, int base256CodewordPosition)
+ }
+ } while (bits.available() > 0);
+ }
+
+ private static void parseTwoBytes(int firstByte, int secondByte, int[] result)
+ {
+ int fullBitValue = (firstByte << 8) + secondByte - 1;
+ int temp = fullBitValue / 1600;
+ result[0] = temp;
+ fullBitValue -= temp * 1600;
+ temp = fullBitValue / 40;
+ result[1] = temp;
+ result[2] = fullBitValue - temp * 40;
+ }
+
+ ///
+ /// See ISO 16022:2006, 5.2.8 and Annex C Table C.3
+ ///
+ private static void decodeEdifactSegment(BitSource bits, StringBuilder result)
+ {
+ do
{
- int pseudoRandomNumber = ((149 * base256CodewordPosition) % 255) + 1;
- int tempVariable = randomizedBase256Codeword - pseudoRandomNumber;
- return (sbyte) (tempVariable >= 0?tempVariable:(tempVariable + 256));
+ // If there is only two or less bytes left then it will be encoded as ASCII
+ if (bits.available() <= 16)
+ {
+ return;
+ }
+
+ for (int i = 0; i < 4; i++)
+ {
+ int edifactValue = bits.readBits(6);
+
+ // Check for the unlatch character
+ if (edifactValue == 0x1F) // 011111
+ {
+ // Read rest of byte, which should be 0, and stop
+ int bitsLeft = 8 - bits.BitOffset;
+ if (bitsLeft != 8)
+ {
+ bits.readBits(bitsLeft);
+ }
+ return;
+ }
+
+ if ((edifactValue & 0x20) == 0) // no 1 in the leading (6th) bit
+ {
+ edifactValue |= 0x40; // Add a leading 01 to the 6 bit binary value
+ }
+ result.Append((char) edifactValue);
+ }
+ } while (bits.available() > 0);
+ }
+
+ ///
+ /// See ISO 16022:2006, 5.2.9 and Annex B, B.2
+ ///
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static void decodeBase256Segment(com.google.zxing.common.BitSource bits, StringBuilder result, java.util.Collection byteSegments) throws com.google.zxing.FormatException
+ private static void decodeBase256Segment(BitSource bits, StringBuilder result, ICollection byteSegments)
+ {
+ // Figure out how long the Base 256 Segment is.
+ int codewordPosition = 1 + bits.ByteOffset; // position is 1-indexed
+ int d1 = unrandomize255State(bits.readBits(8), codewordPosition++);
+ int count;
+ if (d1 == 0) // Read the remainder of the symbol
+ {
+ count = bits.available() / 8;
}
+ else if (d1 < 250)
+ {
+ count = d1;
+ }
+ else
+ {
+ count = 250 * (d1 - 249) + unrandomize255State(bits.readBits(8), codewordPosition++);
+ }
+
+ // We're seeing NegativeArraySizeException errors from users.
+ if (count < 0)
+ {
+ throw FormatException.FormatInstance;
+ }
+
+ sbyte[] bytes = new sbyte[count];
+ for (int i = 0; i < count; i++)
+ {
+ // Have seen this particular error in the wild, such as at
+ // http://www.bcgen.com/demo/IDAutomationStreamingDataMatrix.aspx?MODE=3&D=Fred&PFMT=3&PT=F&X=0.3&O=0&LM=0.2
+ if (bits.available() < 8)
+ {
+ throw FormatException.FormatInstance;
+ }
+ bytes[i] = (sbyte) unrandomize255State(bits.readBits(8), codewordPosition++);
+ }
+ byteSegments.Add(bytes);
+ try
+ {
+ //result.Append(new string(bytes, "ISO8859_1"));
+ result.Append(GetEncodedStringFromBuffer(bytes, "ISO-8859-1"));
+ }
+ catch (System.IO.IOException uee)
+ {
+ throw new InvalidOperationException("Platform does not support required encoding: " + uee);
+ }
+ }
+ private static string GetEncodedStringFromBuffer(sbyte[] buffer, string encoding)
+ {
+ byte[] bytes = buffer.ToBytes();
+ Encoding en = Encoding.GetEncoding(encoding);
+ return en.GetString(bytes);
+ }
+
+ ///
+ /// See ISO 16022:2006, Annex B, B.2
+ ///
+ private static int unrandomize255State(int randomizedBase256Codeword, int base256CodewordPosition)
+ {
+ int pseudoRandomNumber = ((149 * base256CodewordPosition) % 255) + 1;
+ int tempVariable = randomizedBase256Codeword - pseudoRandomNumber;
+ return tempVariable >= 0 ? tempVariable : tempVariable + 256;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/datamatrix/decoder/Decoder.cs b/csharp/datamatrix/decoder/Decoder.cs
index c53a27703..a3ed3243d 100755
--- a/csharp/datamatrix/decoder/Decoder.cs
+++ b/csharp/datamatrix/decoder/Decoder.cs
@@ -1,153 +1,158 @@
/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using ReaderException = com.google.zxing.ReaderException;
-using BitMatrix = com.google.zxing.common.BitMatrix;
-using DecoderResult = com.google.zxing.common.DecoderResult;
-using GF256 = com.google.zxing.common.reedsolomon.GF256;
-using ReedSolomonDecoder = com.google.zxing.common.reedsolomon.ReedSolomonDecoder;
-using ReedSolomonException = com.google.zxing.common.reedsolomon.ReedSolomonException;
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.datamatrix.decoder
{
-
- /// The main class which implements Data Matrix Code decoding -- as opposed to locating and extracting
+
+ using ChecksumException = com.google.zxing.ChecksumException;
+ using FormatException = com.google.zxing.FormatException;
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+ using DecoderResult = com.google.zxing.common.DecoderResult;
+ using GenericGF = com.google.zxing.common.reedsolomon.GenericGF;
+ using ReedSolomonDecoder = com.google.zxing.common.reedsolomon.ReedSolomonDecoder;
+ using ReedSolomonException = com.google.zxing.common.reedsolomon.ReedSolomonException;
+
+ ///
+ /// The main class which implements Data Matrix Code decoding -- as opposed to locating and extracting
/// the Data Matrix Code from an image.
///
+ /// @author bbrown@google.com (Brian Brown)
///
- /// bbrown@google.com (Brian Brown)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class Decoder
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'rsDecoder '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private ReedSolomonDecoder rsDecoder;
-
- public Decoder()
+
+ private readonly ReedSolomonDecoder rsDecoder;
+
+ public Decoder()
+ {
+ rsDecoder = new ReedSolomonDecoder(GenericGF.DATA_MATRIX_FIELD_256);
+ }
+
+ ///
+ /// Convenience method that can decode a Data Matrix Code represented as a 2D array of booleans.
+ /// "true" is taken to mean a black module.
+ ///
+ /// booleans representing white/black Data Matrix Code modules
+ /// text and bytes encoded within the Data Matrix Code
+ /// if the Data Matrix Code cannot be decoded
+ /// if error correction fails
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.common.DecoderResult decode(boolean[][] image) throws com.google.zxing.FormatException, com.google.zxing.ChecksumException
+ public DecoderResult decode(bool[][] image)
+ {
+ int dimension = image.Length;
+ BitMatrix bits = new BitMatrix(dimension);
+ for (int i = 0; i < dimension; i++)
{
- rsDecoder = new ReedSolomonDecoder(GF256.DATA_MATRIX_FIELD);
+ for (int j = 0; j < dimension; j++)
+ {
+ if (image[i][j])
+ {
+ bits.set(j, i);
+ }
+ }
}
-
- /// Convenience method that can decode a Data Matrix Code represented as a 2D array of booleans.
- /// "true" is taken to mean a black module.
- ///
- ///
- /// booleans representing white/black Data Matrix Code modules
- ///
- /// text and bytes encoded within the Data Matrix Code
- ///
- /// ReaderException if the Data Matrix Code cannot be decoded
- public DecoderResult decode(bool[][] image)
+ return decode(bits);
+ }
+
+ ///
+ /// Decodes a Data Matrix Code represented as a . A 1 or "true" is taken
+ /// to mean a black module.
+ ///
+ /// booleans representing white/black Data Matrix Code modules
+ /// text and bytes encoded within the Data Matrix Code
+ /// if the Data Matrix Code cannot be decoded
+ /// if error correction fails
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.common.DecoderResult decode(com.google.zxing.common.BitMatrix bits) throws com.google.zxing.FormatException, com.google.zxing.ChecksumException
+ public DecoderResult decode(BitMatrix bits)
+ {
+
+ // Construct a parser and read version, error-correction level
+ BitMatrixParser parser = new BitMatrixParser(bits);
+ Version version = parser.Version;
+
+ // Read codewords
+ sbyte[] codewords = parser.readCodewords();
+ // Separate into data blocks
+ DataBlock[] dataBlocks = DataBlock.getDataBlocks(codewords, version);
+
+ int dataBlocksCount = dataBlocks.Length;
+
+ // Count total number of data bytes
+ int totalBytes = 0;
+ foreach (DataBlock db in dataBlocks)
{
- int dimension = image.Length;
- BitMatrix bits = new BitMatrix(dimension);
- for (int i = 0; i < dimension; i++)
- {
- for (int j = 0; j < dimension; j++)
- {
- if (image[i][j])
- {
- bits.set_Renamed(j, i);
- }
- }
- }
- return decode(bits);
+ totalBytes += db.NumDataCodewords;
}
-
- /// Decodes a Data Matrix Code represented as a {@link BitMatrix}. A 1 or "true" is taken
- /// to mean a black module.
- ///
- ///
- /// booleans representing white/black Data Matrix Code modules
- ///
- /// text and bytes encoded within the Data Matrix Code
- ///
- /// ReaderException if the Data Matrix Code cannot be decoded
- public DecoderResult decode(BitMatrix bits)
+ sbyte[] resultBytes = new sbyte[totalBytes];
+
+ // Error-correct and copy data blocks together into a stream of bytes
+ for (int j = 0; j < dataBlocksCount; j++)
{
-
- // Construct a parser and read version, error-correction level
- BitMatrixParser parser = new BitMatrixParser(bits);
- Version version = parser.readVersion(bits);
-
- // Read codewords
- sbyte[] codewords = parser.readCodewords();
- // Separate into data blocks
- DataBlock[] dataBlocks = DataBlock.getDataBlocks(codewords, version);
-
- // Count total number of data bytes
- int totalBytes = 0;
- for (int i = 0; i < dataBlocks.Length; i++)
- {
- totalBytes += dataBlocks[i].NumDataCodewords;
- }
- sbyte[] resultBytes = new sbyte[totalBytes];
- int resultOffset = 0;
-
- // Error-correct and copy data blocks together into a stream of bytes
- for (int j = 0; j < dataBlocks.Length; j++)
- {
- DataBlock dataBlock = dataBlocks[j];
- sbyte[] codewordBytes = dataBlock.Codewords;
- int numDataCodewords = dataBlock.NumDataCodewords;
- correctErrors(codewordBytes, numDataCodewords);
- for (int i = 0; i < numDataCodewords; i++)
- {
- resultBytes[resultOffset++] = codewordBytes[i];
- }
- }
-
- // Decode the contents of that stream of bytes
- return DecodedBitStreamParser.decode(resultBytes);
+ DataBlock dataBlock = dataBlocks[j];
+ sbyte[] codewordBytes = dataBlock.Codewords;
+ int numDataCodewords = dataBlock.NumDataCodewords;
+ correctErrors(codewordBytes, numDataCodewords);
+ for (int i = 0; i < numDataCodewords; i++)
+ {
+ // De-interlace data blocks.
+ resultBytes[i * dataBlocksCount + j] = codewordBytes[i];
+ }
}
-
- /// Given data and error-correction codewords received, possibly corrupted by errors, attempts to
- /// correct the errors in-place using Reed-Solomon error correction.
- ///
- ///
- /// data and error correction codewords
- ///
- /// number of codewords that are data bytes
- ///
- /// ReaderException if error correction fails
- private void correctErrors(sbyte[] codewordBytes, int numDataCodewords)
+
+ // Decode the contents of that stream of bytes
+ return DecodedBitStreamParser.decode(resultBytes);
+ }
+
+ ///
+ /// Given data and error-correction codewords received, possibly corrupted by errors, attempts to
+ /// correct the errors in-place using Reed-Solomon error correction.
+ ///
+ /// data and error correction codewords
+ /// number of codewords that are data bytes
+ /// if error correction fails
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private void correctErrors(byte[] codewordBytes, int numDataCodewords) throws com.google.zxing.ChecksumException
+ private void correctErrors(sbyte[] codewordBytes, int numDataCodewords)
+ {
+ int numCodewords = codewordBytes.Length;
+ // First read into an array of ints
+ int[] codewordsInts = new int[numCodewords];
+ for (int i = 0; i < numCodewords; i++)
{
- int numCodewords = codewordBytes.Length;
- // First read into an array of ints
- int[] codewordsInts = new int[numCodewords];
- for (int i = 0; i < numCodewords; i++)
- {
- codewordsInts[i] = codewordBytes[i] & 0xFF;
- }
- int numECCodewords = codewordBytes.Length - numDataCodewords;
- try
- {
- rsDecoder.decode(codewordsInts, numECCodewords);
- }
- catch (ReedSolomonException)
- {
- throw ReaderException.Instance;
- }
- // Copy back into array of bytes -- only need to worry about the bytes that were data
- // We don't care about errors in the error-correction codewords
- for (int i = 0; i < numDataCodewords; i++)
- {
- codewordBytes[i] = (sbyte) codewordsInts[i];
- }
+ codewordsInts[i] = codewordBytes[i] & 0xFF;
}
+ int numECCodewords = codewordBytes.Length - numDataCodewords;
+ try
+ {
+ rsDecoder.decode(codewordsInts, numECCodewords);
+ }
+ catch (ReedSolomonException rse)
+ {
+ throw ChecksumException.ChecksumInstance;
+ }
+ // Copy back into array of bytes -- only need to worry about the bytes that were data
+ // We don't care about errors in the error-correction codewords
+ for (int i = 0; i < numDataCodewords; i++)
+ {
+ codewordBytes[i] = (sbyte) codewordsInts[i];
+ }
+ }
+
}
-}
+
+}
\ No newline at end of file
diff --git a/csharp/datamatrix/decoder/Version.cs b/csharp/datamatrix/decoder/Version.cs
index e91ef7d7f..0a6525826 100755
--- a/csharp/datamatrix/decoder/Version.cs
+++ b/csharp/datamatrix/decoder/Version.cs
@@ -1,241 +1,234 @@
-/*
-* Copyright 2007 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using ReaderException = com.google.zxing.ReaderException;
+
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.datamatrix.decoder
{
-
- /// The Version object encapsulates attributes about a particular
+
+ using FormatException = com.google.zxing.FormatException;
+
+ ///
+ /// The Version object encapsulates attributes about a particular
/// size Data Matrix Code.
///
+ /// @author bbrown@google.com (Brian Brown)
///
- /// bbrown@google.com (Brian Brown)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class Version
{
- public int VersionNumber
+
+ private static readonly Version[] VERSIONS = buildVersions();
+
+ private readonly int versionNumber;
+ private readonly int symbolSizeRows;
+ private readonly int symbolSizeColumns;
+ private readonly int dataRegionSizeRows;
+ private readonly int dataRegionSizeColumns;
+ private readonly ECBlocks ecBlocks;
+ private readonly int totalCodewords;
+
+ private Version(int versionNumber, int symbolSizeRows, int symbolSizeColumns, int dataRegionSizeRows, int dataRegionSizeColumns, ECBlocks ecBlocks)
+ {
+ this.versionNumber = versionNumber;
+ this.symbolSizeRows = symbolSizeRows;
+ this.symbolSizeColumns = symbolSizeColumns;
+ this.dataRegionSizeRows = dataRegionSizeRows;
+ this.dataRegionSizeColumns = dataRegionSizeColumns;
+ this.ecBlocks = ecBlocks;
+
+ // Calculate the total number of codewords
+ int total = 0;
+ int ecCodewords = ecBlocks.ECCodewords;
+ ECB[] ecbArray = ecBlocks.GetECB;
+ foreach (ECB ecBlock in ecbArray)
{
- get
- {
- return versionNumber;
- }
-
+ total += ecBlock.Count * (ecBlock.DataCodewords + ecCodewords);
}
- public int SymbolSizeRows
- {
- get
- {
- return symbolSizeRows;
- }
-
- }
- public int SymbolSizeColumns
- {
- get
- {
- return symbolSizeColumns;
- }
-
- }
- public int DataRegionSizeRows
- {
- get
- {
- return dataRegionSizeRows;
- }
-
- }
- public int DataRegionSizeColumns
- {
- get
- {
- return dataRegionSizeColumns;
- }
-
- }
- public int TotalCodewords
- {
- get
- {
- return totalCodewords;
- }
-
- }
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'VERSIONS '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly Version[] VERSIONS = buildVersions();
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'versionNumber '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int versionNumber;
- //UPGRADE_NOTE: Final was removed from the declaration of 'symbolSizeRows '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int symbolSizeRows;
- //UPGRADE_NOTE: Final was removed from the declaration of 'symbolSizeColumns '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int symbolSizeColumns;
- //UPGRADE_NOTE: Final was removed from the declaration of 'dataRegionSizeRows '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int dataRegionSizeRows;
- //UPGRADE_NOTE: Final was removed from the declaration of 'dataRegionSizeColumns '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int dataRegionSizeColumns;
- //UPGRADE_NOTE: Final was removed from the declaration of 'ecBlocks '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private ECBlocks ecBlocks;
- //UPGRADE_NOTE: Final was removed from the declaration of 'totalCodewords '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int totalCodewords;
-
- private Version(int versionNumber, int symbolSizeRows, int symbolSizeColumns, int dataRegionSizeRows, int dataRegionSizeColumns, ECBlocks ecBlocks)
- {
- this.versionNumber = versionNumber;
- this.symbolSizeRows = symbolSizeRows;
- this.symbolSizeColumns = symbolSizeColumns;
- this.dataRegionSizeRows = dataRegionSizeRows;
- this.dataRegionSizeColumns = dataRegionSizeColumns;
- this.ecBlocks = ecBlocks;
-
- // Calculate the total number of codewords
- int total = 0;
- int ecCodewords = ecBlocks.ECCodewords;
- ECB[] ecbArray = ecBlocks.getECBlocks();
- for (int i = 0; i < ecbArray.Length; i++)
- {
- ECB ecBlock = ecbArray[i];
- total += ecBlock.Count * (ecBlock.DataCodewords + ecCodewords);
- }
- this.totalCodewords = total;
- }
-
- internal ECBlocks getECBlocks()
- {
+ this.totalCodewords = total;
+ }
+
+ public int VersionNumber
+ {
+ get
+ {
+ return versionNumber;
+ }
+ }
+
+ public int SymbolSizeRows
+ {
+ get
+ {
+ return symbolSizeRows;
+ }
+ }
+
+ public int SymbolSizeColumns
+ {
+ get
+ {
+ return symbolSizeColumns;
+ }
+ }
+
+ public int DataRegionSizeRows
+ {
+ get
+ {
+ return dataRegionSizeRows;
+ }
+ }
+
+ public int DataRegionSizeColumns
+ {
+ get
+ {
+ return dataRegionSizeColumns;
+ }
+ }
+
+ public int TotalCodewords
+ {
+ get
+ {
+ return totalCodewords;
+ }
+ }
+
+ internal ECBlocks ECBlocks2
+ {
+ get
+ {
return ecBlocks;
- }
-
- /// Deduces version information from Data Matrix dimensions.
- ///
- ///
- /// Number of rows in modules
- ///
- /// Number of columns in modules
- ///
- /// {@link Version} for a Data Matrix Code of those dimensions
- ///
- /// ReaderException if dimensions do correspond to a valid Data Matrix size
- public static Version getVersionForDimensions(int numRows, int numColumns)
+ }
+ }
+
+ ///
+ /// Deduces version information from Data Matrix dimensions.
+ ///
+ /// Number of rows in modules
+ /// Number of columns in modules
+ /// Version for a Data Matrix Code of those dimensions
+ /// if dimensions do correspond to a valid Data Matrix size
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public static Version getVersionForDimensions(int numRows, int numColumns) throws com.google.zxing.FormatException
+ public static Version getVersionForDimensions(int numRows, int numColumns)
+ {
+ if ((numRows & 0x01) != 0 || (numColumns & 0x01) != 0)
{
- if ((numRows & 0x01) != 0 || (numColumns & 0x01) != 0)
- {
- throw ReaderException.Instance;
- }
-
- // TODO(bbrown): This is doing a linear search through the array of versions.
- // If we interleave the rectangular versions with the square versions we could
- // do a binary search.
- int numVersions = VERSIONS.Length;
- for (int i = 0; i < numVersions; ++i)
- {
- Version version = VERSIONS[i];
- if (version.symbolSizeRows == numRows && version.symbolSizeColumns == numColumns)
- {
- return version;
- }
- }
-
- throw ReaderException.Instance;
+ throw FormatException.FormatInstance;
}
-
- /// Encapsulates a set of error-correction blocks in one symbol version. Most versions will
- /// use blocks of differing sizes within one version, so, this encapsulates the parameters for
- /// each set of blocks. It also holds the number of error-correction codewords per block since it
- /// will be the same across all blocks within one version.
- ///
- internal sealed class ECBlocks
+
+ foreach (Version version in VERSIONS)
{
- internal int ECCodewords
- {
- get
- {
- return ecCodewords;
- }
-
- }
- //UPGRADE_NOTE: Final was removed from the declaration of 'ecCodewords '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int ecCodewords;
- //UPGRADE_NOTE: Final was removed from the declaration of 'ecBlocks '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private ECB[] ecBlocks;
-
- internal ECBlocks(int ecCodewords, ECB ecBlocks)
- {
- this.ecCodewords = ecCodewords;
- this.ecBlocks = new ECB[]{ecBlocks};
- }
-
- internal ECBlocks(int ecCodewords, ECB ecBlocks1, ECB ecBlocks2)
- {
- this.ecCodewords = ecCodewords;
- this.ecBlocks = new ECB[]{ecBlocks1, ecBlocks2};
- }
-
- internal ECB[] getECBlocks()
- {
- return ecBlocks;
- }
+ if (version.symbolSizeRows == numRows && version.symbolSizeColumns == numColumns)
+ {
+ return version;
+ }
}
-
- /// Encapsualtes the parameters for one error-correction block in one symbol version.
- /// This includes the number of data codewords, and the number of times a block with these
- /// parameters is used consecutively in the Data Matrix code version's format.
- ///
- internal sealed class ECB
+
+ throw FormatException.FormatInstance;
+ }
+
+ ///
+ /// Encapsulates a set of error-correction blocks in one symbol version. Most versions will
+ /// use blocks of differing sizes within one version, so, this encapsulates the parameters for
+ /// each set of blocks. It also holds the number of error-correction codewords per block since it
+ /// will be the same across all blocks within one version.
+ ///
+ internal sealed class ECBlocks
+ {
+ private readonly int ecCodewords;
+ private readonly ECB[] ecBlocks;
+
+ internal ECBlocks(int ecCodewords, ECB ecBlocks)
{
- internal int Count
- {
- get
- {
- return count;
- }
-
- }
- internal int DataCodewords
- {
- get
- {
- return dataCodewords;
- }
-
- }
- //UPGRADE_NOTE: Final was removed from the declaration of 'count '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int count;
- //UPGRADE_NOTE: Final was removed from the declaration of 'dataCodewords '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int dataCodewords;
-
- internal ECB(int count, int dataCodewords)
- {
- this.count = count;
- this.dataCodewords = dataCodewords;
- }
+ this.ecCodewords = ecCodewords;
+ this.ecBlocks = new ECB[] {ecBlocks};
}
-
- public override System.String ToString()
+
+ internal ECBlocks(int ecCodewords, ECB ecBlocks1, ECB ecBlocks2)
{
- return System.Convert.ToString(versionNumber);
+ this.ecCodewords = ecCodewords;
+ this.ecBlocks = new ECB[] {ecBlocks1, ecBlocks2};
}
-
- /// See ISO 16022:2006 5.5.1 Table 7
- private static Version[] buildVersions()
+
+ internal int ECCodewords
{
- return new Version[]{new Version(1, 10, 10, 8, 8, new ECBlocks(5, new ECB(1, 3))), new Version(2, 12, 12, 10, 10, new ECBlocks(7, new ECB(1, 5))), new Version(3, 14, 14, 12, 12, new ECBlocks(10, new ECB(1, 8))), new Version(4, 16, 16, 14, 14, new ECBlocks(12, new ECB(1, 12))), new Version(5, 18, 18, 16, 16, new ECBlocks(14, new ECB(1, 18))), new Version(6, 20, 20, 18, 18, new ECBlocks(18, new ECB(1, 22))), new Version(7, 22, 22, 20, 20, new ECBlocks(20, new ECB(1, 30))), new Version(8, 24, 24, 22, 22, new ECBlocks(24, new ECB(1, 36))), new Version(9, 26, 26, 24, 24, new ECBlocks(28, new ECB(1, 44))), new Version(10, 32, 32, 14, 14, new ECBlocks(36, new ECB(1, 62))), new Version(11, 36, 36, 16, 16, new ECBlocks(42, new ECB(1, 86))), new Version(12, 40, 40, 18, 18, new ECBlocks(48, new ECB(1, 114))), new Version(13, 44, 44, 20, 20, new ECBlocks(56, new ECB(1, 144))), new Version(14, 48, 48, 22, 22, new ECBlocks(68, new ECB(1, 174))), new Version(15, 52, 52, 24, 24, new ECBlocks(42, new ECB(2, 102))), new Version(16, 64, 64, 14, 14, new ECBlocks(56, new ECB(2, 140))), new Version(17, 72, 72, 16, 16, new ECBlocks(36, new ECB(4, 92))), new Version(18, 80, 80, 18, 18, new ECBlocks(48, new ECB(4, 114))), new Version(19, 88, 88, 20, 20, new ECBlocks(56, new ECB(4, 144))), new Version(20, 96, 96, 22, 22, new ECBlocks(68, new ECB(4, 174))), new Version(21, 104, 104, 24, 24, new ECBlocks(56, new ECB(6, 136))), new Version(22, 120, 120, 18, 18, new ECBlocks(68, new ECB(6, 175))), new Version(23, 132, 132, 20, 20, new ECBlocks(62, new ECB(8, 163))), new Version(24, 144, 144, 22, 22, new ECBlocks(62, new ECB(8, 156), new ECB(2, 155))), new Version(25, 8, 18, 6, 16, new ECBlocks(7, new ECB(1, 5))), new Version(26, 8, 32, 6, 14, new ECBlocks(11, new ECB(1, 10))), new Version(27, 12, 26, 10, 24, new ECBlocks(14, new ECB(1, 16))), new Version(28, 12, 36, 10, 16, new ECBlocks(18, new ECB(1, 22))), new Version(29, 16, 36, 10, 16, new ECBlocks(24, new ECB(1, 32))), new Version(30, 16, 48, 14, 22, new ECBlocks(28,
- new ECB(1, 49)))};
+ get
+ {
+ return ecCodewords;
+ }
}
+
+ internal ECB[] GetECB
+ {
+ get
+ {
+ return ecBlocks;
+ }
+ }
+ }
+
+ ///
+ /// Encapsualtes the parameters for one error-correction block in one symbol version.
+ /// This includes the number of data codewords, and the number of times a block with these
+ /// parameters is used consecutively in the Data Matrix code version's format.
+ ///
+ internal sealed class ECB
+ {
+ private readonly int count;
+ private readonly int dataCodewords;
+
+ internal ECB(int count, int dataCodewords)
+ {
+ this.count = count;
+ this.dataCodewords = dataCodewords;
+ }
+
+ internal int Count
+ {
+ get
+ {
+ return count;
+ }
+ }
+
+ internal int DataCodewords
+ {
+ get
+ {
+ return dataCodewords;
+ }
+ }
+ }
+
+ public override string ToString()
+ {
+ return Convert.ToString(versionNumber);
+ }
+
+ ///
+ /// See ISO 16022:2006 5.5.1 Table 7
+ ///
+ private static Version[] buildVersions()
+ {
+ return new Version[]{new Version(1, 10, 10, 8, 8, new ECBlocks(5, new ECB(1, 3))), new Version(2, 12, 12, 10, 10, new ECBlocks(7, new ECB(1, 5))), new Version(3, 14, 14, 12, 12, new ECBlocks(10, new ECB(1, 8))), new Version(4, 16, 16, 14, 14, new ECBlocks(12, new ECB(1, 12))), new Version(5, 18, 18, 16, 16, new ECBlocks(14, new ECB(1, 18))), new Version(6, 20, 20, 18, 18, new ECBlocks(18, new ECB(1, 22))), new Version(7, 22, 22, 20, 20, new ECBlocks(20, new ECB(1, 30))), new Version(8, 24, 24, 22, 22, new ECBlocks(24, new ECB(1, 36))), new Version(9, 26, 26, 24, 24, new ECBlocks(28, new ECB(1, 44))), new Version(10, 32, 32, 14, 14, new ECBlocks(36, new ECB(1, 62))), new Version(11, 36, 36, 16, 16, new ECBlocks(42, new ECB(1, 86))), new Version(12, 40, 40, 18, 18, new ECBlocks(48, new ECB(1, 114))), new Version(13, 44, 44, 20, 20, new ECBlocks(56, new ECB(1, 144))), new Version(14, 48, 48, 22, 22, new ECBlocks(68, new ECB(1, 174))), new Version(15, 52, 52, 24, 24, new ECBlocks(42, new ECB(2, 102))), new Version(16, 64, 64, 14, 14, new ECBlocks(56, new ECB(2, 140))), new Version(17, 72, 72, 16, 16, new ECBlocks(36, new ECB(4, 92))), new Version(18, 80, 80, 18, 18, new ECBlocks(48, new ECB(4, 114))), new Version(19, 88, 88, 20, 20, new ECBlocks(56, new ECB(4, 144))), new Version(20, 96, 96, 22, 22, new ECBlocks(68, new ECB(4, 174))), new Version(21, 104, 104, 24, 24, new ECBlocks(56, new ECB(6, 136))), new Version(22, 120, 120, 18, 18, new ECBlocks(68, new ECB(6, 175))), new Version(23, 132, 132, 20, 20, new ECBlocks(62, new ECB(8, 163))), new Version(24, 144, 144, 22, 22, new ECBlocks(62, new ECB(8, 156), new ECB(2, 155))), new Version(25, 8, 18, 6, 16, new ECBlocks(7, new ECB(1, 5))), new Version(26, 8, 32, 6, 14, new ECBlocks(11, new ECB(1, 10))), new Version(27, 12, 26, 10, 24, new ECBlocks(14, new ECB(1, 16))), new Version(28, 12, 36, 10, 16, new ECBlocks(18, new ECB(1, 22))), new Version(29, 16, 36, 14, 16, new ECBlocks(24, new ECB(1, 32))), new Version(30, 16, 48, 14, 22, new ECBlocks(28, new ECB(1, 49)))};
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/datamatrix/detector/Detector.cs b/csharp/datamatrix/detector/Detector.cs
index 31278d006..bad0ad35f 100755
--- a/csharp/datamatrix/detector/Detector.cs
+++ b/csharp/datamatrix/detector/Detector.cs
@@ -1,325 +1,466 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using ReaderException = com.google.zxing.ReaderException;
-using ResultPoint = com.google.zxing.ResultPoint;
-using BitMatrix = com.google.zxing.common.BitMatrix;
-using Collections = com.google.zxing.common.Collections;
-using Comparator = com.google.zxing.common.Comparator;
-using DetectorResult = com.google.zxing.common.DetectorResult;
-using GridSampler = com.google.zxing.common.GridSampler;
-using MonochromeRectangleDetector = com.google.zxing.common.detector.MonochromeRectangleDetector;
+using System.Collections.Generic;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.datamatrix.detector
{
-
- /// Encapsulates logic that can detect a Data Matrix Code in an image, even if the Data Matrix Code
+
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using ResultPoint = com.google.zxing.ResultPoint;
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+ using DetectorResult = com.google.zxing.common.DetectorResult;
+ using GridSampler = com.google.zxing.common.GridSampler;
+ using MathUtils = com.google.zxing.common.detector.MathUtils;
+ using WhiteRectangleDetector = com.google.zxing.common.detector.WhiteRectangleDetector;
+
+
+ ///
+ /// Encapsulates logic that can detect a Data Matrix Code in an image, even if the Data Matrix Code
/// is rotated or skewed, or partially obscured.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
public sealed class Detector
{
-
- //private static final int MAX_MODULES = 32;
-
- // Trick to avoid creating new Integer objects below -- a sort of crude copy of
- // the Integer.valueOf(int) optimization added in Java 5, not in J2ME
- //UPGRADE_NOTE: Final was removed from the declaration of 'INTEGERS '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly System.Int32[] INTEGERS = new System.Int32[]{0, 1, 2, 3, 4};
- // No, can't use valueOf()
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'image '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private BitMatrix image;
- //UPGRADE_NOTE: Final was removed from the declaration of 'rectangleDetector '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private MonochromeRectangleDetector rectangleDetector;
-
- public Detector(BitMatrix image)
+
+ private readonly BitMatrix image;
+ private readonly WhiteRectangleDetector rectangleDetector;
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public Detector(com.google.zxing.common.BitMatrix image) throws com.google.zxing.NotFoundException
+ public Detector(BitMatrix image)
+ {
+ this.image = image;
+ rectangleDetector = new WhiteRectangleDetector(image);
+ }
+
+ ///
+ /// Detects a Data Matrix Code in an image.
+ ///
+ /// encapsulating results of detecting a Data Matrix Code
+ /// if no Data Matrix Code can be found
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.common.DetectorResult detect() throws com.google.zxing.NotFoundException
+ public DetectorResult detect()
+ {
+
+ ResultPoint[] cornerPoints = rectangleDetector.detect();
+ ResultPoint pointA = cornerPoints[0];
+ ResultPoint pointB = cornerPoints[1];
+ ResultPoint pointC = cornerPoints[2];
+ ResultPoint pointD = cornerPoints[3];
+
+ // Point A and D are across the diagonal from one another,
+ // as are B and C. Figure out which are the solid black lines
+ // by counting transitions
+ List transitions = new List(4);
+ transitions.Add(transitionsBetween(pointA, pointB));
+ transitions.Add(transitionsBetween(pointA, pointC));
+ transitions.Add(transitionsBetween(pointB, pointD));
+ transitions.Add(transitionsBetween(pointC, pointD));
+ transitions.Sort(new ResultPointsAndTransitionsComparator());
+
+ // Sort by number of transitions. First two will be the two solid sides; last two
+ // will be the two alternating black/white sides
+ ResultPointsAndTransitions lSideOne = transitions[0];
+ ResultPointsAndTransitions lSideTwo = transitions[1];
+
+ // Figure out which point is their intersection by tallying up the number of times we see the
+ // endpoints in the four endpoints. One will show up twice.
+ IDictionary pointCount = new Dictionary();
+ increment(pointCount, lSideOne.From);
+ increment(pointCount, lSideOne.To);
+ increment(pointCount, lSideTwo.From);
+ increment(pointCount, lSideTwo.To);
+
+ ResultPoint maybeTopLeft = null;
+ ResultPoint bottomLeft = null;
+ ResultPoint maybeBottomRight = null;
+ foreach (KeyValuePair entry in pointCount)
{
- this.image = image;
- rectangleDetector = new MonochromeRectangleDetector(image);
- }
-
- /// Detects a Data Matrix Code in an image.
- ///
- ///
- /// {@link DetectorResult} encapsulating results of detecting a QR Code
- ///
- /// ReaderException if no Data Matrix Code can be found
- public DetectorResult detect()
- {
-
- ResultPoint[] cornerPoints = rectangleDetector.detect();
- ResultPoint pointA = cornerPoints[0];
- ResultPoint pointB = cornerPoints[1];
- ResultPoint pointC = cornerPoints[2];
- ResultPoint pointD = cornerPoints[3];
-
- // Point A and D are across the diagonal from one another,
- // as are B and C. Figure out which are the solid black lines
- // by counting transitions
- System.Collections.ArrayList transitions = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(4));
- transitions.Add(transitionsBetween(pointA, pointB));
- transitions.Add(transitionsBetween(pointA, pointC));
- transitions.Add(transitionsBetween(pointB, pointD));
- transitions.Add(transitionsBetween(pointC, pointD));
- Collections.insertionSort(transitions, new ResultPointsAndTransitionsComparator());
-
- // Sort by number of transitions. First two will be the two solid sides; last two
- // will be the two alternating black/white sides
- ResultPointsAndTransitions lSideOne = (ResultPointsAndTransitions) transitions[0];
- ResultPointsAndTransitions lSideTwo = (ResultPointsAndTransitions) transitions[1];
-
- // Figure out which point is their intersection by tallying up the number of times we see the
- // endpoints in the four endpoints. One will show up twice.
- System.Collections.Hashtable pointCount = System.Collections.Hashtable.Synchronized(new System.Collections.Hashtable());
- increment(pointCount, lSideOne.From);
- increment(pointCount, lSideOne.To);
- increment(pointCount, lSideTwo.From);
- increment(pointCount, lSideTwo.To);
-
- ResultPoint maybeTopLeft = null;
- ResultPoint bottomLeft = null;
- ResultPoint maybeBottomRight = null;
- System.Collections.IEnumerator points = pointCount.Keys.GetEnumerator();
- //UPGRADE_TODO: Method 'java.util.Enumeration.hasMoreElements' was converted to 'System.Collections.IEnumerator.MoveNext' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javautilEnumerationhasMoreElements'"
- while (points.MoveNext())
+ ResultPoint point = entry.Key;
+ int? value = entry.Value;
+ if (value == 2)
+ {
+ bottomLeft = point; // this is definitely the bottom left, then -- end of two L sides
+ }
+ else
+ {
+ // Otherwise it's either top left or bottom right -- just assign the two arbitrarily now
+ if (maybeTopLeft == null)
{
- //UPGRADE_TODO: Method 'java.util.Enumeration.nextElement' was converted to 'System.Collections.IEnumerator.Current' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javautilEnumerationnextElement'"
- ResultPoint point = (ResultPoint) points.Current;
- System.Int32 value_Renamed = (System.Int32) pointCount[point];
- if (value_Renamed == 2)
- {
- bottomLeft = point; // this is definitely the bottom left, then -- end of two L sides
- }
- else
- {
- // Otherwise it's either top left or bottom right -- just assign the two arbitrarily now
- if (maybeTopLeft == null)
- {
- maybeTopLeft = point;
- }
- else
- {
- maybeBottomRight = point;
- }
- }
- }
-
- if (maybeTopLeft == null || bottomLeft == null || maybeBottomRight == null)
- {
- throw ReaderException.Instance;
- }
-
- // Bottom left is correct but top left and bottom right might be switched
- ResultPoint[] corners = new ResultPoint[]{maybeTopLeft, bottomLeft, maybeBottomRight};
- // Use the dot product trick to sort them out
- ResultPoint.orderBestPatterns(corners);
-
- // Now we know which is which:
- ResultPoint bottomRight = corners[0];
- bottomLeft = corners[1];
- ResultPoint topLeft = corners[2];
-
- // Which point didn't we find in relation to the "L" sides? that's the top right corner
- ResultPoint topRight;
- if (!pointCount.ContainsKey(pointA))
- {
- topRight = pointA;
- }
- else if (!pointCount.ContainsKey(pointB))
- {
- topRight = pointB;
- }
- else if (!pointCount.ContainsKey(pointC))
- {
- topRight = pointC;
+ maybeTopLeft = point;
}
else
{
- topRight = pointD;
+ maybeBottomRight = point;
}
-
- // Next determine the dimension by tracing along the top or right side and counting black/white
- // transitions. Since we start inside a black module, we should see a number of transitions
- // equal to 1 less than the code dimension. Well, actually 2 less, because we are going to
- // end on a black module:
-
- // The top right point is actually the corner of a module, which is one of the two black modules
- // adjacent to the white module at the top right. Tracing to that corner from either the top left
- // or bottom right should work here. The number of transitions could be higher than it should be
- // due to noise. So we try both and take the min.
-
- int dimension = System.Math.Min(transitionsBetween(topLeft, topRight).Transitions, transitionsBetween(bottomRight, topRight).Transitions);
- if ((dimension & 0x01) == 1)
- {
- // it can't be odd, so, round... up?
- dimension++;
- }
- dimension += 2;
-
- BitMatrix bits = sampleGrid(image, topLeft, bottomLeft, bottomRight, dimension);
- return new DetectorResult(bits, new ResultPoint[]{pointA, pointB, pointC, pointD});
+ }
}
-
- /// Increments the Integer associated with a key by one.
- private static void increment(System.Collections.Hashtable table, ResultPoint key)
+
+ if (maybeTopLeft == null || bottomLeft == null || maybeBottomRight == null)
{
- //System.Int32 value_Renamed = (System.Int32) table[key];
- ////UPGRADE_TODO: The 'System.Int32' structure does not have an equivalent to NULL. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1291'"
- //table[key] = value_Renamed == null?INTEGERS[1]:INTEGERS[value_Renamed + 1];
- // Redivivus.in Java to c# Porting update
- // 30/01/2010
- // Added
- // START
- System.Int32 value_Renamed = 0;
- try
- {
- if (table.Count > 0)
- value_Renamed = (System.Int32)table[key];
- }
- catch
- {
- value_Renamed = 0;
- }
- table[key] = value_Renamed == 0 ? INTEGERS[1] : INTEGERS[value_Renamed + 1];
- //END
+ throw NotFoundException.NotFoundInstance;
}
-
- private static BitMatrix sampleGrid(BitMatrix image, ResultPoint topLeft, ResultPoint bottomLeft, ResultPoint bottomRight, int dimension)
+
+ // Bottom left is correct but top left and bottom right might be switched
+ ResultPoint[] corners = {maybeTopLeft, bottomLeft, maybeBottomRight};
+ // Use the dot product trick to sort them out
+ ResultPoint.orderBestPatterns(corners);
+
+ // Now we know which is which:
+ ResultPoint bottomRight = corners[0];
+ bottomLeft = corners[1];
+ ResultPoint topLeft = corners[2];
+
+ // Which point didn't we find in relation to the "L" sides? that's the top right corner
+ ResultPoint topRight;
+ if (!pointCount.ContainsKey(pointA))
{
-
- // We make up the top right point for now, based on the others.
- // TODO: we actually found a fourth corner above and figured out which of two modules
- // it was the corner of. We could use that here and adjust for perspective distortion.
- float topRightX = (bottomRight.X - bottomLeft.X) + topLeft.X;
- float topRightY = (bottomRight.Y - bottomLeft.Y) + topLeft.Y;
-
- // Note that unlike in the QR Code sampler, we didn't find the center of modules, but the
- // very corners. So there is no 0.5f here; 0.0f is right.
- GridSampler sampler = GridSampler.Instance;
- return sampler.sampleGrid(image, dimension, 0.0f, 0.0f, dimension, 0.0f, dimension, dimension, 0.0f, dimension, topLeft.X, topLeft.Y, topRightX, topRightY, bottomRight.X, bottomRight.Y, bottomLeft.X, bottomLeft.Y);
+ topRight = pointA;
}
-
- /// Counts the number of black/white transitions between two points, using something like Bresenham's algorithm.
- private ResultPointsAndTransitions transitionsBetween(ResultPoint from, ResultPoint to)
+ else if (!pointCount.ContainsKey(pointB))
{
- // See QR Code Detector, sizeOfBlackWhiteBlackRun()
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- int fromX = (int) from.X;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- int fromY = (int) from.Y;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- int toX = (int) to.X;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- int toY = (int) to.Y;
- bool steep = System.Math.Abs(toY - fromY) > System.Math.Abs(toX - fromX);
- if (steep)
- {
- int temp = fromX;
- fromX = fromY;
- fromY = temp;
- temp = toX;
- toX = toY;
- toY = temp;
- }
-
- int dx = System.Math.Abs(toX - fromX);
- int dy = System.Math.Abs(toY - fromY);
- int error = - dx >> 1;
- int ystep = fromY < toY?1:- 1;
- int xstep = fromX < toX?1:- 1;
- int transitions = 0;
- bool inBlack = image.get_Renamed(steep?fromY:fromX, steep?fromX:fromY);
- for (int x = fromX, y = fromY; x != toX; x += xstep)
- {
- bool isBlack = image.get_Renamed(steep?y:x, steep?x:y);
- if (isBlack != inBlack)
- {
- transitions++;
- inBlack = isBlack;
- }
- error += dy;
- if (error > 0)
- {
- if (y == toY)
- {
- break;
- }
- y += ystep;
- error -= dx;
- }
- }
- return new ResultPointsAndTransitions(from, to, transitions);
+ topRight = pointB;
}
-
- /// Simply encapsulates two points and a number of transitions between them.
- private class ResultPointsAndTransitions
+ else if (!pointCount.ContainsKey(pointC))
{
- public ResultPoint From
- {
- get
- {
- return from;
- }
-
- }
- public ResultPoint To
- {
- get
- {
- return to;
- }
-
- }
- public int Transitions
- {
- get
- {
- return transitions;
- }
-
- }
- //UPGRADE_NOTE: Final was removed from the declaration of 'from '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private ResultPoint from;
- //UPGRADE_NOTE: Final was removed from the declaration of 'to '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private ResultPoint to;
- //UPGRADE_NOTE: Final was removed from the declaration of 'transitions '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int transitions;
- internal ResultPointsAndTransitions(ResultPoint from, ResultPoint to, int transitions)
- {
- this.from = from;
- this.to = to;
- this.transitions = transitions;
- }
- public override System.String ToString()
- {
- return from + "/" + to + '/' + transitions;
- }
+ topRight = pointC;
}
-
- /// Orders ResultPointsAndTransitions by number of transitions, ascending.
- private class ResultPointsAndTransitionsComparator : Comparator
+ else
{
- public int compare(System.Object o1, System.Object o2)
+ topRight = pointD;
+ }
+
+ // Next determine the dimension by tracing along the top or right side and counting black/white
+ // transitions. Since we start inside a black module, we should see a number of transitions
+ // equal to 1 less than the code dimension. Well, actually 2 less, because we are going to
+ // end on a black module:
+
+ // The top right point is actually the corner of a module, which is one of the two black modules
+ // adjacent to the white module at the top right. Tracing to that corner from either the top left
+ // or bottom right should work here.
+
+ int dimensionTop = transitionsBetween(topLeft, topRight).Transitions;
+ int dimensionRight = transitionsBetween(bottomRight, topRight).Transitions;
+
+ if ((dimensionTop & 0x01) == 1)
+ {
+ // it can't be odd, so, round... up?
+ dimensionTop++;
+ }
+ dimensionTop += 2;
+
+ if ((dimensionRight & 0x01) == 1)
+ {
+ // it can't be odd, so, round... up?
+ dimensionRight++;
+ }
+ dimensionRight += 2;
+
+ BitMatrix bits;
+ ResultPoint correctedTopRight;
+
+ // Rectanguar symbols are 6x16, 6x28, 10x24, 10x32, 14x32, or 14x44. If one dimension is more
+ // than twice the other, it's certainly rectangular, but to cut a bit more slack we accept it as
+ // rectangular if the bigger side is at least 7/4 times the other:
+ if (4 * dimensionTop >= 7 * dimensionRight || 4 * dimensionRight >= 7 * dimensionTop)
+ {
+ // The matrix is rectangular
+
+ correctedTopRight = correctTopRightRectangular(bottomLeft, bottomRight, topLeft, topRight, dimensionTop, dimensionRight);
+ if (correctedTopRight == null)
+ {
+ correctedTopRight = topRight;
+ }
+
+ dimensionTop = transitionsBetween(topLeft, correctedTopRight).Transitions;
+ dimensionRight = transitionsBetween(bottomRight, correctedTopRight).Transitions;
+
+ if ((dimensionTop & 0x01) == 1)
+ {
+ // it can't be odd, so, round... up?
+ dimensionTop++;
+ }
+
+ if ((dimensionRight & 0x01) == 1)
+ {
+ // it can't be odd, so, round... up?
+ dimensionRight++;
+ }
+
+ bits = sampleGrid(image, topLeft, bottomLeft, bottomRight, correctedTopRight, dimensionTop, dimensionRight);
+
+ }
+ else
+ {
+ // The matrix is square
+
+ int dimension = Math.Min(dimensionRight, dimensionTop);
+ // correct top right point to match the white module
+ correctedTopRight = correctTopRight(bottomLeft, bottomRight, topLeft, topRight, dimension);
+ if (correctedTopRight == null)
+ {
+ correctedTopRight = topRight;
+ }
+
+ // Redetermine the dimension using the corrected top right point
+ int dimensionCorrected = Math.Max(transitionsBetween(topLeft, correctedTopRight).Transitions, transitionsBetween(bottomRight, correctedTopRight).Transitions);
+ dimensionCorrected++;
+ if ((dimensionCorrected & 0x01) == 1)
+ {
+ dimensionCorrected++;
+ }
+
+ bits = sampleGrid(image, topLeft, bottomLeft, bottomRight, correctedTopRight, dimensionCorrected, dimensionCorrected);
+ }
+
+ return new DetectorResult(bits, new ResultPoint[]{topLeft, bottomLeft, bottomRight, correctedTopRight});
+ }
+
+ ///
+ /// Calculates the position of the white top right module using the output of the rectangle detector
+ /// for a rectangular matrix
+ ///
+ private ResultPoint correctTopRightRectangular(ResultPoint bottomLeft, ResultPoint bottomRight, ResultPoint topLeft, ResultPoint topRight, int dimensionTop, int dimensionRight)
+ {
+
+ float corr = distance(bottomLeft, bottomRight) / (float)dimensionTop;
+ int norm = distance(topLeft, topRight);
+ float cos = (topRight.X - topLeft.X) / norm;
+ float sin = (topRight.Y - topLeft.Y) / norm;
+
+ ResultPoint c1 = new ResultPoint(topRight.X + corr * cos, topRight.Y + corr * sin);
+
+ corr = distance(bottomLeft, topLeft) / (float)dimensionRight;
+ norm = distance(bottomRight, topRight);
+ cos = (topRight.X - bottomRight.X) / norm;
+ sin = (topRight.Y - bottomRight.Y) / norm;
+
+ ResultPoint c2 = new ResultPoint(topRight.X + corr * cos, topRight.Y + corr * sin);
+
+ if (!isValid(c1))
+ {
+ if (isValid(c2))
+ {
+ return c2;
+ }
+ return null;
+ }
+ if (!isValid(c2))
+ {
+ return c1;
+ }
+
+ int l1 = Math.Abs(dimensionTop - transitionsBetween(topLeft, c1).Transitions) + Math.Abs(dimensionRight - transitionsBetween(bottomRight, c1).Transitions);
+ int l2 = Math.Abs(dimensionTop - transitionsBetween(topLeft, c2).Transitions) + Math.Abs(dimensionRight - transitionsBetween(bottomRight, c2).Transitions);
+
+ if (l1 <= l2)
+ {
+ return c1;
+ }
+
+ return c2;
+ }
+
+ ///
+ /// Calculates the position of the white top right module using the output of the rectangle detector
+ /// for a square matrix
+ ///
+ private ResultPoint correctTopRight(ResultPoint bottomLeft, ResultPoint bottomRight, ResultPoint topLeft, ResultPoint topRight, int dimension)
+ {
+
+ float corr = distance(bottomLeft, bottomRight) / (float) dimension;
+ int norm = distance(topLeft, topRight);
+ float cos = (topRight.X - topLeft.X) / norm;
+ float sin = (topRight.Y - topLeft.Y) / norm;
+
+ ResultPoint c1 = new ResultPoint(topRight.X + corr * cos, topRight.Y + corr * sin);
+
+ corr = distance(bottomLeft, topLeft) / (float) dimension;
+ norm = distance(bottomRight, topRight);
+ cos = (topRight.X - bottomRight.X) / norm;
+ sin = (topRight.Y - bottomRight.Y) / norm;
+
+ ResultPoint c2 = new ResultPoint(topRight.X + corr * cos, topRight.Y + corr * sin);
+
+ if (!isValid(c1))
+ {
+ if (isValid(c2))
+ {
+ return c2;
+ }
+ return null;
+ }
+ if (!isValid(c2))
+ {
+ return c1;
+ }
+
+ int l1 = Math.Abs(transitionsBetween(topLeft, c1).Transitions - transitionsBetween(bottomRight, c1).Transitions);
+ int l2 = Math.Abs(transitionsBetween(topLeft, c2).Transitions - transitionsBetween(bottomRight, c2).Transitions);
+
+ return l1 <= l2 ? c1 : c2;
+ }
+
+ private bool isValid(ResultPoint p)
+ {
+ return p.X >= 0 && p.X < image.Width && p.Y > 0 && p.Y < image.Height;
+ }
+
+ private static int distance(ResultPoint a, ResultPoint b)
+ {
+ return MathUtils.round(ResultPoint.distance(a, b));
+ }
+
+ ///
+ /// Increments the Integer associated with a key by one.
+ ///
+ private static void increment(IDictionary table, ResultPoint key)
+ {
+ int? value = null;
+ if (table.ContainsKey(key))
+ {
+ value = table[key];
+ }
+
+ table[key] = value == null ? 1 : value + 1;
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static com.google.zxing.common.BitMatrix sampleGrid(com.google.zxing.common.BitMatrix image, com.google.zxing.ResultPoint topLeft, com.google.zxing.ResultPoint bottomLeft, com.google.zxing.ResultPoint bottomRight, com.google.zxing.ResultPoint topRight, int dimensionX, int dimensionY) throws com.google.zxing.NotFoundException
+ private static BitMatrix sampleGrid(BitMatrix image, ResultPoint topLeft, ResultPoint bottomLeft, ResultPoint bottomRight, ResultPoint topRight, int dimensionX, int dimensionY)
+ {
+
+ GridSampler sampler = GridSampler.Instance;
+
+ return sampler.sampleGrid(image, dimensionX, dimensionY, 0.5f, 0.5f, dimensionX - 0.5f, 0.5f, dimensionX - 0.5f, dimensionY - 0.5f, 0.5f, dimensionY - 0.5f, topLeft.X, topLeft.Y, topRight.X, topRight.Y, bottomRight.X, bottomRight.Y, bottomLeft.X, bottomLeft.Y);
+ }
+
+ ///
+ /// Counts the number of black/white transitions between two points, using something like Bresenham's algorithm.
+ ///
+ private ResultPointsAndTransitions transitionsBetween(ResultPoint from, ResultPoint to)
+ {
+ // See QR Code Detector, sizeOfBlackWhiteBlackRun()
+ int fromX = (int) from.X;
+ int fromY = (int) from.Y;
+ int toX = (int) to.X;
+ int toY = (int) to.Y;
+ bool steep = Math.Abs(toY - fromY) > Math.Abs(toX - fromX);
+ if (steep)
+ {
+ int temp = fromX;
+ fromX = fromY;
+ fromY = temp;
+ temp = toX;
+ toX = toY;
+ toY = temp;
+ }
+
+ int dx = Math.Abs(toX - fromX);
+ int dy = Math.Abs(toY - fromY);
+ int error = -dx >> 1;
+ int ystep = fromY < toY ? 1 : -1;
+ int xstep = fromX < toX ? 1 : -1;
+ int transitions = 0;
+ bool inBlack = image.get(steep ? fromY : fromX, steep ? fromX : fromY);
+ for (int x = fromX, y = fromY; x != toX; x += xstep)
+ {
+ bool isBlack = image.get(steep ? y : x, steep ? x : y);
+ if (isBlack != inBlack)
+ {
+ transitions++;
+ inBlack = isBlack;
+ }
+ error += dy;
+ if (error > 0)
+ {
+ if (y == toY)
{
- return ((ResultPointsAndTransitions) o1).Transitions - ((ResultPointsAndTransitions) o2).Transitions;
+ break;
+ }
+ y += ystep;
+ error -= dx;
+ }
+ }
+ return new ResultPointsAndTransitions(from, to, transitions);
+ }
+
+ ///
+ /// Simply encapsulates two points and a number of transitions between them.
+ ///
+ private sealed class ResultPointsAndTransitions
+ {
+
+ private readonly ResultPoint from;
+ private readonly ResultPoint to;
+ private readonly int transitions;
+
+ internal ResultPointsAndTransitions(ResultPoint from, ResultPoint to, int transitions)
+ {
+ this.from = from;
+ this.to = to;
+ this.transitions = transitions;
+ }
+
+ internal ResultPoint From
+ {
+ get
+ {
+ return from;
}
}
+
+ internal ResultPoint To
+ {
+ get
+ {
+ return to;
+ }
+ }
+
+ public int Transitions
+ {
+ get
+ {
+ return transitions;
+ }
+ }
+
+ public override string ToString()
+ {
+ return from + "/" + to + '/' + transitions;
+ }
+ }
+
+ ///
+ /// Orders ResultPointsAndTransitions by number of transitions, ascending.
+ ///
+ [Serializable]
+ private sealed class ResultPointsAndTransitionsComparator : IComparer
+ {
+ public int Compare(ResultPointsAndTransitions o1, ResultPointsAndTransitions o2)
+ {
+ return o1.Transitions - o2.Transitions;
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/multi/ByQuadrantReader.cs b/csharp/multi/ByQuadrantReader.cs
index 47a69c0a3..2ee769296 100755
--- a/csharp/multi/ByQuadrantReader.cs
+++ b/csharp/multi/ByQuadrantReader.cs
@@ -1,103 +1,119 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using BinaryBitmap = com.google.zxing.BinaryBitmap;
-using Reader = com.google.zxing.Reader;
-using ReaderException = com.google.zxing.ReaderException;
-using Result = com.google.zxing.Result;
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.multi
{
-
- /// This class attempts to decode a barcode from an image, not by scanning the whole image,
+
+ using BinaryBitmap = com.google.zxing.BinaryBitmap;
+ using ChecksumException = com.google.zxing.ChecksumException;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using FormatException = com.google.zxing.FormatException;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using Reader = com.google.zxing.Reader;
+ using Result = com.google.zxing.Result;
+
+
+ ///
+ /// This class attempts to decode a barcode from an image, not by scanning the whole image,
/// but by scanning subsets of the image. This is important when there may be multiple barcodes in
/// an image, and detecting a barcode may find parts of multiple barcode and fail to decode
/// (e.g. QR Codes). Instead this scans the four quadrants of the image -- and also the center
/// 'quadrant' to cover the case where a barcode is found in the center.
- ///
///
- ///
- ///
- public sealed class ByQuadrantReader : Reader
+ ///
+ public sealed class ByQuadrantReader : com.google.zxing.Reader
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'delegate '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private Reader delegate_Renamed;
-
- public ByQuadrantReader(Reader delegate_Renamed)
+
+ private readonly Reader @delegate;
+
+ public ByQuadrantReader(Reader @delegate)
+ {
+ this.@delegate = @delegate;
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decode(com.google.zxing.BinaryBitmap image) throws com.google.zxing.NotFoundException, com.google.zxing.ChecksumException, com.google.zxing.FormatException
+ public Result decode(BinaryBitmap image)
+ {
+ return decode(image, null);
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decode(com.google.zxing.BinaryBitmap image, java.util.Map hints) throws com.google.zxing.NotFoundException, com.google.zxing.ChecksumException, com.google.zxing.FormatException
+ public Result decode(BinaryBitmap image, IDictionary hints)
+ {
+
+ int width = image.Width;
+ int height = image.Height;
+ int halfWidth = width / 2;
+ int halfHeight = height / 2;
+
+ BinaryBitmap topLeft = image.crop(0, 0, halfWidth, halfHeight);
+ try
{
- this.delegate_Renamed = delegate_Renamed;
+ return @delegate.decode(topLeft, hints);
}
-
- public Result decode(BinaryBitmap image)
+ catch (NotFoundException re)
{
- return decode(image, null);
+ // continue
}
-
- public Result decode(BinaryBitmap image, System.Collections.Hashtable hints)
+
+ BinaryBitmap topRight = image.crop(halfWidth, 0, halfWidth, halfHeight);
+ try
{
-
- int width = image.Width;
- int height = image.Height;
- int halfWidth = width / 2;
- int halfHeight = height / 2;
-
- BinaryBitmap topLeft = image.crop(0, 0, halfWidth, halfHeight);
- try
- {
- return delegate_Renamed.decode(topLeft, hints);
- }
- catch (ReaderException)
- {
- // continue
- }
-
- BinaryBitmap topRight = image.crop(halfWidth, 0, halfWidth, halfHeight);
- try
- {
- return delegate_Renamed.decode(topRight, hints);
- }
- catch (ReaderException)
- {
- // continue
- }
-
- BinaryBitmap bottomLeft = image.crop(0, halfHeight, halfWidth, halfHeight);
- try
- {
- return delegate_Renamed.decode(bottomLeft, hints);
- }
- catch (ReaderException)
- {
- // continue
- }
-
- BinaryBitmap bottomRight = image.crop(halfWidth, halfHeight, halfWidth, halfHeight);
- try
- {
- return delegate_Renamed.decode(bottomRight, hints);
- }
- catch (ReaderException)
- {
- // continue
- }
-
- int quarterWidth = halfWidth / 2;
- int quarterHeight = halfHeight / 2;
- BinaryBitmap center = image.crop(quarterWidth, quarterHeight, halfWidth, halfHeight);
- return delegate_Renamed.decode(center, hints);
+ return @delegate.decode(topRight, hints);
}
+ catch (NotFoundException re)
+ {
+ // continue
+ }
+
+ BinaryBitmap bottomLeft = image.crop(0, halfHeight, halfWidth, halfHeight);
+ try
+ {
+ return @delegate.decode(bottomLeft, hints);
+ }
+ catch (NotFoundException re)
+ {
+ // continue
+ }
+
+ BinaryBitmap bottomRight = image.crop(halfWidth, halfHeight, halfWidth, halfHeight);
+ try
+ {
+ return @delegate.decode(bottomRight, hints);
+ }
+ catch (NotFoundException re)
+ {
+ // continue
+ }
+
+ int quarterWidth = halfWidth / 2;
+ int quarterHeight = halfHeight / 2;
+ BinaryBitmap center = image.crop(quarterWidth, quarterHeight, halfWidth, halfHeight);
+ return @delegate.decode(center, hints);
+ }
+
+ public void reset()
+ {
+ @delegate.reset();
+ }
+
}
-}
+
+}
\ No newline at end of file
diff --git a/csharp/multi/GenericMultipleBarcodeReader.cs b/csharp/multi/GenericMultipleBarcodeReader.cs
index 708b84fc3..bfe761feb 100755
--- a/csharp/multi/GenericMultipleBarcodeReader.cs
+++ b/csharp/multi/GenericMultipleBarcodeReader.cs
@@ -1,175 +1,174 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Reader = com.google.zxing.Reader;
-using Result = com.google.zxing.Result;
-using BinaryBitmap = com.google.zxing.BinaryBitmap;
-using ReaderException = com.google.zxing.ReaderException;
-using ResultPoint = com.google.zxing.ResultPoint;
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.multi
{
-
- /// Attempts to locate multiple barcodes in an image by repeatedly decoding portion of the image.
+
+ using BinaryBitmap = com.google.zxing.BinaryBitmap;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using Reader = com.google.zxing.Reader;
+ using ReaderException = com.google.zxing.ReaderException;
+ using Result = com.google.zxing.Result;
+ using ResultPoint = com.google.zxing.ResultPoint;
+
+
+ ///
+ /// Attempts to locate multiple barcodes in an image by repeatedly decoding portion of the image.
/// After one barcode is found, the areas left, above, right and below the barcode's
- /// {@link com.google.zxing.ResultPoint}s are scanned, recursively.
+ /// s are scanned, recursively.
///
- /// A caller may want to also employ {@link ByQuadrantReader} when attempting to find multiple
+ ///
A caller may want to also employ when attempting to find multiple
/// 2D barcodes, like QR Codes, in an image, where the presence of multiple barcodes might prevent
/// detecting any one of them.
///
- /// That is, instead of passing a {@link Reader} a caller might pass
- /// new ByQuadrantReader(reader).
+ /// That is, instead of passing a a caller might pass
+ /// {@code new ByQuadrantReader(reader)}.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
-
public sealed class GenericMultipleBarcodeReader : MultipleBarcodeReader
{
-
- private const int MIN_DIMENSION_TO_RECUR = 30;
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'delegate '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private Reader delegate_Renamed;
-
- public GenericMultipleBarcodeReader(Reader delegate_Renamed)
+
+ private const int MIN_DIMENSION_TO_RECUR = 100;
+
+ private readonly Reader @delegate;
+
+ public GenericMultipleBarcodeReader(Reader @delegate)
+ {
+ this.@delegate = @delegate;
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result[] decodeMultiple(com.google.zxing.BinaryBitmap image) throws com.google.zxing.NotFoundException
+ public Result[] decodeMultiple(BinaryBitmap image)
+ {
+ return decodeMultiple(image, null);
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result[] decodeMultiple(com.google.zxing.BinaryBitmap image, java.util.Map hints) throws com.google.zxing.NotFoundException
+ public Result[] decodeMultiple(BinaryBitmap image, IDictionary hints)
+ {
+ List results = new List();
+ doDecodeMultiple(image, hints, results, 0, 0);
+ if (results.Count == 0)
{
- this.delegate_Renamed = delegate_Renamed;
+ throw NotFoundException.NotFoundInstance;
}
-
- public Result[] decodeMultiple(BinaryBitmap image)
+ return results.ToArray();
+ }
+
+ private void doDecodeMultiple(BinaryBitmap image, IDictionary hints, IList results, int xOffset, int yOffset)
+ {
+ Result result;
+ try
{
- return decodeMultiple(image, null);
+ result = @delegate.decode(image, hints);
}
-
- public Result[] decodeMultiple(BinaryBitmap image, System.Collections.Hashtable hints)
+ catch (ReaderException re)
{
- System.Collections.ArrayList results = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10));
- doDecodeMultiple(image, hints, results, 0, 0);
- if ((results.Count == 0))
- {
- throw ReaderException.Instance;
- }
- int numResults = results.Count;
- Result[] resultArray = new Result[numResults];
- for (int i = 0; i < numResults; i++)
- {
- resultArray[i] = (Result) results[i];
- }
- return resultArray;
+ return;
}
-
- private void doDecodeMultiple(BinaryBitmap image, System.Collections.Hashtable hints, System.Collections.ArrayList results, int xOffset, int yOffset)
+ bool alreadyFound = false;
+ foreach (Result existingResult in results)
{
- Result result;
- try
- {
- result = delegate_Renamed.decode(image, hints);
- }
- catch (ReaderException)
- {
- return ;
- }
- bool alreadyFound = false;
- for (int i = 0; i < results.Count; i++)
- {
- Result existingResult = (Result) results[i];
- if (existingResult.Text.Equals(result.Text))
- {
- alreadyFound = true;
- break;
- }
- }
- if (alreadyFound)
- {
- return ;
- }
- results.Add(translateResultPoints(result, xOffset, yOffset));
- ResultPoint[] resultPoints = result.ResultPoints;
- if (resultPoints == null || resultPoints.Length == 0)
- {
- return ;
- }
- int width = image.Width;
- int height = image.Height;
- float minX = width;
- float minY = height;
- float maxX = 0.0f;
- float maxY = 0.0f;
- for (int i = 0; i < resultPoints.Length; i++)
- {
- ResultPoint point = resultPoints[i];
- float x = point.X;
- float y = point.Y;
- if (x < minX)
- {
- minX = x;
- }
- if (y < minY)
- {
- minY = y;
- }
- if (x > maxX)
- {
- maxX = x;
- }
- if (y > maxY)
- {
- maxY = y;
- }
- }
-
- // Decode left of barcode
- if (minX > MIN_DIMENSION_TO_RECUR)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- doDecodeMultiple(image.crop(0, 0, (int) minX, height), hints, results, xOffset, yOffset);
- }
- // Decode above barcode
- if (minY > MIN_DIMENSION_TO_RECUR)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- doDecodeMultiple(image.crop(0, 0, width, (int) minY), hints, results, xOffset, yOffset);
- }
- // Decode right of barcode
- if (maxX < width - MIN_DIMENSION_TO_RECUR)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- doDecodeMultiple(image.crop((int) maxX, 0, width - (int) maxX, height), hints, results, xOffset + (int) maxX, yOffset);
- }
- // Decode below barcode
- if (maxY < height - MIN_DIMENSION_TO_RECUR)
- {
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- doDecodeMultiple(image.crop(0, (int) maxY, width, height - (int) maxY), hints, results, xOffset, yOffset + (int) maxY);
- }
+ if (existingResult.Text.Equals(result.Text))
+ {
+ alreadyFound = true;
+ break;
+ }
}
-
- private static Result translateResultPoints(Result result, int xOffset, int yOffset)
+ if (!alreadyFound)
{
- ResultPoint[] oldResultPoints = result.ResultPoints;
- ResultPoint[] newResultPoints = new ResultPoint[oldResultPoints.Length];
- for (int i = 0; i < oldResultPoints.Length; i++)
- {
- ResultPoint oldPoint = oldResultPoints[i];
- newResultPoints[i] = new ResultPoint(oldPoint.X + xOffset, oldPoint.Y + yOffset);
- }
- return new Result(result.Text, result.RawBytes, newResultPoints, result.BarcodeFormat);
+ results.Add(translateResultPoints(result, xOffset, yOffset));
}
+ ResultPoint[] resultPoints = result.ResultPoints;
+ if (resultPoints == null || resultPoints.Length == 0)
+ {
+ return;
+ }
+ int width = image.Width;
+ int height = image.Height;
+ float minX = width;
+ float minY = height;
+ float maxX = 0.0f;
+ float maxY = 0.0f;
+ foreach (ResultPoint point in resultPoints)
+ {
+ float x = point.X;
+ float y = point.Y;
+ if (x < minX)
+ {
+ minX = x;
+ }
+ if (y < minY)
+ {
+ minY = y;
+ }
+ if (x > maxX)
+ {
+ maxX = x;
+ }
+ if (y > maxY)
+ {
+ maxY = y;
+ }
+ }
+
+ // Decode left of barcode
+ if (minX > MIN_DIMENSION_TO_RECUR)
+ {
+ doDecodeMultiple(image.crop(0, 0, (int) minX, height), hints, results, xOffset, yOffset);
+ }
+ // Decode above barcode
+ if (minY > MIN_DIMENSION_TO_RECUR)
+ {
+ doDecodeMultiple(image.crop(0, 0, width, (int) minY), hints, results, xOffset, yOffset);
+ }
+ // Decode right of barcode
+ if (maxX < width - MIN_DIMENSION_TO_RECUR)
+ {
+ doDecodeMultiple(image.crop((int) maxX, 0, width - (int) maxX, height), hints, results, xOffset + (int) maxX, yOffset);
+ }
+ // Decode below barcode
+ if (maxY < height - MIN_DIMENSION_TO_RECUR)
+ {
+ doDecodeMultiple(image.crop(0, (int) maxY, width, height - (int) maxY), hints, results, xOffset, yOffset + (int) maxY);
+ }
+ }
+
+ private static Result translateResultPoints(Result result, int xOffset, int yOffset)
+ {
+ ResultPoint[] oldResultPoints = result.ResultPoints;
+ if (oldResultPoints == null)
+ {
+ return result;
+ }
+ ResultPoint[] newResultPoints = new ResultPoint[oldResultPoints.Length];
+ for (int i = 0; i < oldResultPoints.Length; i++)
+ {
+ ResultPoint oldPoint = oldResultPoints[i];
+ newResultPoints[i] = new ResultPoint(oldPoint.X + xOffset, oldPoint.Y + yOffset);
+ }
+ return new Result(result.Text, result.RawBytes, newResultPoints, result.BarcodeFormat);
+ }
+
}
-}
+
+}
\ No newline at end of file
diff --git a/csharp/multi/MultipleBarcodeReader.cs b/csharp/multi/MultipleBarcodeReader.cs
index 3a0dcba5b..652fe6cc3 100755
--- a/csharp/multi/MultipleBarcodeReader.cs
+++ b/csharp/multi/MultipleBarcodeReader.cs
@@ -1,40 +1,46 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using Result = com.google.zxing.Result;
-using BinaryBitmap = com.google.zxing.BinaryBitmap;
-using ReaderException = com.google.zxing.ReaderException;
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.multi
{
-
- /// Implementation of this interface attempt to read several barcodes from one image.
- ///
- ///
- ///
- ///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
+ using BinaryBitmap = com.google.zxing.BinaryBitmap;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using Result = com.google.zxing.Result;
+
+
+ ///
+ /// Implementation of this interface attempt to read several barcodes from one image.
+ ///
+ ///
public interface MultipleBarcodeReader
{
-
- Result[] decodeMultiple(BinaryBitmap image);
-
- Result[] decodeMultiple(BinaryBitmap image, System.Collections.Hashtable hints);
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: com.google.zxing.Result[] decodeMultiple(com.google.zxing.BinaryBitmap image) throws com.google.zxing.NotFoundException;
+ Result[] decodeMultiple(BinaryBitmap image);
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: com.google.zxing.Result[] decodeMultiple(com.google.zxing.BinaryBitmap image, java.util.Map hints) throws com.google.zxing.NotFoundException;
+ Result[] decodeMultiple(BinaryBitmap image, IDictionary hints);
+
}
+
}
\ No newline at end of file
diff --git a/csharp/multi/qrcode/QRCodeMultiReader.cs b/csharp/multi/qrcode/QRCodeMultiReader.cs
index e27f3657d..01757ac44 100755
--- a/csharp/multi/qrcode/QRCodeMultiReader.cs
+++ b/csharp/multi/qrcode/QRCodeMultiReader.cs
@@ -1,93 +1,97 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using BinaryBitmap = com.google.zxing.BinaryBitmap;
-using ReaderException = com.google.zxing.ReaderException;
-using Result = com.google.zxing.Result;
-using ResultMetadataType = com.google.zxing.ResultMetadataType;
-using ResultPoint = com.google.zxing.ResultPoint;
-using DecoderResult = com.google.zxing.common.DecoderResult;
-using DetectorResult = com.google.zxing.common.DetectorResult;
-using MultipleBarcodeReader = com.google.zxing.multi.MultipleBarcodeReader;
-using MultiDetector = com.google.zxing.multi.qrcode.detector.MultiDetector;
-using QRCodeReader = com.google.zxing.qrcode.QRCodeReader;
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.multi.qrcode
{
-
- /// This implementation can detect and decode multiple QR Codes in an image.
- ///
- ///
- /// Sean Owen
- ///
- /// Hannes Erven
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class QRCodeMultiReader:QRCodeReader, MultipleBarcodeReader
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using BinaryBitmap = com.google.zxing.BinaryBitmap;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using ReaderException = com.google.zxing.ReaderException;
+ using Result = com.google.zxing.Result;
+ using ResultMetadataType = com.google.zxing.ResultMetadataType;
+ using ResultPoint = com.google.zxing.ResultPoint;
+ using DecoderResult = com.google.zxing.common.DecoderResult;
+ using DetectorResult = com.google.zxing.common.DetectorResult;
+ using MultipleBarcodeReader = com.google.zxing.multi.MultipleBarcodeReader;
+ using MultiDetector = com.google.zxing.multi.qrcode.detector.MultiDetector;
+ using QRCodeReader = com.google.zxing.qrcode.QRCodeReader;
+
+
+ ///
+ /// This implementation can detect and decode multiple QR Codes in an image.
+ ///
+ /// @author Sean Owen
+ /// @author Hannes Erven
+ ///
+ public sealed class QRCodeMultiReader : com.google.zxing.qrcode.QRCodeReader, com.google.zxing.multi.MultipleBarcodeReader
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'EMPTY_RESULT_ARRAY '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly Result[] EMPTY_RESULT_ARRAY = new Result[0];
-
- public Result[] decodeMultiple(BinaryBitmap image)
+
+ private static readonly Result[] EMPTY_RESULT_ARRAY = new Result[0];
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result[] decodeMultiple(com.google.zxing.BinaryBitmap image) throws com.google.zxing.NotFoundException
+ public Result[] decodeMultiple(BinaryBitmap image)
+ {
+ return decodeMultiple(image, null);
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result[] decodeMultiple(com.google.zxing.BinaryBitmap image, java.util.Map hints) throws com.google.zxing.NotFoundException
+ public Result[] decodeMultiple(BinaryBitmap image, IDictionary hints)
+ {
+ List results = new List();
+ DetectorResult[] detectorResults = (new MultiDetector(image.BlackMatrix)).detectMulti(hints);
+ foreach (DetectorResult detectorResult in detectorResults)
{
- return decodeMultiple(image, null);
+ try
+ {
+ DecoderResult decoderResult = Decoder.decode(detectorResult.Bits, hints);
+ ResultPoint[] points = detectorResult.Points;
+ Result result = new Result(decoderResult.Text, decoderResult.RawBytes, points, BarcodeFormat.QR_CODE);
+ IList byteSegments = decoderResult.ByteSegments;
+ if (byteSegments != null)
+ {
+ result.putMetadata(ResultMetadataType.BYTE_SEGMENTS, byteSegments);
+ }
+ string ecLevel = decoderResult.ECLevel;
+ if (ecLevel != null)
+ {
+ result.putMetadata(ResultMetadataType.ERROR_CORRECTION_LEVEL, ecLevel);
+ }
+ results.Add(result);
+ }
+ catch (ReaderException re)
+ {
+ // ignore and continue
+ }
}
-
- public Result[] decodeMultiple(BinaryBitmap image, System.Collections.Hashtable hints)
+ if (results.Count == 0)
{
- System.Collections.ArrayList results = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10));
- DetectorResult[] detectorResult = new MultiDetector(image.BlackMatrix).detectMulti(hints);
- for (int i = 0; i < detectorResult.Length; i++)
- {
- try
- {
- DecoderResult decoderResult = Decoder.decode(detectorResult[i].Bits);
- ResultPoint[] points = detectorResult[i].Points;
- Result result = new Result(decoderResult.Text, decoderResult.RawBytes, points, BarcodeFormat.QR_CODE);
- if (decoderResult.ByteSegments != null)
- {
- result.putMetadata(ResultMetadataType.BYTE_SEGMENTS, decoderResult.ByteSegments);
- }
- if (decoderResult.ECLevel != null)
- {
- result.putMetadata(ResultMetadataType.ERROR_CORRECTION_LEVEL, decoderResult.ECLevel.ToString());
- }
- results.Add(result);
- }
- catch (ReaderException)
- {
- // ignore and continue
- }
- }
- if ((results.Count == 0))
- {
- return EMPTY_RESULT_ARRAY;
- }
- else
- {
- Result[] resultArray = new Result[results.Count];
- for (int i = 0; i < results.Count; i++)
- {
- resultArray[i] = (Result) results[i];
- }
- return resultArray;
- }
+ return EMPTY_RESULT_ARRAY;
}
+ else
+ {
+ return results.ToArray();
+ }
+ }
+
}
-}
+
+}
\ No newline at end of file
diff --git a/csharp/multi/qrcode/detector/MultiDetector.cs b/csharp/multi/qrcode/detector/MultiDetector.cs
index 8a7ac856f..eadcc1024 100755
--- a/csharp/multi/qrcode/detector/MultiDetector.cs
+++ b/csharp/multi/qrcode/detector/MultiDetector.cs
@@ -1,84 +1,92 @@
+using System.Collections.Generic;
+
/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using ReaderException = com.google.zxing.ReaderException;
-using DetectorResult = com.google.zxing.common.DetectorResult;
-using BitMatrix = com.google.zxing.common.BitMatrix;
-using Detector = com.google.zxing.qrcode.detector.Detector;
-using FinderPatternInfo = com.google.zxing.qrcode.detector.FinderPatternInfo;
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.multi.qrcode.detector
{
-
- /// Encapsulates logic that can detect one or more QR Codes in an image, even if the QR Code
+
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using ReaderException = com.google.zxing.ReaderException;
+ using ResultPointCallback = com.google.zxing.ResultPointCallback;
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+ using DetectorResult = com.google.zxing.common.DetectorResult;
+ using Detector = com.google.zxing.qrcode.detector.Detector;
+ using FinderPatternInfo = com.google.zxing.qrcode.detector.FinderPatternInfo;
+
+
+ ///
+ /// Encapsulates logic that can detect one or more QR Codes in an image, even if the QR Code
/// is rotated or skewed, or partially obscured.
///
+ /// @author Sean Owen
+ /// @author Hannes Erven
///
- /// Sean Owen
- ///
- /// Hannes Erven
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
-
- public sealed class MultiDetector:Detector
+ public sealed class MultiDetector : com.google.zxing.qrcode.detector.Detector
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'EMPTY_DETECTOR_RESULTS '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly DetectorResult[] EMPTY_DETECTOR_RESULTS = new DetectorResult[0];
-
- public MultiDetector(BitMatrix image):base(image)
+
+ private static readonly DetectorResult[] EMPTY_DETECTOR_RESULTS = new DetectorResult[0];
+
+ public MultiDetector(BitMatrix image) : base(image)
+ {
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.common.DetectorResult[] detectMulti(java.util.Map hints) throws com.google.zxing.NotFoundException
+ public DetectorResult[] detectMulti(IDictionary hints)
+ {
+ BitMatrix image = Image;
+ //ResultPointCallback resultPointCallback = hints == null ? null : (ResultPointCallback) hints[DecodeHintType.NEED_RESULT_POINT_CALLBACK];
+ ResultPointCallback resultPointCallback = null;
+ if (hints !=null && hints.ContainsKey(DecodeHintType.NEED_RESULT_POINT_CALLBACK))
+ {
+ resultPointCallback = (ResultPointCallback) hints[DecodeHintType.NEED_RESULT_POINT_CALLBACK];
+ }
+
+ MultiFinderPatternFinder finder = new MultiFinderPatternFinder(image, resultPointCallback);
+ FinderPatternInfo[] infos = finder.findMulti(hints);
+
+ if (infos.Length == 0)
{
+ throw NotFoundException.NotFoundInstance;
}
-
- public DetectorResult[] detectMulti(System.Collections.Hashtable hints)
+
+ List result = new List();
+ foreach (FinderPatternInfo info in infos)
{
- BitMatrix image = Image;
- MultiFinderPatternFinder finder = new MultiFinderPatternFinder(image);
- FinderPatternInfo[] info = finder.findMulti(hints);
-
- if (info == null || info.Length == 0)
- {
- throw ReaderException.Instance;
- }
-
- System.Collections.ArrayList result = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10));
- for (int i = 0; i < info.Length; i++)
- {
- try
- {
- result.Add(processFinderPatternInfo(info[i]));
- }
- catch (ReaderException)
- {
- // ignore
- }
- }
- if ((result.Count == 0))
- {
- return EMPTY_DETECTOR_RESULTS;
- }
- else
- {
- DetectorResult[] resultArray = new DetectorResult[result.Count];
- for (int i = 0; i < result.Count; i++)
- {
- resultArray[i] = (DetectorResult) result[i];
- }
- return resultArray;
- }
+ try
+ {
+ result.Add(processFinderPatternInfo(info));
+ }
+ catch (ReaderException e)
+ {
+ // ignore
+ }
}
+ if (result.Count == 0)
+ {
+ return EMPTY_DETECTOR_RESULTS;
+ }
+ else
+ {
+ return result.ToArray();
+ }
+ }
+
}
-}
+
+}
\ No newline at end of file
diff --git a/csharp/multi/qrcode/detector/MultiFinderPatternFinder.cs b/csharp/multi/qrcode/detector/MultiFinderPatternFinder.cs
index 7766b19b6..9bf709c5a 100755
--- a/csharp/multi/qrcode/detector/MultiFinderPatternFinder.cs
+++ b/csharp/multi/qrcode/detector/MultiFinderPatternFinder.cs
@@ -1,367 +1,351 @@
-/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using DecodeHintType = com.google.zxing.DecodeHintType;
-using ReaderException = com.google.zxing.ReaderException;
-using ResultPoint = com.google.zxing.ResultPoint;
-using ResultPointCallback = com.google.zxing.ResultPointCallback;
-using Collections = com.google.zxing.common.Collections;
-using Comparator = com.google.zxing.common.Comparator;
-using BitMatrix = com.google.zxing.common.BitMatrix;
-using FinderPattern = com.google.zxing.qrcode.detector.FinderPattern;
-using FinderPatternFinder = com.google.zxing.qrcode.detector.FinderPatternFinder;
-using FinderPatternInfo = com.google.zxing.qrcode.detector.FinderPatternInfo;
+using System.Collections.Generic;
+
+/*
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.multi.qrcode.detector
{
-
- /// This class attempts to find finder patterns in a QR Code. Finder patterns are the square
+
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using ResultPoint = com.google.zxing.ResultPoint;
+ using ResultPointCallback = com.google.zxing.ResultPointCallback;
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+ using FinderPattern = com.google.zxing.qrcode.detector.FinderPattern;
+ using FinderPatternFinder = com.google.zxing.qrcode.detector.FinderPatternFinder;
+ using FinderPatternInfo = com.google.zxing.qrcode.detector.FinderPatternInfo;
+
+
+ ///
+ /// This class attempts to find finder patterns in a QR Code. Finder patterns are the square
/// markers at three corners of a QR Code.
///
/// This class is thread-safe but not reentrant. Each thread must allocate its own object.
///
- ///
In contrast to {@link FinderPatternFinder}, this class will return an array of all possible
+ ///
In contrast to , this class will return an array of all possible
/// QR code locations in the image.
///
/// Use the TRY_HARDER hint to ask for a more thorough detection.
///
+ /// @author Sean Owen
+ /// @author Hannes Erven
///
- /// Sean Owen
- ///
- /// Hannes Erven
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
-
-
- sealed class MultiFinderPatternFinder:FinderPatternFinder
+ internal sealed class MultiFinderPatternFinder : com.google.zxing.qrcode.detector.FinderPatternFinder
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'EMPTY_RESULT_ARRAY '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly FinderPatternInfo[] EMPTY_RESULT_ARRAY = new FinderPatternInfo[0];
-
- // TODO MIN_MODULE_COUNT and MAX_MODULE_COUNT would be great hints to ask the user for
- // since it limits the number of regions to decode
-
- // max. legal count of modules per QR code edge (177)
- private const float MAX_MODULE_COUNT_PER_EDGE = 180;
- // min. legal count per modules per QR code edge (11)
- private const float MIN_MODULE_COUNT_PER_EDGE = 9;
-
- /// More or less arbitrary cutoff point for determining if two finder patterns might belong
- /// to the same code if they differ less than DIFF_MODSIZE_CUTOFF_PERCENT percent in their
- /// estimated modules sizes.
- ///
- private const float DIFF_MODSIZE_CUTOFF_PERCENT = 0.05f;
-
- /// More or less arbitrary cutoff point for determining if two finder patterns might belong
- /// to the same code if they differ less than DIFF_MODSIZE_CUTOFF pixels/module in their
- /// estimated modules sizes.
- ///
- private const float DIFF_MODSIZE_CUTOFF = 0.5f;
-
-
- /// A comparator that orders FinderPatterns by their estimated module size.
- private class ModuleSizeComparator : Comparator
+
+ private static readonly FinderPatternInfo[] EMPTY_RESULT_ARRAY = new FinderPatternInfo[0];
+
+ // TODO MIN_MODULE_COUNT and MAX_MODULE_COUNT would be great hints to ask the user for
+ // since it limits the number of regions to decode
+
+ // max. legal count of modules per QR code edge (177)
+ private const float MAX_MODULE_COUNT_PER_EDGE = 180;
+ // min. legal count per modules per QR code edge (11)
+ private const float MIN_MODULE_COUNT_PER_EDGE = 9;
+
+ ///
+ /// More or less arbitrary cutoff point for determining if two finder patterns might belong
+ /// to the same code if they differ less than DIFF_MODSIZE_CUTOFF_PERCENT percent in their
+ /// estimated modules sizes.
+ ///
+ private const float DIFF_MODSIZE_CUTOFF_PERCENT = 0.05f;
+
+ ///
+ /// More or less arbitrary cutoff point for determining if two finder patterns might belong
+ /// to the same code if they differ less than DIFF_MODSIZE_CUTOFF pixels/module in their
+ /// estimated modules sizes.
+ ///
+ private const float DIFF_MODSIZE_CUTOFF = 0.5f;
+
+
+ ///
+ /// A comparator that orders FinderPatterns by their estimated module size.
+ ///
+ [Serializable]
+ private sealed class ModuleSizeComparator : IComparer
+ {
+ public int Compare(FinderPattern center1, FinderPattern center2)
{
- public int compare(System.Object center1, System.Object center2)
- {
- float value_Renamed = ((FinderPattern) center2).EstimatedModuleSize - ((FinderPattern) center1).EstimatedModuleSize;
- return value_Renamed < 0.0?- 1:(value_Renamed > 0.0?1:0);
- }
+ float value = center2.EstimatedModuleSize - center1.EstimatedModuleSize;
+ return value < 0.0 ? - 1 : value > 0.0 ? 1 : 0;
}
-
- /// Creates a finder that will search the image for three finder patterns.
- ///
- ///
- /// image to search
- ///
- internal MultiFinderPatternFinder(BitMatrix image):base(image)
+ }
+
+ ///
+ /// Creates a finder that will search the image for three finder patterns.
+ ///
+ /// image to search
+ internal MultiFinderPatternFinder(BitMatrix image) : base(image)
+ {
+ }
+
+ internal MultiFinderPatternFinder(BitMatrix image, ResultPointCallback resultPointCallback) : base(image, resultPointCallback)
+ {
+ }
+
+ /// the 3 best s from our list of candidates. The "best" are
+ /// those that have been detected at least times, and whose module
+ /// size differs from the average among those patterns the least
+ /// if 3 such finder patterns do not exist
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private com.google.zxing.qrcode.detector.FinderPattern[][] selectMutipleBestPatterns() throws com.google.zxing.NotFoundException
+ private FinderPattern[][] selectMutipleBestPatterns()
+ {
+ List possibleCenters = PossibleCenters;
+ int size = possibleCenters.Count;
+
+ if (size < 3)
{
+ // Couldn't find enough finder patterns
+ throw NotFoundException.NotFoundInstance;
}
-
- internal MultiFinderPatternFinder(BitMatrix image, ResultPointCallback resultPointCallback):base(image, resultPointCallback)
+
+ /*
+ * Begin HE modifications to safely detect multiple codes of equal size
+ */
+ if (size == 3)
{
+ return new FinderPattern[][]{new FinderPattern[]{possibleCenters[0], possibleCenters[1], possibleCenters[2]}};
}
-
- /// the 3 best {@link FinderPattern}s from our list of candidates. The "best" are
- /// those that have been detected at least {@link #CENTER_QUORUM} times, and whose module
- /// size differs from the average among those patterns the least
- ///
- /// ReaderException if 3 such finder patterns do not exist
- private FinderPattern[][] selectBestPatterns()
+
+ // Sort by estimated module size to speed up the upcoming checks
+ possibleCenters.Sort(new ModuleSizeComparator());
+
+ /*
+ * Now lets start: build a list of tuples of three finder locations that
+ * - feature similar module sizes
+ * - are placed in a distance so the estimated module count is within the QR specification
+ * - have similar distance between upper left/right and left top/bottom finder patterns
+ * - form a triangle with 90° angle (checked by comparing top right/bottom left distance
+ * with pythagoras)
+ *
+ * Note: we allow each point to be used for more than one code region: this might seem
+ * counterintuitive at first, but the performance penalty is not that big. At this point,
+ * we cannot make a good quality decision whether the three finders actually represent
+ * a QR code, or are just by chance layouted so it looks like there might be a QR code there.
+ * So, if the layout seems right, lets have the decoder try to decode.
+ */
+
+ List results = new List(); // holder for the results
+
+ for (int i1 = 0; i1 < (size - 2); i1++)
{
- System.Collections.ArrayList possibleCenters = PossibleCenters;
- int size = possibleCenters.Count;
-
- if (size < 3)
+ FinderPattern p1 = possibleCenters[i1];
+ if (p1 == null)
+ {
+ continue;
+ }
+
+ for (int i2 = i1 + 1; i2 < (size - 1); i2++)
+ {
+ FinderPattern p2 = possibleCenters[i2];
+ if (p2 == null)
{
- // Couldn't find enough finder patterns
- throw ReaderException.Instance;
+ continue;
}
-
- /*
- * Begin HE modifications to safely detect multiple codes of equal size
- */
- if (size == 3)
+
+ // Compare the expected module sizes; if they are really off, skip
+ float vModSize12 = (p1.EstimatedModuleSize - p2.EstimatedModuleSize) / Math.Min(p1.EstimatedModuleSize, p2.EstimatedModuleSize);
+ float vModSize12A = Math.Abs(p1.EstimatedModuleSize - p2.EstimatedModuleSize);
+ if (vModSize12A > DIFF_MODSIZE_CUTOFF && vModSize12 >= DIFF_MODSIZE_CUTOFF_PERCENT)
{
- return new FinderPattern[][]{new FinderPattern[]{(FinderPattern) possibleCenters[0], (FinderPattern) possibleCenters[1], (FinderPattern) possibleCenters[2]}};
+ // break, since elements are ordered by the module size deviation there cannot be
+ // any more interesting elements for the given p1.
+ break;
}
-
- // Sort by estimated module size to speed up the upcoming checks
- Collections.insertionSort(possibleCenters, new ModuleSizeComparator());
-
- /*
- * Now lets start: build a list of tuples of three finder locations that
- * - feature similar module sizes
- * - are placed in a distance so the estimated module count is within the QR specification
- * - have similar distance between upper left/right and left top/bottom finder patterns
- * - form a triangle with 90° angle (checked by comparing top right/bottom left distance
- * with pythagoras)
- *
- * Note: we allow each point to be used for more than one code region: this might seem
- * counterintuitive at first, but the performance penalty is not that big. At this point,
- * we cannot make a good quality decision whether the three finders actually represent
- * a QR code, or are just by chance layouted so it looks like there might be a QR code there.
- * So, if the layout seems right, lets have the decoder try to decode.
- */
-
- System.Collections.ArrayList results = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10)); // holder for the results
-
- for (int i1 = 0; i1 < (size - 2); i1++)
+
+ for (int i3 = i2 + 1; i3 < size; i3++)
{
- FinderPattern p1 = (FinderPattern) possibleCenters[i1];
- if (p1 == null)
- {
- continue;
- }
-
- for (int i2 = i1 + 1; i2 < (size - 1); i2++)
- {
- FinderPattern p2 = (FinderPattern) possibleCenters[i2];
- if (p2 == null)
- {
- continue;
- }
-
- // Compare the expected module sizes; if they are really off, skip
- float vModSize12 = (p1.EstimatedModuleSize - p2.EstimatedModuleSize) / (System.Math.Min(p1.EstimatedModuleSize, p2.EstimatedModuleSize));
- float vModSize12A = System.Math.Abs(p1.EstimatedModuleSize - p2.EstimatedModuleSize);
- if (vModSize12A > DIFF_MODSIZE_CUTOFF && vModSize12 >= DIFF_MODSIZE_CUTOFF_PERCENT)
- {
- // break, since elements are ordered by the module size deviation there cannot be
- // any more interesting elements for the given p1.
- break;
- }
-
- for (int i3 = i2 + 1; i3 < size; i3++)
- {
- FinderPattern p3 = (FinderPattern) possibleCenters[i3];
- if (p3 == null)
- {
- continue;
- }
-
- // Compare the expected module sizes; if they are really off, skip
- float vModSize23 = (p2.EstimatedModuleSize - p3.EstimatedModuleSize) / (System.Math.Min(p2.EstimatedModuleSize, p3.EstimatedModuleSize));
- float vModSize23A = System.Math.Abs(p2.EstimatedModuleSize - p3.EstimatedModuleSize);
- if (vModSize23A > DIFF_MODSIZE_CUTOFF && vModSize23 >= DIFF_MODSIZE_CUTOFF_PERCENT)
- {
- // break, since elements are ordered by the module size deviation there cannot be
- // any more interesting elements for the given p1.
- break;
- }
-
- FinderPattern[] test = new FinderPattern[]{p1, p2, p3};
- ResultPoint.orderBestPatterns(test);
-
- // Calculate the distances: a = topleft-bottomleft, b=topleft-topright, c = diagonal
- FinderPatternInfo info = new FinderPatternInfo(test);
- float dA = ResultPoint.distance(info.TopLeft, info.BottomLeft);
- float dC = ResultPoint.distance(info.TopRight, info.BottomLeft);
- float dB = ResultPoint.distance(info.TopLeft, info.TopRight);
-
- // Check the sizes
- float estimatedModuleCount = ((dA + dB) / p1.EstimatedModuleSize) / 2;
- if (estimatedModuleCount > MAX_MODULE_COUNT_PER_EDGE || estimatedModuleCount < MIN_MODULE_COUNT_PER_EDGE)
- {
- continue;
- }
-
- // Calculate the difference of the edge lengths in percent
- float vABBC = System.Math.Abs(((dA - dB) / System.Math.Min(dA, dB)));
- if (vABBC >= 0.1f)
- {
- continue;
- }
-
- // Calculate the diagonal length by assuming a 90° angle at topleft
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- float dCpy = (float) System.Math.Sqrt(dA * dA + dB * dB);
- // Compare to the real distance in %
- float vPyC = System.Math.Abs(((dC - dCpy) / System.Math.Min(dC, dCpy)));
-
- if (vPyC >= 0.1f)
- {
- continue;
- }
-
- // All tests passed!
- results.Add(test);
- } // end iterate p3
- } // end iterate p2
- } // end iterate p1
-
- if (!(results.Count == 0))
- {
- FinderPattern[][] resultArray = new FinderPattern[results.Count][];
- for (int i = 0; i < results.Count; i++)
- {
- resultArray[i] = (FinderPattern[]) results[i];
- }
- return resultArray;
- }
-
- // Nothing found!
- throw ReaderException.Instance;
+ FinderPattern p3 = possibleCenters[i3];
+ if (p3 == null)
+ {
+ continue;
+ }
+
+ // Compare the expected module sizes; if they are really off, skip
+ float vModSize23 = (p2.EstimatedModuleSize - p3.EstimatedModuleSize) / Math.Min(p2.EstimatedModuleSize, p3.EstimatedModuleSize);
+ float vModSize23A = Math.Abs(p2.EstimatedModuleSize - p3.EstimatedModuleSize);
+ if (vModSize23A > DIFF_MODSIZE_CUTOFF && vModSize23 >= DIFF_MODSIZE_CUTOFF_PERCENT)
+ {
+ // break, since elements are ordered by the module size deviation there cannot be
+ // any more interesting elements for the given p1.
+ break;
+ }
+
+ FinderPattern[] test = {p1, p2, p3};
+ ResultPoint.orderBestPatterns(test);
+
+ // Calculate the distances: a = topleft-bottomleft, b=topleft-topright, c = diagonal
+ FinderPatternInfo info = new FinderPatternInfo(test);
+ float dA = ResultPoint.distance(info.TopLeft, info.BottomLeft);
+ float dC = ResultPoint.distance(info.TopRight, info.BottomLeft);
+ float dB = ResultPoint.distance(info.TopLeft, info.TopRight);
+
+ // Check the sizes
+ float estimatedModuleCount = (dA + dB) / (p1.EstimatedModuleSize * 2.0f);
+ if (estimatedModuleCount > MAX_MODULE_COUNT_PER_EDGE || estimatedModuleCount < MIN_MODULE_COUNT_PER_EDGE)
+ {
+ continue;
+ }
+
+ // Calculate the difference of the edge lengths in percent
+ float vABBC = Math.Abs((dA - dB) / Math.Min(dA, dB));
+ if (vABBC >= 0.1f)
+ {
+ continue;
+ }
+
+ // Calculate the diagonal length by assuming a 90° angle at topleft
+ float dCpy = (float) Math.Sqrt(dA * dA + dB * dB);
+ // Compare to the real distance in %
+ float vPyC = Math.Abs((dC - dCpy) / Math.Min(dC, dCpy));
+
+ if (vPyC >= 0.1f)
+ {
+ continue;
+ }
+
+ // All tests passed!
+ results.Add(test);
+ } // end iterate p3
+ } // end iterate p2
+ } // end iterate p1
+
+ if (results.Count > 0)
+ {
+ return results.ToArray();
}
-
- public FinderPatternInfo[] findMulti(System.Collections.Hashtable hints)
+
+ // Nothing found!
+ throw NotFoundException.NotFoundInstance;
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.qrcode.detector.FinderPatternInfo[] findMulti(java.util.Map hints) throws com.google.zxing.NotFoundException
+ public FinderPatternInfo[] findMulti(IDictionary hints)
+ {
+ bool tryHarder = hints != null && hints.ContainsKey(DecodeHintType.TRY_HARDER);
+ BitMatrix image = Image;
+ int maxI = image.Height;
+ int maxJ = image.Width;
+ // We are looking for black/white/black/white/black modules in
+ // 1:1:3:1:1 ratio; this tracks the number of such modules seen so far
+
+ // Let's assume that the maximum version QR Code we support takes up 1/4 the height of the
+ // image, and then account for the center being 3 modules in size. This gives the smallest
+ // number of pixels the center could be, so skip this often. When trying harder, look for all
+ // QR versions regardless of how dense they are.
+ int iSkip = (int)(maxI / (MAX_MODULES * 4.0f) * 3);
+ if (iSkip < MIN_SKIP || tryHarder)
{
- bool tryHarder = hints != null && hints.ContainsKey(DecodeHintType.TRY_HARDER);
- BitMatrix image = Image;
- int maxI = image.Height;
- int maxJ = image.Width;
- // We are looking for black/white/black/white/black modules in
- // 1:1:3:1:1 ratio; this tracks the number of such modules seen so far
-
- // Let's assume that the maximum version QR Code we support takes up 1/4 the height of the
- // image, and then account for the center being 3 modules in size. This gives the smallest
- // number of pixels the center could be, so skip this often. When trying harder, look for all
- // QR versions regardless of how dense they are.
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- int iSkip = (int) (maxI / (MAX_MODULES * 4.0f) * 3);
- if (iSkip < MIN_SKIP || tryHarder)
+ iSkip = MIN_SKIP;
+ }
+
+ int[] stateCount = new int[5];
+ for (int i = iSkip - 1; i < maxI; i += iSkip)
+ {
+ // Get a row of black/white values
+ stateCount[0] = 0;
+ stateCount[1] = 0;
+ stateCount[2] = 0;
+ stateCount[3] = 0;
+ stateCount[4] = 0;
+ int currentState = 0;
+ for (int j = 0; j < maxJ; j++)
+ {
+ if (image.get(j, i))
{
- iSkip = MIN_SKIP;
- }
-
- int[] stateCount = new int[5];
- for (int i = iSkip - 1; i < maxI; i += iSkip)
- {
- // Get a row of black/white values
- stateCount[0] = 0;
- stateCount[1] = 0;
- stateCount[2] = 0;
- stateCount[3] = 0;
- stateCount[4] = 0;
- int currentState = 0;
- for (int j = 0; j < maxJ; j++)
- {
- if (image.get_Renamed(j, i))
- {
- // Black pixel
- if ((currentState & 1) == 1)
- {
- // Counting white pixels
- currentState++;
- }
- stateCount[currentState]++;
- }
- else
- {
- // White pixel
- if ((currentState & 1) == 0)
- {
- // Counting black pixels
- if (currentState == 4)
- {
- // A winner?
- if (foundPatternCross(stateCount))
- {
- // Yes
- bool confirmed = handlePossibleCenter(stateCount, i, j);
- if (!confirmed)
- {
- do
- {
- // Advance to next black pixel
- j++;
- }
- while (j < maxJ && !image.get_Renamed(j, i));
- j--; // back up to that last white pixel
- }
- // Clear state to start looking again
- currentState = 0;
- stateCount[0] = 0;
- stateCount[1] = 0;
- stateCount[2] = 0;
- stateCount[3] = 0;
- stateCount[4] = 0;
- }
- else
- {
- // No, shift counts back by two
- stateCount[0] = stateCount[2];
- stateCount[1] = stateCount[3];
- stateCount[2] = stateCount[4];
- stateCount[3] = 1;
- stateCount[4] = 0;
- currentState = 3;
- }
- }
- else
- {
- stateCount[++currentState]++;
- }
- }
- else
- {
- // Counting white pixels
- stateCount[currentState]++;
- }
- }
- } // for j=...
-
- if (foundPatternCross(stateCount))
- {
- handlePossibleCenter(stateCount, i, maxJ);
- } // end if foundPatternCross
- } // for i=iSkip-1 ...
- FinderPattern[][] patternInfo = selectBestPatterns();
- System.Collections.ArrayList result = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10));
- for (int i = 0; i < patternInfo.Length; i++)
- {
- FinderPattern[] pattern = patternInfo[i];
- ResultPoint.orderBestPatterns(pattern);
- result.Add(new FinderPatternInfo(pattern));
- }
-
- if ((result.Count == 0))
- {
- return EMPTY_RESULT_ARRAY;
- }
+ // Black pixel
+ if ((currentState & 1) == 1) // Counting white pixels
+ {
+ currentState++;
+ }
+ stateCount[currentState]++;
+ } // White pixel
else
{
- FinderPatternInfo[] resultArray = new FinderPatternInfo[result.Count];
- for (int i = 0; i < result.Count; i++)
+ if ((currentState & 1) == 0) // Counting black pixels
+ {
+ if (currentState == 4) // A winner?
{
- resultArray[i] = (FinderPatternInfo) result[i];
+ if (foundPatternCross(stateCount)) // Yes
+ {
+ bool confirmed = handlePossibleCenter(stateCount, i, j);
+ if (!confirmed)
+ {
+ do // Advance to next black pixel
+ {
+ j++;
+ } while (j < maxJ && !image.get(j, i));
+ j--; // back up to that last white pixel
+ }
+ // Clear state to start looking again
+ currentState = 0;
+ stateCount[0] = 0;
+ stateCount[1] = 0;
+ stateCount[2] = 0;
+ stateCount[3] = 0;
+ stateCount[4] = 0;
+ } // No, shift counts back by two
+ else
+ {
+ stateCount[0] = stateCount[2];
+ stateCount[1] = stateCount[3];
+ stateCount[2] = stateCount[4];
+ stateCount[3] = 1;
+ stateCount[4] = 0;
+ currentState = 3;
+ }
}
- return resultArray;
+ else
+ {
+ stateCount[++currentState]++;
+ }
+ } // Counting white pixels
+ else
+ {
+ stateCount[currentState]++;
+ }
}
+ } // for j=...
+
+ if (foundPatternCross(stateCount))
+ {
+ handlePossibleCenter(stateCount, i, maxJ);
+ } // end if foundPatternCross
+ } // for i=iSkip-1 ...
+ FinderPattern[][] patternInfo = selectMutipleBestPatterns();
+ List result = new List();
+ foreach (FinderPattern[] pattern in patternInfo)
+ {
+ ResultPoint.orderBestPatterns(pattern);
+ result.Add(new FinderPatternInfo(pattern));
}
+
+ if (result.Count == 0)
+ {
+ return EMPTY_RESULT_ARRAY;
+ }
+ else
+ {
+ return result.ToArray();
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/oned/Code128Reader.cs b/csharp/oned/Code128Reader.cs
index e7dc192f3..ac273a988 100755
--- a/csharp/oned/Code128Reader.cs
+++ b/csharp/oned/Code128Reader.cs
@@ -1,444 +1,407 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using ReaderException = com.google.zxing.ReaderException;
-using Result = com.google.zxing.Result;
-using ResultPoint = com.google.zxing.ResultPoint;
-using BitArray = com.google.zxing.common.BitArray;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.oned
{
-
- /// Decodes Code 128 barcodes.
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using ChecksumException = com.google.zxing.ChecksumException;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using FormatException = com.google.zxing.FormatException;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using Result = com.google.zxing.Result;
+ using ResultPoint = com.google.zxing.ResultPoint;
+ using BitArray = com.google.zxing.common.BitArray;
+
+
+ ///
+ /// Decodes Code 128 barcodes.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class Code128Reader:OneDReader
+ public sealed class Code128Reader : OneDReader
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'CODE_PATTERNS'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly int[][] CODE_PATTERNS = new int[][]{new int[]{2, 1, 2, 2, 2, 2}, new int[]{2, 2, 2, 1, 2, 2}, new int[]{2, 2, 2, 2, 2, 1}, new int[]{1, 2, 1, 2, 2, 3}, new int[]{1, 2, 1, 3, 2, 2}, new int[]{1, 3, 1, 2, 2, 2}, new int[]{1, 2, 2, 2, 1, 3}, new int[]{1, 2, 2, 3, 1, 2}, new int[]{1, 3, 2, 2, 1, 2}, new int[]{2, 2, 1, 2, 1, 3}, new int[]{2, 2, 1, 3, 1, 2}, new int[]{2, 3, 1, 2, 1, 2}, new int[]{1, 1, 2, 2, 3, 2}, new int[]{1, 2, 2, 1, 3, 2}, new int[]{1, 2, 2, 2, 3, 1}, new int[]{1, 1, 3, 2, 2, 2}, new int[]{1, 2, 3, 1, 2, 2}, new int[]{1, 2, 3, 2, 2, 1}, new int[]{2, 2, 3, 2, 1, 1}, new int[]{2, 2, 1, 1, 3, 2}, new int[]{2, 2, 1, 2, 3, 1}, new int[]{2, 1, 3, 2, 1, 2}, new int[]{2, 2, 3, 1, 1, 2}, new int[]{3, 1, 2, 1, 3, 1}, new int[]{3, 1, 1, 2, 2, 2}, new int[]{3, 2, 1, 1, 2, 2}, new int[]{3, 2, 1, 2, 2, 1}, new int[]{3, 1, 2, 2, 1, 2}, new int[]{3, 2, 2, 1, 1, 2}, new int[]{3, 2, 2, 2, 1, 1}, new int[]{2, 1, 2, 1, 2, 3}, new int[]{2, 1, 2, 3, 2, 1}, new int[]{2, 3, 2, 1, 2, 1}, new int[]{1, 1, 1, 3, 2, 3}, new int[]{1, 3, 1, 1, 2, 3}, new int[]{1, 3, 1, 3, 2, 1}, new int[]{1, 1, 2, 3, 1, 3}, new int[]{1, 3, 2, 1, 1, 3}, new int[]{1, 3, 2, 3, 1, 1}, new int[]{2, 1, 1, 3, 1, 3}, new int[]{2, 3, 1, 1, 1, 3}, new int[]{2, 3, 1, 3, 1, 1}, new int[]{1, 1, 2, 1, 3, 3}, new int[]{1, 1, 2, 3, 3, 1}, new int[]{1, 3, 2, 1, 3, 1}, new int[]{1, 1, 3, 1, 2, 3}, new int[]{1, 1, 3, 3, 2, 1}, new int[]{1, 3, 3, 1, 2, 1}, new int[]{3, 1, 3, 1, 2, 1}, new int[]{2, 1, 1, 3, 3, 1}, new int[]{2, 3, 1, 1, 3, 1}, new int[]{2, 1, 3, 1, 1, 3}, new int[]{2, 1, 3, 3, 1, 1}, new int[]{2, 1, 3, 1, 3, 1}, new int[]{3, 1, 1, 1, 2, 3}, new int[]{3, 1, 1, 3, 2, 1}, new int[]{3, 3, 1, 1, 2, 1}, new int[]{3, 1, 2, 1, 1, 3}, new int[]{3, 1, 2, 3, 1, 1}, new int[]{3, 3, 2, 1, 1, 1}, new int[]{3, 1, 4, 1, 1, 1}, new int[]{2, 2, 1, 4, 1, 1}, new int[]{4, 3, 1, 1, 1, 1}, new int[]{1, 1, 1, 2, 2, 4}, new int[]{1, 1, 1, 4, 2, 2}, new int[]{1, 2, 1, 1, 2, 4}, new int[]{1, 2, 1, 4, 2, 1}, new int[]{1, 4, 1, 1, 2, 2}, new
- int[]{1, 4, 1, 2, 2, 1}, new int[]{1, 1, 2, 2, 1, 4}, new int[]{1, 1, 2, 4, 1, 2}, new int[]{1, 2, 2, 1, 1, 4}, new int[]{1, 2, 2, 4, 1, 1}, new int[]{1, 4, 2, 1, 1, 2}, new int[]{1, 4, 2, 2, 1, 1}, new int[]{2, 4, 1, 2, 1, 1}, new int[]{2, 2, 1, 1, 1, 4}, new int[]{4, 1, 3, 1, 1, 1}, new int[]{2, 4, 1, 1, 1, 2}, new int[]{1, 3, 4, 1, 1, 1}, new int[]{1, 1, 1, 2, 4, 2}, new int[]{1, 2, 1, 1, 4, 2}, new int[]{1, 2, 1, 2, 4, 1}, new int[]{1, 1, 4, 2, 1, 2}, new int[]{1, 2, 4, 1, 1, 2}, new int[]{1, 2, 4, 2, 1, 1}, new int[]{4, 1, 1, 2, 1, 2}, new int[]{4, 2, 1, 1, 1, 2}, new int[]{4, 2, 1, 2, 1, 1}, new int[]{2, 1, 2, 1, 4, 1}, new int[]{2, 1, 4, 1, 2, 1}, new int[]{4, 1, 2, 1, 2, 1}, new int[]{1, 1, 1, 1, 4, 3}, new int[]{1, 1, 1, 3, 4, 1}, new int[]{1, 3, 1, 1, 4, 1}, new int[]{1, 1, 4, 1, 1, 3}, new int[]{1, 1, 4, 3, 1, 1}, new int[]{4, 1, 1, 1, 1, 3}, new int[]{4, 1, 1, 3, 1, 1}, new int[]{1, 1, 3, 1, 4, 1}, new int[]{1, 1, 4, 1, 3, 1}, new int[]{3, 1, 1, 1, 4, 1}, new int[]{4, 1, 1, 1, 3, 1}, new int[]{2, 1, 1, 4, 1, 2}, new int[]{2, 1, 1, 2, 1, 4}, new int[]{2, 1, 1, 2, 3, 2}, new int[]{2, 3, 3, 1, 1, 1, 2}};
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'MAX_AVG_VARIANCE '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- private static readonly int MAX_AVG_VARIANCE = (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.25f);
- //UPGRADE_NOTE: Final was removed from the declaration of 'MAX_INDIVIDUAL_VARIANCE '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- private static readonly int MAX_INDIVIDUAL_VARIANCE = (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.7f);
-
- private const int CODE_SHIFT = 98;
-
- private const int CODE_CODE_C = 99;
- private const int CODE_CODE_B = 100;
- private const int CODE_CODE_A = 101;
-
- private const int CODE_FNC_1 = 102;
- private const int CODE_FNC_2 = 97;
- private const int CODE_FNC_3 = 96;
- private const int CODE_FNC_4_A = 101;
- private const int CODE_FNC_4_B = 100;
-
- private const int CODE_START_A = 103;
- private const int CODE_START_B = 104;
- private const int CODE_START_C = 105;
- private const int CODE_STOP = 106;
-
- private static int[] findStartPattern(BitArray row)
+
+ internal static readonly int[][] CODE_PATTERNS = {new int[] {2, 1, 2, 2, 2, 2}, new int[] {2, 2, 2, 1, 2, 2}, new int[] {2, 2, 2, 2, 2, 1}, new int[] {1, 2, 1, 2, 2, 3}, new int[] {1, 2, 1, 3, 2, 2}, new int[] {1, 3, 1, 2, 2, 2}, new int[] {1, 2, 2, 2, 1, 3}, new int[] {1, 2, 2, 3, 1, 2}, new int[] {1, 3, 2, 2, 1, 2}, new int[] {2, 2, 1, 2, 1, 3}, new int[] {2, 2, 1, 3, 1, 2}, new int[] {2, 3, 1, 2, 1, 2}, new int[] {1, 1, 2, 2, 3, 2}, new int[] {1, 2, 2, 1, 3, 2}, new int[] {1, 2, 2, 2, 3, 1}, new int[] {1, 1, 3, 2, 2, 2}, new int[] {1, 2, 3, 1, 2, 2}, new int[] {1, 2, 3, 2, 2, 1}, new int[] {2, 2, 3, 2, 1, 1}, new int[] {2, 2, 1, 1, 3, 2}, new int[] {2, 2, 1, 2, 3, 1}, new int[] {2, 1, 3, 2, 1, 2}, new int[] {2, 2, 3, 1, 1, 2}, new int[] {3, 1, 2, 1, 3, 1}, new int[] {3, 1, 1, 2, 2, 2}, new int[] {3, 2, 1, 1, 2, 2}, new int[] {3, 2, 1, 2, 2, 1}, new int[] {3, 1, 2, 2, 1, 2}, new int[] {3, 2, 2, 1, 1, 2}, new int[] {3, 2, 2, 2, 1, 1}, new int[] {2, 1, 2, 1, 2, 3}, new int[] {2, 1, 2, 3, 2, 1}, new int[] {2, 3, 2, 1, 2, 1}, new int[] {1, 1, 1, 3, 2, 3}, new int[] {1, 3, 1, 1, 2, 3}, new int[] {1, 3, 1, 3, 2, 1}, new int[] {1, 1, 2, 3, 1, 3}, new int[] {1, 3, 2, 1, 1, 3}, new int[] {1, 3, 2, 3, 1, 1}, new int[] {2, 1, 1, 3, 1, 3}, new int[] {2, 3, 1, 1, 1, 3}, new int[] {2, 3, 1, 3, 1, 1}, new int[] {1, 1, 2, 1, 3, 3}, new int[] {1, 1, 2, 3, 3, 1}, new int[] {1, 3, 2, 1, 3, 1}, new int[] {1, 1, 3, 1, 2, 3}, new int[] {1, 1, 3, 3, 2, 1}, new int[] {1, 3, 3, 1, 2, 1}, new int[] {3, 1, 3, 1, 2, 1}, new int[] {2, 1, 1, 3, 3, 1}, new int[] {2, 3, 1, 1, 3, 1}, new int[] {2, 1, 3, 1, 1, 3}, new int[] {2, 1, 3, 3, 1, 1}, new int[] {2, 1, 3, 1, 3, 1}, new int[] {3, 1, 1, 1, 2, 3}, new int[] {3, 1, 1, 3, 2, 1}, new int[] {3, 3, 1, 1, 2, 1}, new int[] {3, 1, 2, 1, 1, 3}, new int[] {3, 1, 2, 3, 1, 1}, new int[] {3, 3, 2, 1, 1, 1}, new int[] {3, 1, 4, 1, 1, 1}, new int[] {2, 2, 1, 4, 1, 1}, new int[] {4, 3, 1, 1, 1, 1}, new int[] {1, 1, 1, 2, 2, 4}, new int[] {1, 1, 1, 4, 2, 2}, new int[] {1, 2, 1, 1, 2, 4}, new int[] {1, 2, 1, 4, 2, 1}, new int[] {1, 4, 1, 1, 2, 2}, new int[] {1, 4, 1, 2, 2, 1}, new int[] {1, 1, 2, 2, 1, 4}, new int[] {1, 1, 2, 4, 1, 2}, new int[] {1, 2, 2, 1, 1, 4}, new int[] {1, 2, 2, 4, 1, 1}, new int[] {1, 4, 2, 1, 1, 2}, new int[] {1, 4, 2, 2, 1, 1}, new int[] {2, 4, 1, 2, 1, 1}, new int[] {2, 2, 1, 1, 1, 4}, new int[] {4, 1, 3, 1, 1, 1}, new int[] {2, 4, 1, 1, 1, 2}, new int[] {1, 3, 4, 1, 1, 1}, new int[] {1, 1, 1, 2, 4, 2}, new int[] {1, 2, 1, 1, 4, 2}, new int[] {1, 2, 1, 2, 4, 1}, new int[] {1, 1, 4, 2, 1, 2}, new int[] {1, 2, 4, 1, 1, 2}, new int[] {1, 2, 4, 2, 1, 1}, new int[] {4, 1, 1, 2, 1, 2}, new int[] {4, 2, 1, 1, 1, 2}, new int[] {4, 2, 1, 2, 1, 1}, new int[] {2, 1, 2, 1, 4, 1}, new int[] {2, 1, 4, 1, 2, 1}, new int[] {4, 1, 2, 1, 2, 1}, new int[] {1, 1, 1, 1, 4, 3}, new int[] {1, 1, 1, 3, 4, 1}, new int[] {1, 3, 1, 1, 4, 1}, new int[] {1, 1, 4, 1, 1, 3}, new int[] {1, 1, 4, 3, 1, 1}, new int[] {4, 1, 1, 1, 1, 3}, new int[] {4, 1, 1, 3, 1, 1}, new int[] {1, 1, 3, 1, 4, 1}, new int[] {1, 1, 4, 1, 3, 1}, new int[] {3, 1, 1, 1, 4, 1}, new int[] {4, 1, 1, 1, 3, 1}, new int[] {2, 1, 1, 4, 1, 2}, new int[] {2, 1, 1, 2, 1, 4}, new int[] {2, 1, 1, 2, 3, 2}, new int[] {2, 3, 3, 1, 1, 1, 2}};
+
+ private static readonly int MAX_AVG_VARIANCE = (int)(PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.25f);
+ private static readonly int MAX_INDIVIDUAL_VARIANCE = (int)(PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.7f);
+
+ private const int CODE_SHIFT = 98;
+
+ private const int CODE_CODE_C = 99;
+ private const int CODE_CODE_B = 100;
+ private const int CODE_CODE_A = 101;
+
+ private const int CODE_FNC_1 = 102;
+ private const int CODE_FNC_2 = 97;
+ private const int CODE_FNC_3 = 96;
+ private const int CODE_FNC_4_A = 101;
+ private const int CODE_FNC_4_B = 100;
+
+ private const int CODE_START_A = 103;
+ private const int CODE_START_B = 104;
+ private const int CODE_START_C = 105;
+ private const int CODE_STOP = 106;
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static int[] findStartPattern(com.google.zxing.common.BitArray row) throws com.google.zxing.NotFoundException
+ private static int[] findStartPattern(BitArray row)
+ {
+ int width = row.Size;
+ int rowOffset = row.getNextSet(0);
+
+ int counterPosition = 0;
+ int[] counters = new int[6];
+ int patternStart = rowOffset;
+ bool isWhite = false;
+ int patternLength = counters.Length;
+
+ for (int i = rowOffset; i < width; i++)
{
- int width = row.Size;
- int rowOffset = 0;
- while (rowOffset < width)
+ if (row.get(i) ^ isWhite)
+ {
+ counters[counterPosition]++;
+ }
+ else
+ {
+ if (counterPosition == patternLength - 1)
{
- if (row.get_Renamed(rowOffset))
- {
- break;
- }
- rowOffset++;
- }
-
- int counterPosition = 0;
- int[] counters = new int[6];
- int patternStart = rowOffset;
- bool isWhite = false;
- int patternLength = counters.Length;
-
- for (int i = rowOffset; i < width; i++)
- {
- bool pixel = row.get_Renamed(i);
- if (pixel ^ isWhite)
- {
- counters[counterPosition]++;
- }
- else
- {
- if (counterPosition == patternLength - 1)
- {
- int bestVariance = MAX_AVG_VARIANCE;
- int bestMatch = - 1;
- for (int startCode = CODE_START_A; startCode <= CODE_START_C; startCode++)
- {
- int variance = patternMatchVariance(counters, CODE_PATTERNS[startCode], MAX_INDIVIDUAL_VARIANCE);
- if (variance < bestVariance)
- {
- bestVariance = variance;
- bestMatch = startCode;
- }
- }
- if (bestMatch >= 0)
- {
- // Look for whitespace before start pattern, >= 50% of width of start pattern
- if (row.isRange(System.Math.Max(0, patternStart - (i - patternStart) / 2), patternStart, false))
- {
- return new int[]{patternStart, i, bestMatch};
- }
- }
- patternStart += counters[0] + counters[1];
- for (int y = 2; y < patternLength; y++)
- {
- counters[y - 2] = counters[y];
- }
- counters[patternLength - 2] = 0;
- counters[patternLength - 1] = 0;
- counterPosition--;
- }
- else
- {
- counterPosition++;
- }
- counters[counterPosition] = 1;
- isWhite = !isWhite;
- }
- }
- throw ReaderException.Instance;
- }
-
- private static int decodeCode(BitArray row, int[] counters, int rowOffset)
- {
- recordPattern(row, rowOffset, counters);
- int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept
- int bestMatch = - 1;
- for (int d = 0; d < CODE_PATTERNS.Length; d++)
- {
- int[] pattern = CODE_PATTERNS[d];
- int variance = patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE);
+ int bestVariance = MAX_AVG_VARIANCE;
+ int bestMatch = -1;
+ for (int startCode = CODE_START_A; startCode <= CODE_START_C; startCode++)
+ {
+ int variance = patternMatchVariance(counters, CODE_PATTERNS[startCode], MAX_INDIVIDUAL_VARIANCE);
if (variance < bestVariance)
{
- bestVariance = variance;
- bestMatch = d;
+ bestVariance = variance;
+ bestMatch = startCode;
}
- }
- // TODO We're overlooking the fact that the STOP pattern has 7 values, not 6.
- if (bestMatch >= 0)
- {
- return bestMatch;
+ }
+ // Look for whitespace before start pattern, >= 50% of width of start pattern
+ if (bestMatch >= 0 && row.isRange(Math.Max(0, patternStart - (i - patternStart) / 2), patternStart, false))
+ {
+ return new int[]{patternStart, i, bestMatch};
+ }
+ patternStart += counters[0] + counters[1];
+ Array.Copy(counters, 2, counters, 0, patternLength - 2);
+ counters[patternLength - 2] = 0;
+ counters[patternLength - 1] = 0;
+ counterPosition--;
}
else
{
- throw ReaderException.Instance;
+ counterPosition++;
}
+ counters[counterPosition] = 1;
+ isWhite = !isWhite;
+ }
}
-
- public override Result decodeRow(int rowNumber, BitArray row, System.Collections.Hashtable hints)
+ throw NotFoundException.NotFoundInstance;
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static int decodeCode(com.google.zxing.common.BitArray row, int[] counters, int rowOffset) throws com.google.zxing.NotFoundException
+ private static int decodeCode(BitArray row, int[] counters, int rowOffset)
+ {
+ recordPattern(row, rowOffset, counters);
+ int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept
+ int bestMatch = -1;
+ for (int d = 0; d < CODE_PATTERNS.Length; d++)
{
-
- int[] startPatternInfo = findStartPattern(row);
- int startCode = startPatternInfo[2];
- int codeSet;
- switch (startCode)
- {
-
- case CODE_START_A:
- codeSet = CODE_CODE_A;
- break;
-
- case CODE_START_B:
- codeSet = CODE_CODE_B;
- break;
-
- case CODE_START_C:
- codeSet = CODE_CODE_C;
- break;
-
- default:
- throw ReaderException.Instance;
-
- }
-
- bool done = false;
- bool isNextShifted = false;
-
- System.Text.StringBuilder result = new System.Text.StringBuilder(20);
- int lastStart = startPatternInfo[0];
- int nextStart = startPatternInfo[1];
- int[] counters = new int[6];
-
- int lastCode = 0;
- int code = 0;
- int checksumTotal = startCode;
- int multiplier = 0;
- bool lastCharacterWasPrintable = true;
-
- while (!done)
- {
-
- bool unshift = isNextShifted;
- isNextShifted = false;
-
- // Save off last code
- lastCode = code;
-
- // Decode another code from image
- code = decodeCode(row, counters, nextStart);
-
- // Remember whether the last code was printable or not (excluding CODE_STOP)
+ int[] pattern = CODE_PATTERNS[d];
+ int variance = patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE);
+ if (variance < bestVariance)
+ {
+ bestVariance = variance;
+ bestMatch = d;
+ }
+ }
+ // TODO We're overlooking the fact that the STOP pattern has 7 values, not 6.
+ if (bestMatch >= 0)
+ {
+ return bestMatch;
+ }
+ else
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decodeRow(int rowNumber, com.google.zxing.common.BitArray row, java.util.Map hints) throws com.google.zxing.NotFoundException, com.google.zxing.FormatException, com.google.zxing.ChecksumException
+ public override Result decodeRow(int rowNumber, BitArray row, IDictionary hints)
+ {
+
+ int[] startPatternInfo = findStartPattern(row);
+ int startCode = startPatternInfo[2];
+ int codeSet;
+ switch (startCode)
+ {
+ case CODE_START_A:
+ codeSet = CODE_CODE_A;
+ break;
+ case CODE_START_B:
+ codeSet = CODE_CODE_B;
+ break;
+ case CODE_START_C:
+ codeSet = CODE_CODE_C;
+ break;
+ default:
+ throw FormatException.FormatInstance;
+ }
+
+ bool done = false;
+ bool isNextShifted = false;
+
+ StringBuilder result = new StringBuilder(20);
+ IList rawCodes = new List(20);
+
+ int lastStart = startPatternInfo[0];
+ int nextStart = startPatternInfo[1];
+ int[] counters = new int[6];
+
+ int lastCode = 0;
+ int code = 0;
+ int checksumTotal = startCode;
+ int multiplier = 0;
+ bool lastCharacterWasPrintable = true;
+
+ while (!done)
+ {
+
+ bool unshift = isNextShifted;
+ isNextShifted = false;
+
+ // Save off last code
+ lastCode = code;
+
+ // Decode another code from image
+ code = decodeCode(row, counters, nextStart);
+
+ rawCodes.Add((sbyte) code);
+
+ // Remember whether the last code was printable or not (excluding CODE_STOP)
+ if (code != CODE_STOP)
+ {
+ lastCharacterWasPrintable = true;
+ }
+
+ // Add to checksum computation (if not CODE_STOP of course)
+ if (code != CODE_STOP)
+ {
+ multiplier++;
+ checksumTotal += multiplier * code;
+ }
+
+ // Advance to where the next code will to start
+ lastStart = nextStart;
+ foreach (int counter in counters)
+ {
+ nextStart += counter;
+ }
+
+ // Take care of illegal start codes
+ switch (code)
+ {
+ case CODE_START_A:
+ case CODE_START_B:
+ case CODE_START_C:
+ throw FormatException.FormatInstance;
+ }
+
+ switch (codeSet)
+ {
+
+ case CODE_CODE_A:
+ if (code < 64)
+ {
+ result.Append((char)(' ' + code));
+ }
+ else if (code < 96)
+ {
+ result.Append((char)(code - 64));
+ }
+ else
+ {
+ // Don't let CODE_STOP, which always appears, affect whether whether we think the last
+ // code was printable or not.
if (code != CODE_STOP)
{
- lastCharacterWasPrintable = true;
+ lastCharacterWasPrintable = false;
}
-
- // Add to checksum computation (if not CODE_STOP of course)
- if (code != CODE_STOP)
- {
- multiplier++;
- checksumTotal += multiplier * code;
- }
-
- // Advance to where the next code will to start
- lastStart = nextStart;
- for (int i = 0; i < counters.Length; i++)
- {
- nextStart += counters[i];
- }
-
- // Take care of illegal start codes
switch (code)
{
-
- case CODE_START_A:
- case CODE_START_B:
- case CODE_START_C:
- throw ReaderException.Instance;
- }
-
- switch (codeSet)
- {
-
-
- case CODE_CODE_A:
- if (code < 64)
- {
- result.Append((char) (' ' + code));
- }
- else if (code < 96)
- {
- result.Append((char) (code - 64));
- }
- else
- {
- // Don't let CODE_STOP, which always appears, affect whether whether we think the last
- // code was printable or not.
- if (code != CODE_STOP)
- {
- lastCharacterWasPrintable = false;
- }
- switch (code)
- {
-
- case CODE_FNC_1:
- case CODE_FNC_2:
- case CODE_FNC_3:
- case CODE_FNC_4_A:
- // do nothing?
- break;
-
- case CODE_SHIFT:
- isNextShifted = true;
- codeSet = CODE_CODE_B;
- break;
-
- case CODE_CODE_B:
- codeSet = CODE_CODE_B;
- break;
-
- case CODE_CODE_C:
- codeSet = CODE_CODE_C;
- break;
-
- case CODE_STOP:
- done = true;
- break;
- }
- }
- break;
-
- case CODE_CODE_B:
- if (code < 96)
- {
- result.Append((char) (' ' + code));
- }
- else
- {
- if (code != CODE_STOP)
- {
- lastCharacterWasPrintable = false;
- }
- switch (code)
- {
-
- case CODE_FNC_1:
- case CODE_FNC_2:
- case CODE_FNC_3:
- case CODE_FNC_4_B:
- // do nothing?
- break;
-
- case CODE_SHIFT:
- isNextShifted = true;
- codeSet = CODE_CODE_C;
- break;
-
- case CODE_CODE_A:
- codeSet = CODE_CODE_A;
- break;
-
- case CODE_CODE_C:
- codeSet = CODE_CODE_C;
- break;
-
- case CODE_STOP:
- done = true;
- break;
- }
- }
- break;
-
- case CODE_CODE_C:
- if (code < 100)
- {
- if (code < 10)
- {
- result.Append('0');
- }
- result.Append(code);
- }
- else
- {
- if (code != CODE_STOP)
- {
- lastCharacterWasPrintable = false;
- }
- switch (code)
- {
-
- case CODE_FNC_1:
- // do nothing?
- break;
-
- case CODE_CODE_A:
- codeSet = CODE_CODE_A;
- break;
-
- case CODE_CODE_B:
- codeSet = CODE_CODE_B;
- break;
-
- case CODE_STOP:
- done = true;
- break;
- }
- }
- break;
- }
-
- // Unshift back to another code set if we were shifted
- if (unshift)
- {
- switch (codeSet)
- {
-
- case CODE_CODE_A:
- codeSet = CODE_CODE_C;
- break;
-
- case CODE_CODE_B:
- codeSet = CODE_CODE_A;
- break;
-
- case CODE_CODE_C:
- codeSet = CODE_CODE_B;
- break;
- }
+ case CODE_FNC_1:
+ case CODE_FNC_2:
+ case CODE_FNC_3:
+ case CODE_FNC_4_A:
+ // do nothing?
+ break;
+ case CODE_SHIFT:
+ isNextShifted = true;
+ codeSet = CODE_CODE_B;
+ break;
+ case CODE_CODE_B:
+ codeSet = CODE_CODE_B;
+ break;
+ case CODE_CODE_C:
+ codeSet = CODE_CODE_C;
+ break;
+ case CODE_STOP:
+ done = true;
+ break;
}
- }
-
- // Check for ample whitespace following pattern, but, to do this we first need to remember that
- // we fudged decoding CODE_STOP since it actually has 7 bars, not 6. There is a black bar left
- // to read off. Would be slightly better to properly read. Here we just skip it:
- int width = row.Size;
- while (nextStart < width && row.get_Renamed(nextStart))
- {
- nextStart++;
- }
- if (!row.isRange(nextStart, System.Math.Min(width, nextStart + (nextStart - lastStart) / 2), false))
- {
- throw ReaderException.Instance;
- }
-
- // Pull out from sum the value of the penultimate check code
- checksumTotal -= multiplier * lastCode;
- // lastCode is the checksum then:
- if (checksumTotal % 103 != lastCode)
- {
- throw ReaderException.Instance;
- }
-
- // Need to pull out the check digits from string
- int resultLength = result.Length;
- // Only bother if the result had at least one character, and if the checksum digit happened to
- // be a printable character. If it was just interpreted as a control code, nothing to remove.
- if (resultLength > 0 && lastCharacterWasPrintable)
- {
- if (codeSet == CODE_CODE_C)
+ }
+ break;
+ case CODE_CODE_B:
+ if (code < 96)
+ {
+ result.Append((char)(' ' + code));
+ }
+ else
+ {
+ if (code != CODE_STOP)
{
- result.Remove(resultLength - 2, resultLength - (resultLength - 2));
+ lastCharacterWasPrintable = false;
}
- else
+ switch (code)
{
- result.Remove(resultLength - 1, resultLength - (resultLength - 1));
+ case CODE_FNC_1:
+ case CODE_FNC_2:
+ case CODE_FNC_3:
+ case CODE_FNC_4_B:
+ // do nothing?
+ break;
+ case CODE_SHIFT:
+ isNextShifted = true;
+ codeSet = CODE_CODE_A;
+ break;
+ case CODE_CODE_A:
+ codeSet = CODE_CODE_A;
+ break;
+ case CODE_CODE_C:
+ codeSet = CODE_CODE_C;
+ break;
+ case CODE_STOP:
+ done = true;
+ break;
}
- }
-
- System.String resultString = result.ToString();
-
- if (resultString.Length == 0)
- {
- // Almost surely a false positive
- throw ReaderException.Instance;
- }
-
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- float left = (float) (startPatternInfo[1] + startPatternInfo[0]) / 2.0f;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- float right = (float) (nextStart + lastStart) / 2.0f;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- return new Result(resultString, null, new ResultPoint[]{new ResultPoint(left, (float) rowNumber), new ResultPoint(right, (float) rowNumber)}, BarcodeFormat.CODE_128);
+ }
+ break;
+ case CODE_CODE_C:
+ if (code < 100)
+ {
+ if (code < 10)
+ {
+ result.Append('0');
+ }
+ result.Append(code);
+ }
+ else
+ {
+ if (code != CODE_STOP)
+ {
+ lastCharacterWasPrintable = false;
+ }
+ switch (code)
+ {
+ case CODE_FNC_1:
+ // do nothing?
+ break;
+ case CODE_CODE_A:
+ codeSet = CODE_CODE_A;
+ break;
+ case CODE_CODE_B:
+ codeSet = CODE_CODE_B;
+ break;
+ case CODE_STOP:
+ done = true;
+ break;
+ }
+ }
+ break;
+ }
+
+ // Unshift back to another code set if we were shifted
+ if (unshift)
+ {
+ codeSet = codeSet == CODE_CODE_A ? CODE_CODE_B : CODE_CODE_A;
+ }
+
}
+
+ // Check for ample whitespace following pattern, but, to do this we first need to remember that
+ // we fudged decoding CODE_STOP since it actually has 7 bars, not 6. There is a black bar left
+ // to read off. Would be slightly better to properly read. Here we just skip it:
+ nextStart = row.getNextUnset(nextStart);
+ if (!row.isRange(nextStart, Math.Min(row.Size, nextStart + (nextStart - lastStart) / 2), false))
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ // Pull out from sum the value of the penultimate check code
+ checksumTotal -= multiplier * lastCode;
+ // lastCode is the checksum then:
+ if (checksumTotal % 103 != lastCode)
+ {
+ throw ChecksumException.ChecksumInstance;
+ }
+
+ // Need to pull out the check digits from string
+ int resultLength = result.Length;
+ if (resultLength == 0)
+ {
+ // false positive
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ // Only bother if the result had at least one character, and if the checksum digit happened to
+ // be a printable character. If it was just interpreted as a control code, nothing to remove.
+ if (resultLength > 0 && lastCharacterWasPrintable)
+ {
+ if (codeSet == CODE_CODE_C)
+ {
+ result.Remove(resultLength - 2, 2);
+ }
+ else
+ {
+ result.Remove(resultLength - 1, 1);
+ }
+ }
+
+ float left = (float)(startPatternInfo[1] + startPatternInfo[0]) / 2.0f;
+ float right = (float)(nextStart + lastStart) / 2.0f;
+
+ int rawCodesSize = rawCodes.Count;
+ sbyte[] rawBytes = new sbyte[rawCodesSize];
+ for (int i = 0; i < rawCodesSize; i++)
+ {
+ rawBytes[i] = rawCodes[i];
+ }
+
+ return new Result(result.ToString(), rawBytes, new ResultPoint[]{new ResultPoint(left, (float) rowNumber), new ResultPoint(right, (float) rowNumber)}, BarcodeFormat.CODE_128);
+
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/oned/Code39Reader.cs b/csharp/oned/Code39Reader.cs
index 3e1fc99f5..62d9bae30 100755
--- a/csharp/oned/Code39Reader.cs
+++ b/csharp/oned/Code39Reader.cs
@@ -1,392 +1,379 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using ReaderException = com.google.zxing.ReaderException;
-using Result = com.google.zxing.Result;
-using ResultPoint = com.google.zxing.ResultPoint;
-using BitArray = com.google.zxing.common.BitArray;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.oned
{
-
- /// Decodes Code 39 barcodes. This does not support "Full ASCII Code 39" yet.
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using ChecksumException = com.google.zxing.ChecksumException;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using FormatException = com.google.zxing.FormatException;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using Result = com.google.zxing.Result;
+ using ResultPoint = com.google.zxing.ResultPoint;
+ using BitArray = com.google.zxing.common.BitArray;
+ using com.google.zxing.common;
+
+
+ ///
+ /// Decodes Code 39 barcodes. This does not support "Full ASCII Code 39" yet.
///
- ///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class Code39Reader:OneDReader
+ /// @author Sean Owen
+ ///
+ public sealed class Code39Reader : OneDReader
{
-
- internal const System.String ALPHABET_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%";
- //UPGRADE_NOTE: Final was removed from the declaration of 'ALPHABET '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly char[] ALPHABET = ALPHABET_STRING.ToCharArray();
-
- /// These represent the encodings of characters, as patterns of wide and narrow bars.
- /// The 9 least-significant bits of each int correspond to the pattern of wide and narrow,
- /// with 1s representing "wide" and 0s representing narrow.
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'CHARACTER_ENCODINGS'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- internal static readonly int[] CHARACTER_ENCODINGS = new int[]{0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, 0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C, 0x04C, 0x01C, 0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007, 0x106, 0x046, 0x016, 0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0, 0x085, 0x184, 0x0C4, 0x094, 0x0A8, 0x0A2, 0x08A, 0x02A};
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'ASTERISK_ENCODING '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly int ASTERISK_ENCODING = CHARACTER_ENCODINGS[39];
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'usingCheckDigit '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private bool usingCheckDigit;
- //UPGRADE_NOTE: Final was removed from the declaration of 'extendedMode '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private bool extendedMode;
-
- /// Creates a reader that assumes all encoded data is data, and does not treat the final
- /// character as a check digit. It will not decoded "extended Code 39" sequences.
- ///
- public Code39Reader()
+
+ internal const string ALPHABET_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%";
+ private static readonly char[] ALPHABET = ALPHABET_STRING.ToCharArray();
+
+ ///
+ /// These represent the encodings of characters, as patterns of wide and narrow bars.
+ /// The 9 least-significant bits of each int correspond to the pattern of wide and narrow,
+ /// with 1s representing "wide" and 0s representing narrow.
+ ///
+ internal static readonly int[] CHARACTER_ENCODINGS = {0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, 0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C, 0x04C, 0x01C, 0x103, 0x043, 0x142, 0x013, 0x112, 0x052, 0x007, 0x106, 0x046, 0x016, 0x181, 0x0C1, 0x1C0, 0x091, 0x190, 0x0D0, 0x085, 0x184, 0x0C4, 0x094, 0x0A8, 0x0A2, 0x08A, 0x02A};
+
+ private static readonly int ASTERISK_ENCODING = CHARACTER_ENCODINGS[39];
+
+ private readonly bool usingCheckDigit;
+ private readonly bool extendedMode;
+ private readonly StringBuilder decodeRowResult;
+ private readonly int[] counters;
+
+ ///
+ /// Creates a reader that assumes all encoded data is data, and does not treat the final
+ /// character as a check digit. It will not decoded "extended Code 39" sequences.
+ ///
+ public Code39Reader() : this(false)
+ {
+ }
+
+ ///
+ /// Creates a reader that can be configured to check the last character as a check digit.
+ /// It will not decoded "extended Code 39" sequences.
+ ///
+ /// if true, treat the last data character as a check digit, not
+ /// data, and verify that the checksum passes.
+ public Code39Reader(bool usingCheckDigit) : this(usingCheckDigit, false)
+ {
+ }
+
+ ///
+ /// Creates a reader that can be configured to check the last character as a check digit,
+ /// or optionally attempt to decode "extended Code 39" sequences that are used to encode
+ /// the full ASCII character set.
+ ///
+ /// if true, treat the last data character as a check digit, not
+ /// data, and verify that the checksum passes.
+ /// if true, will attempt to decode extended Code 39 sequences in the
+ /// text.
+ public Code39Reader(bool usingCheckDigit, bool extendedMode)
+ {
+ this.usingCheckDigit = usingCheckDigit;
+ this.extendedMode = extendedMode;
+ decodeRowResult = new StringBuilder(20);
+ counters = new int[9];
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decodeRow(int rowNumber, com.google.zxing.common.BitArray row, java.util.Map hints) throws com.google.zxing.NotFoundException, com.google.zxing.ChecksumException, com.google.zxing.FormatException
+ public override Result decodeRow(int rowNumber, BitArray row, IDictionary hints)
+ {
+
+ int[] theCounters = counters;
+ theCounters.Fill(0);
+ StringBuilder result = decodeRowResult;
+ result.Length = 0;
+
+ int[] start = findAsteriskPattern(row, theCounters);
+ // Read off white space
+ int nextStart = row.getNextSet(start[1]);
+ int end = row.Size;
+
+ char decodedChar;
+ int lastStart;
+ do
{
- usingCheckDigit = false;
- extendedMode = false;
+ recordPattern(row, nextStart, theCounters);
+ int pattern = toNarrowWidePattern(theCounters);
+ if (pattern < 0)
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+ decodedChar = patternToChar(pattern);
+ result.Append(decodedChar);
+ lastStart = nextStart;
+ foreach (int counter in theCounters)
+ {
+ nextStart += counter;
+ }
+ // Read off white space
+ nextStart = row.getNextSet(nextStart);
+ } while (decodedChar != '*');
+ result.Length = result.Length - 1; // remove asterisk
+
+ // Look for whitespace after pattern:
+ int lastPatternSize = 0;
+ foreach (int counter in theCounters)
+ {
+ lastPatternSize += counter;
}
-
- /// Creates a reader that can be configured to check the last character as a check digit.
- /// It will not decoded "extended Code 39" sequences.
- ///
- ///
- /// if true, treat the last data character as a check digit, not
- /// data, and verify that the checksum passes.
- ///
- public Code39Reader(bool usingCheckDigit)
+ int whiteSpaceAfterEnd = nextStart - lastStart - lastPatternSize;
+ // If 50% of last pattern size, following last pattern, is not whitespace, fail
+ // (but if it's whitespace to the very end of the image, that's OK)
+ if (nextStart != end && (whiteSpaceAfterEnd >> 1) < lastPatternSize)
{
- this.usingCheckDigit = usingCheckDigit;
- this.extendedMode = false;
+ throw NotFoundException.NotFoundInstance;
}
-
- /// Creates a reader that can be configured to check the last character as a check digit,
- /// or optionally attempt to decode "extended Code 39" sequences that are used to encode
- /// the full ASCII character set.
- ///
- ///
- /// if true, treat the last data character as a check digit, not
- /// data, and verify that the checksum passes.
- ///
- /// if true, will attempt to decode extended Code 39 sequences in the
- /// text.
- ///
- public Code39Reader(bool usingCheckDigit, bool extendedMode)
+
+ if (usingCheckDigit)
{
- this.usingCheckDigit = usingCheckDigit;
- this.extendedMode = extendedMode;
+ int max = result.Length - 1;
+ int total = 0;
+ for (int i = 0; i < max; i++)
+ {
+ total += ALPHABET_STRING.IndexOf(decodeRowResult[i]);
+ }
+ if (result[max] != ALPHABET[total % 43])
+ {
+ throw ChecksumException.ChecksumInstance;
+ }
+ result.Length = max;
}
-
- public override Result decodeRow(int rowNumber, BitArray row, System.Collections.Hashtable hints)
+
+ if (result.Length == 0)
{
-
- int[] start = findAsteriskPattern(row);
- int nextStart = start[1];
- int end = row.Size;
-
- // Read off white space
- while (nextStart < end && !row.get_Renamed(nextStart))
- {
- nextStart++;
- }
-
- System.Text.StringBuilder result = new System.Text.StringBuilder(20);
- int[] counters = new int[9];
- char decodedChar;
- int lastStart;
- do
- {
- recordPattern(row, nextStart, counters);
- int pattern = toNarrowWidePattern(counters);
- if (pattern < 0)
- {
- throw ReaderException.Instance;
- }
- decodedChar = patternToChar(pattern);
- result.Append(decodedChar);
- lastStart = nextStart;
- for (int i = 0; i < counters.Length; i++)
- {
- nextStart += counters[i];
- }
- // Read off white space
- while (nextStart < end && !row.get_Renamed(nextStart))
- {
- nextStart++;
- }
- }
- while (decodedChar != '*');
- result.Remove(result.Length - 1, 1); // remove asterisk
-
- // Look for whitespace after pattern:
- int lastPatternSize = 0;
- for (int i = 0; i < counters.Length; i++)
- {
- lastPatternSize += counters[i];
- }
- int whiteSpaceAfterEnd = nextStart - lastStart - lastPatternSize;
- // If 50% of last pattern size, following last pattern, is not whitespace, fail
- // (but if it's whitespace to the very end of the image, that's OK)
- if (nextStart != end && whiteSpaceAfterEnd / 2 < lastPatternSize)
- {
- throw ReaderException.Instance;
- }
-
- if (usingCheckDigit)
- {
- int max = result.Length - 1;
- int total = 0;
- for (int i = 0; i < max; i++)
- {
- total += ALPHABET_STRING.IndexOf((System.Char) result[i]);
- }
- if (total % 43 != ALPHABET_STRING.IndexOf((System.Char) result[max]))
- {
- throw ReaderException.Instance;
- }
- result.Remove(max, 1);
- }
-
- System.String resultString = result.ToString();
- if (extendedMode)
- {
- resultString = decodeExtended(resultString);
- }
-
- if (resultString.Length == 0)
- {
- // Almost surely a false positive
- throw ReaderException.Instance;
- }
-
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- float left = (float) (start[1] + start[0]) / 2.0f;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- float right = (float) (nextStart + lastStart) / 2.0f;
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- return new Result(resultString, null, new ResultPoint[]{new ResultPoint(left, (float) rowNumber), new ResultPoint(right, (float) rowNumber)}, BarcodeFormat.CODE_39);
+ // false positive
+ throw NotFoundException.NotFoundInstance;
}
-
- private static int[] findAsteriskPattern(BitArray row)
+
+ string resultString;
+ if (extendedMode)
{
- int width = row.Size;
- int rowOffset = 0;
- while (rowOffset < width)
+ resultString = decodeExtended(result.ToString());
+ }
+ else
+ {
+ resultString = result.ToString();
+ }
+
+ float left = (float)(start[1] + start[0]) / 2.0f;
+ float right = (float)(nextStart + lastStart) / 2.0f;
+ return new Result(resultString, null, new ResultPoint[]{new ResultPoint(left, (float) rowNumber), new ResultPoint(right, (float) rowNumber)}, BarcodeFormat.CODE_39);
+
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static int[] findAsteriskPattern(com.google.zxing.common.BitArray row, int[] counters) throws com.google.zxing.NotFoundException
+ private static int[] findAsteriskPattern(BitArray row, int[] counters)
+ {
+ int width = row.Size;
+ int rowOffset = row.getNextSet(0);
+
+ int counterPosition = 0;
+ int patternStart = rowOffset;
+ bool isWhite = false;
+ int patternLength = counters.Length;
+
+ for (int i = rowOffset; i < width; i++)
+ {
+ if (row.get(i) ^ isWhite)
+ {
+ counters[counterPosition]++;
+ }
+ else
+ {
+ if (counterPosition == patternLength - 1)
{
- if (row.get_Renamed(rowOffset))
- {
- break;
- }
- rowOffset++;
+ // Look for whitespace before start pattern, >= 50% of width of start pattern
+ if (toNarrowWidePattern(counters) == ASTERISK_ENCODING && row.isRange(Math.Max(0, patternStart - ((i - patternStart) >> 1)), patternStart, false))
+ {
+ return new int[]{patternStart, i};
+ }
+ patternStart += counters[0] + counters[1];
+ Array.Copy(counters, 2, counters, 0, patternLength - 2);
+ counters[patternLength - 2] = 0;
+ counters[patternLength - 1] = 0;
+ counterPosition--;
}
-
- int counterPosition = 0;
- int[] counters = new int[9];
- int patternStart = rowOffset;
- bool isWhite = false;
- int patternLength = counters.Length;
-
- for (int i = rowOffset; i < width; i++)
+ else
{
- bool pixel = row.get_Renamed(i);
- if (pixel ^ isWhite)
+ counterPosition++;
+ }
+ counters[counterPosition] = 1;
+ isWhite = !isWhite;
+ }
+ }
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ // For efficiency, returns -1 on failure. Not throwing here saved as many as 700 exceptions
+ // per image when using some of our blackbox images.
+ private static int toNarrowWidePattern(int[] counters)
+ {
+ int numCounters = counters.Length;
+ int maxNarrowCounter = 0;
+ int wideCounters;
+ do
+ {
+ int minCounter = int.MaxValue;
+ foreach (int counter in counters)
+ {
+ if (counter < minCounter && counter > maxNarrowCounter)
+ {
+ minCounter = counter;
+ }
+ }
+ maxNarrowCounter = minCounter;
+ wideCounters = 0;
+ int totalWideCountersWidth = 0;
+ int pattern = 0;
+ for (int i = 0; i < numCounters; i++)
+ {
+ int counter = counters[i];
+ if (counter > maxNarrowCounter)
+ {
+ pattern |= 1 << (numCounters - 1 - i);
+ wideCounters++;
+ totalWideCountersWidth += counter;
+ }
+ }
+ if (wideCounters == 3)
+ {
+ // Found 3 wide counters, but are they close enough in width?
+ // We can perform a cheap, conservative check to see if any individual
+ // counter is more than 1.5 times the average:
+ for (int i = 0; i < numCounters && wideCounters > 0; i++)
+ {
+ int counter = counters[i];
+ if (counter > maxNarrowCounter)
+ {
+ wideCounters--;
+ // totalWideCountersWidth = 3 * average, so this checks if counter >= 3/2 * average
+ if ((counter << 1) >= totalWideCountersWidth)
{
- counters[counterPosition]++;
+ return -1;
+ }
+ }
+ }
+ return pattern;
+ }
+ } while (wideCounters > 3);
+ return -1;
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static char patternToChar(int pattern) throws com.google.zxing.NotFoundException
+ private static char patternToChar(int pattern)
+ {
+ for (int i = 0; i < CHARACTER_ENCODINGS.Length; i++)
+ {
+ if (CHARACTER_ENCODINGS[i] == pattern)
+ {
+ return ALPHABET[i];
+ }
+ }
+ throw NotFoundException.NotFoundInstance;
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static String decodeExtended(CharSequence encoded) throws com.google.zxing.FormatException
+ private static string decodeExtended(string encoded)
+ {
+ int length = encoded.Length;
+ StringBuilder decoded = new StringBuilder(length);
+ for (int i = 0; i < length; i++)
+ {
+ char c = encoded[i];
+ if (c == '+' || c == '$' || c == '%' || c == '/')
+ {
+ char next = encoded[i + 1];
+ char decodedChar = '\0';
+ switch (c)
+ {
+ case '+':
+ // +A to +Z map to a to z
+ if (next >= 'A' && next <= 'Z')
+ {
+ decodedChar = (char)(next + 32);
}
else
{
- if (counterPosition == patternLength - 1)
- {
- if (toNarrowWidePattern(counters) == ASTERISK_ENCODING)
- {
- // Look for whitespace before start pattern, >= 50% of width of start pattern
- if (row.isRange(System.Math.Max(0, patternStart - (i - patternStart) / 2), patternStart, false))
- {
- return new int[]{patternStart, i};
- }
- }
- patternStart += counters[0] + counters[1];
- for (int y = 2; y < patternLength; y++)
- {
- counters[y - 2] = counters[y];
- }
- counters[patternLength - 2] = 0;
- counters[patternLength - 1] = 0;
- counterPosition--;
- }
- else
- {
- counterPosition++;
- }
- counters[counterPosition] = 1;
- isWhite = !isWhite;
+ throw FormatException.FormatInstance;
}
- }
- throw ReaderException.Instance;
- }
-
- // For efficiency, returns -1 on failure. Not throwing here saved as many as 700 exceptions
- // per image when using some of our blackbox images.
- private static int toNarrowWidePattern(int[] counters)
- {
- int numCounters = counters.Length;
- int maxNarrowCounter = 0;
- int wideCounters;
- do
- {
- int minCounter = System.Int32.MaxValue;
- for (int i = 0; i < numCounters; i++)
+ break;
+ case '$':
+ // $A to $Z map to control codes SH to SB
+ if (next >= 'A' && next <= 'Z')
{
- int counter = counters[i];
- if (counter < minCounter && counter > maxNarrowCounter)
- {
- minCounter = counter;
- }
- }
- maxNarrowCounter = minCounter;
- wideCounters = 0;
- int totalWideCountersWidth = 0;
- int pattern = 0;
- for (int i = 0; i < numCounters; i++)
- {
- int counter = counters[i];
- if (counters[i] > maxNarrowCounter)
- {
- pattern |= 1 << (numCounters - 1 - i);
- wideCounters++;
- totalWideCountersWidth += counter;
- }
- }
- if (wideCounters == 3)
- {
- // Found 3 wide counters, but are they close enough in width?
- // We can perform a cheap, conservative check to see if any individual
- // counter is more than 1.5 times the average:
- for (int i = 0; i < numCounters && wideCounters > 0; i++)
- {
- int counter = counters[i];
- if (counters[i] > maxNarrowCounter)
- {
- wideCounters--;
- // totalWideCountersWidth = 3 * average, so this checks if counter >= 3/2 * average
- if ((counter << 1) >= totalWideCountersWidth)
- {
- return - 1;
- }
- }
- }
- return pattern;
- }
- }
- while (wideCounters > 3);
- return - 1;
- }
-
- private static char patternToChar(int pattern)
- {
- for (int i = 0; i < CHARACTER_ENCODINGS.Length; i++)
- {
- if (CHARACTER_ENCODINGS[i] == pattern)
- {
- return ALPHABET[i];
- }
- }
- throw ReaderException.Instance;
- }
-
- private static System.String decodeExtended(System.String encoded)
- {
- int length = encoded.Length;
- System.Text.StringBuilder decoded = new System.Text.StringBuilder(length);
- for (int i = 0; i < length; i++)
- {
- char c = encoded[i];
- if (c == '+' || c == '$' || c == '%' || c == '/')
- {
- char next = encoded[i + 1];
- char decodedChar = '\x0000';
- switch (c)
- {
-
- case '+':
- // +A to +Z map to a to z
- if (next >= 'A' && next <= 'Z')
- {
- decodedChar = (char) (next + 32);
- }
- else
- {
- throw ReaderException.Instance;
- }
- break;
-
- case '$':
- // $A to $Z map to control codes SH to SB
- if (next >= 'A' && next <= 'Z')
- {
- decodedChar = (char) (next - 64);
- }
- else
- {
- throw ReaderException.Instance;
- }
- break;
-
- case '%':
- // %A to %E map to control codes ESC to US
- if (next >= 'A' && next <= 'E')
- {
- decodedChar = (char) (next - 38);
- }
- else if (next >= 'F' && next <= 'W')
- {
- decodedChar = (char) (next - 11);
- }
- else
- {
- throw ReaderException.Instance;
- }
- break;
-
- case '/':
- // /A to /O map to ! to , and /Z maps to :
- if (next >= 'A' && next <= 'O')
- {
- decodedChar = (char) (next - 32);
- }
- else if (next == 'Z')
- {
- decodedChar = ':';
- }
- else
- {
- throw ReaderException.Instance;
- }
- break;
- }
- decoded.Append(decodedChar);
- // bump up i again since we read two characters
- i++;
+ decodedChar = (char)(next - 64);
}
else
{
- decoded.Append(c);
+ throw FormatException.FormatInstance;
}
+ break;
+ case '%':
+ // %A to %E map to control codes ESC to US
+ if (next >= 'A' && next <= 'E')
+ {
+ decodedChar = (char)(next - 38);
+ }
+ else if (next >= 'F' && next <= 'W')
+ {
+ decodedChar = (char)(next - 11);
+ }
+ else
+ {
+ throw FormatException.FormatInstance;
+ }
+ break;
+ case '/':
+ // /A to /O map to ! to , and /Z maps to :
+ if (next >= 'A' && next <= 'O')
+ {
+ decodedChar = (char)(next - 32);
+ }
+ else if (next == 'Z')
+ {
+ decodedChar = ':';
+ }
+ else
+ {
+ throw FormatException.FormatInstance;
+ }
+ break;
}
- return decoded.ToString();
+ decoded.Append(decodedChar);
+ // bump up i again since we read two characters
+ i++;
+ }
+ else
+ {
+ decoded.Append(c);
+ }
}
+ return decoded.ToString();
+ }
+
}
-}
+
+}
\ No newline at end of file
diff --git a/csharp/oned/Code39Writer.cs b/csharp/oned/Code39Writer.cs
index 478033490..01dec3db2 100644
--- a/csharp/oned/Code39Writer.cs
+++ b/csharp/oned/Code39Writer.cs
@@ -1,80 +1,94 @@
-/*
- * Copyright 2011 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-using System;
-using System.Collections;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using ReaderException = com.google.zxing.ReaderException;
-using Result = com.google.zxing.Result;
-using ResultPoint = com.google.zxing.ResultPoint;
-using ByteMatrix = com.google.zxing.common.ByteMatrix;
-namespace com.google.zxing.oned
-{
- /// Implements decoding of the EAN-13 format.
- ///
- ///
- /// erik.barbara@gmail.com (Erik Barbara)
- ///
- /// em@nerd.ocracy.org (Emanuele Aina) - Ported from ZXING Java Source
- ///
- public sealed class Code39Writer:UPCEANWriter
- {
- public override ByteMatrix encode(string contents, BarcodeFormat format, int width, int height, Hashtable hints) {
- if (format != BarcodeFormat.CODE_39) {
- throw new ArgumentException("Can only encode CODE_39, but got " + format);
- }
- return base.encode(contents, format, width, height, hints);
- }
-
- public override sbyte[] encode(string contents) {
- int length = contents.Length;
- if (length > 80) {
- throw new ArgumentException("Requested contents should be less than 80 digits long, but got " + length);
- }
-
- int[] widths = new int[9];
- int codeWidth = 24 + 1 + length;
- for (int i = 0; i < length; i++) {
- int indexInString = Code39Reader.ALPHABET_STRING.IndexOf(contents[i]);
- toIntArray(Code39Reader.CHARACTER_ENCODINGS[indexInString], widths);
- for(int j = 0; j < widths.Length; j++) {
- codeWidth += widths[j];
- }
- }
- sbyte[] result = new sbyte[codeWidth];
- toIntArray(Code39Reader.CHARACTER_ENCODINGS[39], widths);
- int pos = appendPattern(result, 0, widths, 1);
- int[] narrowWhite = {1};
- pos += appendPattern(result, pos, narrowWhite, 0);
- //append next character to bytematrix
- for(int i = length-1; i >= 0; i--) {
- int indexInString = Code39Reader.ALPHABET_STRING.IndexOf(contents[i]);
- toIntArray(Code39Reader.CHARACTER_ENCODINGS[indexInString], widths);
- pos += appendPattern(result, pos, widths, 1);
- pos += appendPattern(result, pos, narrowWhite, 0);
- }
- toIntArray(Code39Reader.CHARACTER_ENCODINGS[39], widths);
- pos += appendPattern(result, pos, widths, 1);
- return result;
- }
-
- private static void toIntArray(int a, int[] toReturn) {
- for (int i = 0; i < 9; i++) {
- int temp = a & (1 << i);
- toReturn[i] = (temp == 0) ? 1 : 2;
- }
- }
- }
-}
+using System.Collections.Generic;
+
+/*
+ * Copyright 2010 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace com.google.zxing.oned
+{
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using EncodeHintType = com.google.zxing.EncodeHintType;
+ using WriterException = com.google.zxing.WriterException;
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+
+
+ ///
+ /// This object renders a CODE39 code as a .
+ ///
+ /// @author erik.barbara@gmail.com (Erik Barbara)
+ ///
+ public sealed class Code39Writer : OneDimensionalCodeWriter
+ {
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.common.BitMatrix encode(String contents, com.google.zxing.BarcodeFormat format, int width, int height, java.util.Map hints) throws com.google.zxing.WriterException
+ public override BitMatrix encode(string contents, BarcodeFormat format, int width, int height, IDictionary hints)
+ {
+ if (format != BarcodeFormat.CODE_39)
+ {
+ throw new System.ArgumentException("Can only encode CODE_39, but got " + format);
+ }
+ return base.encode(contents, format, width, height, hints);
+ }
+
+ public override bool[] encode(string contents)
+ {
+ int length = contents.Length;
+ if (length > 80)
+ {
+ throw new System.ArgumentException("Requested contents should be less than 80 digits long, but got " + length);
+ }
+
+ int[] widths = new int[9];
+ int codeWidth = 24 + 1 + length;
+ for (int i = 0; i < length; i++)
+ {
+ int indexInString = Code39Reader.ALPHABET_STRING.IndexOf(contents[i]);
+ toIntArray(Code39Reader.CHARACTER_ENCODINGS[indexInString], widths);
+ foreach (int width in widths)
+ {
+ codeWidth += width;
+ }
+ }
+ bool[] result = new bool[codeWidth];
+ toIntArray(Code39Reader.CHARACTER_ENCODINGS[39], widths);
+ int pos = appendPattern(result, 0, widths, true);
+ int[] narrowWhite = {1};
+ pos += appendPattern(result, pos, narrowWhite, false);
+ //append next character to bytematrix
+ for (int i = length - 1; i >= 0; i--)
+ {
+ int indexInString = Code39Reader.ALPHABET_STRING.IndexOf(contents[i]);
+ toIntArray(Code39Reader.CHARACTER_ENCODINGS[indexInString], widths);
+ pos += appendPattern(result, pos, widths, true);
+ pos += appendPattern(result, pos, narrowWhite, false);
+ }
+ toIntArray(Code39Reader.CHARACTER_ENCODINGS[39], widths);
+ pos += appendPattern(result, pos, widths, true);
+ return result;
+ }
+
+ private static void toIntArray(int a, int[] toReturn)
+ {
+ for (int i = 0; i < 9; i++)
+ {
+ int temp = a & (1 << i);
+ toReturn[i] = temp == 0 ? 1 : 2;
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/csharp/oned/EAN13Reader.cs b/csharp/oned/EAN13Reader.cs
index b8c2df49d..4b42278c5 100755
--- a/csharp/oned/EAN13Reader.cs
+++ b/csharp/oned/EAN13Reader.cs
@@ -1,153 +1,155 @@
+using System.Collections;
+using System.Text;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using ReaderException = com.google.zxing.ReaderException;
-using BitArray = com.google.zxing.common.BitArray;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.oned
{
-
- /// Implements decoding of the EAN-13 format.
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using BitArray = com.google.zxing.common.BitArray;
+
+ ///
+ /// Implements decoding of the EAN-13 format.
///
+ /// @author dswitkin@google.com (Daniel Switkin)
+ /// @author Sean Owen
+ /// @author alasdair@google.com (Alasdair Mackintosh)
///
- /// dswitkin@google.com (Daniel Switkin)
- ///
- /// Sean Owen
- ///
- /// alasdair@google.com (Alasdair Mackintosh)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class EAN13Reader:UPCEANReader
+ public sealed class EAN13Reader : UPCEANReader
{
- override internal BarcodeFormat BarcodeFormat
+
+ // For an EAN-13 barcode, the first digit is represented by the parities used
+ // to encode the next six digits, according to the table below. For example,
+ // if the barcode is 5 123456 789012 then the value of the first digit is
+ // signified by using odd for '1', even for '2', even for '3', odd for '4',
+ // odd for '5', and even for '6'. See http://en.wikipedia.org/wiki/EAN-13
+ //
+ // Parity of next 6 digits
+ // Digit 0 1 2 3 4 5
+ // 0 Odd Odd Odd Odd Odd Odd
+ // 1 Odd Odd Even Odd Even Even
+ // 2 Odd Odd Even Even Odd Even
+ // 3 Odd Odd Even Even Even Odd
+ // 4 Odd Even Odd Odd Even Even
+ // 5 Odd Even Even Odd Odd Even
+ // 6 Odd Even Even Even Odd Odd
+ // 7 Odd Even Odd Even Odd Even
+ // 8 Odd Even Odd Even Even Odd
+ // 9 Odd Even Even Odd Even Odd
+ //
+ // Note that the encoding for '0' uses the same parity as a UPC barcode. Hence
+ // a UPC barcode can be converted to an EAN-13 barcode by prepending a 0.
+ //
+ // The encoding is represented by the following array, which is a bit pattern
+ // using Odd = 0 and Even = 1. For example, 5 is represented by:
+ //
+ // Odd Even Even Odd Odd Even
+ // in binary:
+ // 0 1 1 0 0 1 == 0x19
+ //
+ internal static readonly int[] FIRST_DIGIT_ENCODINGS = {0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A};
+
+ private readonly int[] decodeMiddleCounters;
+
+ public EAN13Reader()
+ {
+ decodeMiddleCounters = new int[4];
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: protected int decodeMiddle(com.google.zxing.common.BitArray row, int[] startRange, StringBuilder resultString) throws com.google.zxing.NotFoundException
+ protected internal override int decodeMiddle(BitArray row, int[] startRange, StringBuilder resultString)
+ {
+ int[] counters = decodeMiddleCounters;
+ counters[0] = 0;
+ counters[1] = 0;
+ counters[2] = 0;
+ counters[3] = 0;
+ int end = row.Size;
+ int rowOffset = startRange[1];
+
+ int lgPatternFound = 0;
+
+ for (int x = 0; x < 6 && rowOffset < end; x++)
{
- get
- {
- return BarcodeFormat.EAN_13;
- }
-
+ int bestMatch = decodeDigit(row, counters, rowOffset, L_AND_G_PATTERNS);
+ resultString.Append((char)('0' + bestMatch % 10));
+ foreach (int counter in counters)
+ {
+ rowOffset += counter;
+ }
+ if (bestMatch >= 10)
+ {
+ lgPatternFound |= 1 << (5 - x);
+ }
}
-
- // For an EAN-13 barcode, the first digit is represented by the parities used
- // to encode the next six digits, according to the table below. For example,
- // if the barcode is 5 123456 789012 then the value of the first digit is
- // signified by using odd for '1', even for '2', even for '3', odd for '4',
- // odd for '5', and even for '6'. See http://en.wikipedia.org/wiki/EAN-13
- //
- // Parity of next 6 digits
- // Digit 0 1 2 3 4 5
- // 0 Odd Odd Odd Odd Odd Odd
- // 1 Odd Odd Even Odd Even Even
- // 2 Odd Odd Even Even Odd Even
- // 3 Odd Odd Even Even Even Odd
- // 4 Odd Even Odd Odd Even Even
- // 5 Odd Even Even Odd Odd Even
- // 6 Odd Even Even Even Odd Odd
- // 7 Odd Even Odd Even Odd Even
- // 8 Odd Even Odd Even Even Odd
- // 9 Odd Even Even Odd Even Odd
- //
- // Note that the encoding for '0' uses the same parity as a UPC barcode. Hence
- // a UPC barcode can be converted to an EAN-13 barcode by prepending a 0.
- //
- // The encoding is represented by the following array, which is a bit pattern
- // using Odd = 0 and Even = 1. For example, 5 is represented by:
- //
- // Odd Even Even Odd Odd Even
- // in binary:
- // 0 1 1 0 0 1 == 0x19
- //
- //UPGRADE_NOTE: Final was removed from the declaration of 'FIRST_DIGIT_ENCODINGS'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- internal static readonly int[] FIRST_DIGIT_ENCODINGS = new int[]{0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A};
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'decodeMiddleCounters '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int[] decodeMiddleCounters;
-
- public EAN13Reader()
+
+ determineFirstDigit(resultString, lgPatternFound);
+
+ int[] middleRange = findGuardPattern(row, rowOffset, true, MIDDLE_PATTERN);
+ rowOffset = middleRange[1];
+
+ for (int x = 0; x < 6 && rowOffset < end; x++)
{
- decodeMiddleCounters = new int[4];
+ int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS);
+ resultString.Append((char)('0' + bestMatch));
+ foreach (int counter in counters)
+ {
+ rowOffset += counter;
+ }
}
-
- protected internal override int decodeMiddle(BitArray row, int[] startRange, System.Text.StringBuilder resultString)
+
+ return rowOffset;
+ }
+
+ internal override BarcodeFormat BarcodeFormat
+ {
+ get
+ {
+ return BarcodeFormat.EAN_13;
+ }
+ }
+
+ ///
+ /// Based on pattern of odd-even ('L' and 'G') patterns used to encoded the explicitly-encoded
+ /// digits in a barcode, determines the implicitly encoded first digit and adds it to the
+ /// result string.
+ ///
+ /// string to insert decoded first digit into
+ /// int whose bits indicates the pattern of odd/even L/G patterns used to
+ /// encode digits
+ /// if first digit cannot be determined
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static void determineFirstDigit(StringBuilder resultString, int lgPatternFound) throws com.google.zxing.NotFoundException
+ private static void determineFirstDigit(StringBuilder resultString, int lgPatternFound)
+ {
+ for (int d = 0; d < 10; d++)
{
- int[] counters = decodeMiddleCounters;
- counters[0] = 0;
- counters[1] = 0;
- counters[2] = 0;
- counters[3] = 0;
- int end = row.Size;
- int rowOffset = startRange[1];
-
- int lgPatternFound = 0;
-
- for (int x = 0; x < 6 && rowOffset < end; x++)
- {
- int bestMatch = decodeDigit(row, counters, rowOffset, L_AND_G_PATTERNS);
- resultString.Append((char) ('0' + bestMatch % 10));
- for (int i = 0; i < counters.Length; i++)
- {
- rowOffset += counters[i];
- }
- if (bestMatch >= 10)
- {
- lgPatternFound |= 1 << (5 - x);
- }
- }
-
- determineFirstDigit(resultString, lgPatternFound);
-
- int[] middleRange = findGuardPattern(row, rowOffset, true, MIDDLE_PATTERN);
- rowOffset = middleRange[1];
-
- for (int x = 0; x < 6 && rowOffset < end; x++)
- {
- int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS);
- resultString.Append((char) ('0' + bestMatch));
- for (int i = 0; i < counters.Length; i++)
- {
- rowOffset += counters[i];
- }
- }
-
- return rowOffset;
- }
-
- /// Based on pattern of odd-even ('L' and 'G') patterns used to encoded the explicitly-encoded
- /// digits in a barcode, determines the implicitly encoded first digit and adds it to the
- /// result string.
- ///
- ///
- /// string to insert decoded first digit into
- ///
- /// int whose bits indicates the pattern of odd/even L/G patterns used to
- /// encode digits
- ///
- /// ReaderException if first digit cannot be determined
- private static void determineFirstDigit(System.Text.StringBuilder resultString, int lgPatternFound)
- {
- for (int d = 0; d < 10; d++)
- {
- if (lgPatternFound == FIRST_DIGIT_ENCODINGS[d])
- {
- resultString.Insert(0, (char) ('0' + d));
- return ;
- }
- }
- throw ReaderException.Instance;
+ if (lgPatternFound == FIRST_DIGIT_ENCODINGS[d])
+ {
+ resultString.Insert(0, (char)('0' + d));
+ return;
+ }
}
+ throw NotFoundException.NotFoundInstance;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/oned/EAN13Writer.cs b/csharp/oned/EAN13Writer.cs
index cc2c406c3..dca5c75f2 100755
--- a/csharp/oned/EAN13Writer.cs
+++ b/csharp/oned/EAN13Writer.cs
@@ -1,84 +1,102 @@
-/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using WriterException = com.google.zxing.WriterException;
-using ByteMatrix = com.google.zxing.common.ByteMatrix;
+using System.Collections.Generic;
+
+/*
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.oned
{
-
-
- /// This object renders an EAN13 code as a ByteMatrix 2D array of greyscale
- /// values.
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using EncodeHintType = com.google.zxing.EncodeHintType;
+ using FormatException = com.google.zxing.FormatException;
+ using WriterException = com.google.zxing.WriterException;
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+
+
+ ///
+ /// This object renders an EAN13 code as a .
///
+ /// @author aripollak@gmail.com (Ari Pollak)
///
- /// aripollak@gmail.com (Ari Pollak)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class EAN13Writer:UPCEANWriter
+ public sealed class EAN13Writer : UPCEANWriter
{
-
- private const int codeWidth = 3 + (7 * 6) + 5 + (7 * 6) + 3; // end guard
-
- public override ByteMatrix encode(System.String contents, BarcodeFormat format, int width, int height, System.Collections.Hashtable hints)
+
+ private const int CODE_WIDTH = 3 + (7 * 6) + 5 + (7 * 6) + 3; // end guard - right bars - middle guard - left bars - start guard
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.common.BitMatrix encode(String contents, com.google.zxing.BarcodeFormat format, int width, int height, java.util.Map hints) throws com.google.zxing.WriterException
+ public override BitMatrix encode(string contents, BarcodeFormat format, int width, int height, IDictionary hints)
+ {
+ if (format != BarcodeFormat.EAN_13)
{
- if (format != BarcodeFormat.EAN_13)
- {
- throw new System.ArgumentException("Can only encode EAN_13, but got " + format);
- }
-
- return base.encode(contents, format, width, height, hints);
+ throw new System.ArgumentException("Can only encode EAN_13, but got " + format);
}
-
- public override sbyte[] encode(System.String contents)
+
+ return base.encode(contents, format, width, height, hints);
+ }
+
+ public override bool[] encode(string contents)
+ {
+ if (contents.Length != 13)
{
- if (contents.Length != 13)
- {
- throw new System.ArgumentException("Requested contents should be 13 digits long, but got " + contents.Length);
- }
-
- int firstDigit = System.Int32.Parse(contents.Substring(0, (1) - (0)));
- int parities = EAN13Reader.FIRST_DIGIT_ENCODINGS[firstDigit];
- sbyte[] result = new sbyte[codeWidth];
- int pos = 0;
-
- pos += appendPattern(result, pos, UPCEANReader.START_END_PATTERN, 1);
-
- // See {@link #EAN13Reader} for a description of how the first digit & left bars are encoded
- for (int i = 1; i <= 6; i++)
- {
- int digit = System.Int32.Parse(contents.Substring(i, (i + 1) - (i)));
- if ((parities >> (6 - i) & 1) == 1)
- {
- digit += 10;
- }
- pos += appendPattern(result, pos, UPCEANReader.L_AND_G_PATTERNS[digit], 0);
- }
-
- pos += appendPattern(result, pos, UPCEANReader.MIDDLE_PATTERN, 0);
-
- for (int i = 7; i <= 12; i++)
- {
- int digit = System.Int32.Parse(contents.Substring(i, (i + 1) - (i)));
- pos += appendPattern(result, pos, UPCEANReader.L_PATTERNS[digit], 1);
- }
- pos += appendPattern(result, pos, UPCEANReader.START_END_PATTERN, 1);
-
- return result;
+ throw new System.ArgumentException("Requested contents should be 13 digits long, but got " + contents.Length);
}
+ try
+ {
+ if (!UPCEANReader.checkStandardUPCEANChecksum(contents))
+ {
+ throw new System.ArgumentException("Contents do not pass checksum");
+ }
+ }
+ catch (FormatException fe)
+ {
+ throw new System.ArgumentException("Illegal contents");
+ }
+
+ int firstDigit = Convert.ToInt32(contents.Substring(0, 1));
+ int parities = EAN13Reader.FIRST_DIGIT_ENCODINGS[firstDigit];
+ bool[] result = new bool[CODE_WIDTH];
+ int pos = 0;
+
+ pos += appendPattern(result, pos, UPCEANReader.START_END_PATTERN, true);
+
+ // See {@link #EAN13Reader} for a description of how the first digit & left bars are encoded
+ for (int i = 1; i <= 6; i++)
+ {
+ int digit = Convert.ToInt32(contents.Substring(i, 1));
+ if ((parities >> (6 - i) & 1) == 1)
+ {
+ digit += 10;
+ }
+ pos += appendPattern(result, pos, UPCEANReader.L_AND_G_PATTERNS[digit], false);
+ }
+
+ pos += appendPattern(result, pos, UPCEANReader.MIDDLE_PATTERN, false);
+
+ for (int i = 7; i <= 12; i++)
+ {
+ int digit = Convert.ToInt32(contents.Substring(i, 1));
+ pos += appendPattern(result, pos, UPCEANReader.L_PATTERNS[digit], true);
+ }
+ pos += appendPattern(result, pos, UPCEANReader.START_END_PATTERN, true);
+
+ return result;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/oned/EAN8Reader.cs b/csharp/oned/EAN8Reader.cs
index 7fc8c0bcb..87892b3ee 100755
--- a/csharp/oned/EAN8Reader.cs
+++ b/csharp/oned/EAN8Reader.cs
@@ -1,85 +1,90 @@
+using System.Collections;
+using System.Text;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using ReaderException = com.google.zxing.ReaderException;
-using BitArray = com.google.zxing.common.BitArray;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.oned
{
-
- /// Implements decoding of the EAN-8 format.
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using BitArray = com.google.zxing.common.BitArray;
+
+ ///
+ /// Implements decoding of the EAN-8 format.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class EAN8Reader:UPCEANReader
+ public sealed class EAN8Reader : UPCEANReader
{
- override internal BarcodeFormat BarcodeFormat
+
+ private readonly int[] decodeMiddleCounters;
+
+ public EAN8Reader()
+ {
+ decodeMiddleCounters = new int[4];
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: protected int decodeMiddle(com.google.zxing.common.BitArray row, int[] startRange, StringBuilder result) throws com.google.zxing.NotFoundException
+ protected internal override int decodeMiddle(BitArray row, int[] startRange, StringBuilder result)
+ {
+ int[] counters = decodeMiddleCounters;
+ counters[0] = 0;
+ counters[1] = 0;
+ counters[2] = 0;
+ counters[3] = 0;
+ int end = row.Size;
+ int rowOffset = startRange[1];
+
+ for (int x = 0; x < 4 && rowOffset < end; x++)
{
- get
- {
- return BarcodeFormat.EAN_8;
- }
-
+ int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS);
+ result.Append((char)('0' + bestMatch));
+ foreach (int counter in counters)
+ {
+ rowOffset += counter;
+ }
}
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'decodeMiddleCounters '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private int[] decodeMiddleCounters;
-
- public EAN8Reader()
+
+ int[] middleRange = findGuardPattern(row, rowOffset, true, MIDDLE_PATTERN);
+ rowOffset = middleRange[1];
+
+ for (int x = 0; x < 4 && rowOffset < end; x++)
{
- decodeMiddleCounters = new int[4];
- }
-
- protected internal override int decodeMiddle(BitArray row, int[] startRange, System.Text.StringBuilder result)
- {
- int[] counters = decodeMiddleCounters;
- counters[0] = 0;
- counters[1] = 0;
- counters[2] = 0;
- counters[3] = 0;
- int end = row.Size;
- int rowOffset = startRange[1];
-
- for (int x = 0; x < 4 && rowOffset < end; x++)
- {
- int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS);
- result.Append((char) ('0' + bestMatch));
- for (int i = 0; i < counters.Length; i++)
- {
- rowOffset += counters[i];
- }
- }
-
- int[] middleRange = findGuardPattern(row, rowOffset, true, MIDDLE_PATTERN);
- rowOffset = middleRange[1];
-
- for (int x = 0; x < 4 && rowOffset < end; x++)
- {
- int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS);
- result.Append((char) ('0' + bestMatch));
- for (int i = 0; i < counters.Length; i++)
- {
- rowOffset += counters[i];
- }
- }
-
- return rowOffset;
+ int bestMatch = decodeDigit(row, counters, rowOffset, L_PATTERNS);
+ result.Append((char)('0' + bestMatch));
+ foreach (int counter in counters)
+ {
+ rowOffset += counter;
+ }
}
+
+ return rowOffset;
+ }
+
+ internal override BarcodeFormat BarcodeFormat
+ {
+ get
+ {
+ return BarcodeFormat.EAN_8;
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/oned/EAN8Writer.cs b/csharp/oned/EAN8Writer.cs
index 8f9b0a646..513f4ca0d 100755
--- a/csharp/oned/EAN8Writer.cs
+++ b/csharp/oned/EAN8Writer.cs
@@ -1,78 +1,84 @@
-/*
-* Copyright 2009 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using WriterException = com.google.zxing.WriterException;
-using ByteMatrix = com.google.zxing.common.ByteMatrix;
+using System.Collections.Generic;
+
+/*
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.oned
{
-
- /// This object renders an EAN8 code as a ByteMatrix 2D array of greyscale
- /// values.
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using EncodeHintType = com.google.zxing.EncodeHintType;
+ using WriterException = com.google.zxing.WriterException;
+ using BitMatrix = com.google.zxing.common.BitMatrix;
+
+
+ ///
+ /// This object renders an EAN8 code as a .
///
+ /// @author aripollak@gmail.com (Ari Pollak)
///
- /// aripollak@gmail.com (Ari Pollak)
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class EAN8Writer:UPCEANWriter
+ public sealed class EAN8Writer : UPCEANWriter
{
-
- private const int codeWidth = 3 + (7 * 4) + 5 + (7 * 4) + 3; // end guard
-
- public override ByteMatrix encode(System.String contents, BarcodeFormat format, int width, int height, System.Collections.Hashtable hints)
+
+ private const int CODE_WIDTH = 3 + (7 * 4) + 5 + (7 * 4) + 3; // end guard - right bars - middle guard - left bars - start guard
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.common.BitMatrix encode(String contents, com.google.zxing.BarcodeFormat format, int width, int height, java.util.Map hints) throws com.google.zxing.WriterException
+ public override BitMatrix encode(string contents, BarcodeFormat format, int width, int height, IDictionary hints)
+ {
+ if (format != BarcodeFormat.EAN_8)
{
- if (format != BarcodeFormat.EAN_8)
- {
- throw new System.ArgumentException("Can only encode EAN_8, but got " + format);
- }
-
- return base.encode(contents, format, width, height, hints);
+ throw new System.ArgumentException("Can only encode EAN_8, but got " + format);
}
-
- /// a byte array of horizontal pixels (0 = white, 1 = black)
- ///
- public override sbyte[] encode(System.String contents)
+
+ return base.encode(contents, format, width, height, hints);
+ }
+
+ /// a byte array of horizontal pixels (false = white, true = black)
+ public override bool[] encode(string contents)
+ {
+ if (contents.Length != 8)
{
- if (contents.Length != 8)
- {
- throw new System.ArgumentException("Requested contents should be 8 digits long, but got " + contents.Length);
- }
-
- sbyte[] result = new sbyte[codeWidth];
- int pos = 0;
-
- pos += appendPattern(result, pos, UPCEANReader.START_END_PATTERN, 1);
-
- for (int i = 0; i <= 3; i++)
- {
- int digit = System.Int32.Parse(contents.Substring(i, (i + 1) - (i)));
- pos += appendPattern(result, pos, UPCEANReader.L_PATTERNS[digit], 0);
- }
-
- pos += appendPattern(result, pos, UPCEANReader.MIDDLE_PATTERN, 0);
-
- for (int i = 4; i <= 7; i++)
- {
- int digit = System.Int32.Parse(contents.Substring(i, (i + 1) - (i)));
- pos += appendPattern(result, pos, UPCEANReader.L_PATTERNS[digit], 1);
- }
- pos += appendPattern(result, pos, UPCEANReader.START_END_PATTERN, 1);
-
- return result;
+ throw new System.ArgumentException("Requested contents should be 8 digits long, but got " + contents.Length);
}
+
+ bool[] result = new bool[CODE_WIDTH];
+ int pos = 0;
+
+ pos += appendPattern(result, pos, UPCEANReader.START_END_PATTERN, true);
+
+ for (int i = 0; i <= 3; i++)
+ {
+ int digit = Convert.ToInt32(contents.Substring(i, 1));
+ pos += appendPattern(result, pos, UPCEANReader.L_PATTERNS[digit], false);
+ }
+
+ pos += appendPattern(result, pos, UPCEANReader.MIDDLE_PATTERN, false);
+
+ for (int i = 4; i <= 7; i++)
+ {
+ int digit = Convert.ToInt32(contents.Substring(i, 1));
+ pos += appendPattern(result, pos, UPCEANReader.L_PATTERNS[digit], true);
+ }
+ pos += appendPattern(result, pos, UPCEANReader.START_END_PATTERN, true);
+
+ return result;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/oned/ITFReader.cs b/csharp/oned/ITFReader.cs
index 2a5700962..de2b000dd 100755
--- a/csharp/oned/ITFReader.cs
+++ b/csharp/oned/ITFReader.cs
@@ -1,382 +1,375 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using DecodeHintType = com.google.zxing.DecodeHintType;
-using ReaderException = com.google.zxing.ReaderException;
-using Result = com.google.zxing.Result;
-using ResultPoint = com.google.zxing.ResultPoint;
-using BitArray = com.google.zxing.common.BitArray;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.oned
{
-
- /// Implements decoding of the ITF format.
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using FormatException = com.google.zxing.FormatException;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using Result = com.google.zxing.Result;
+ using ResultPoint = com.google.zxing.ResultPoint;
+ using BitArray = com.google.zxing.common.BitArray;
+
+
+ ///
+ /// Implements decoding of the ITF format, or Interleaved Two of Five.
///
- /// "ITF" stands for Interleaved Two of Five. This Reader will scan ITF barcode with 6, 10 or 14
- /// digits. The checksum is optional and is not applied by this Reader. The consumer of the decoded
+ ///
This Reader will scan ITF barcodes of certain lengths only.
+ /// At the moment it reads length 6, 10, 12, 14, 16, 24, and 44 as these have appeared "in the wild". Not all
+ /// lengths are scanned, especially shorter ones, to avoid false positives. This in turn is due to a lack of
+ /// required checksum function.
+ ///
+ /// The checksum is optional and is not applied by this Reader. The consumer of the decoded
/// value will have to apply a checksum if required.
///
/// http://en.wikipedia.org/wiki/Interleaved_2_of_5
/// is a great reference for Interleaved 2 of 5 information.
///
+ /// @author kevin.osullivan@sita.aero, SITA Lab.
///
- /// kevin.osullivan@sita.aero, SITA Lab.
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class ITFReader:OneDReader
+ public sealed class ITFReader : OneDReader
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'MAX_AVG_VARIANCE '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- private static readonly int MAX_AVG_VARIANCE = (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.42f);
- //UPGRADE_NOTE: Final was removed from the declaration of 'MAX_INDIVIDUAL_VARIANCE '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- private static readonly int MAX_INDIVIDUAL_VARIANCE = (int) (PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.8f);
-
- private const int W = 3; // Pixel width of a wide line
- private const int N = 1; // Pixed width of a narrow line
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'DEFAULT_ALLOWED_LENGTHS'. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly int[] DEFAULT_ALLOWED_LENGTHS = new int[]{6, 10, 14, 44};
-
- // Stores the actual narrow line width of the image being decoded.
- private int narrowLineWidth = - 1;
-
- /// Start/end guard pattern.
- ///
- /// Note: The end pattern is reversed because the row is reversed before
- /// searching for the END_PATTERN
- ///
- //UPGRADE_NOTE: Final was removed from the declaration of 'START_PATTERN '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly int[] START_PATTERN = new int[]{N, N, N, N};
- //UPGRADE_NOTE: Final was removed from the declaration of 'END_PATTERN_REVERSED '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly int[] END_PATTERN_REVERSED = new int[]{N, N, W};
-
- /// Patterns of Wide / Narrow lines to indicate each digit
- //UPGRADE_NOTE: Final was removed from the declaration of 'PATTERNS '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private static readonly int[][] PATTERNS = new int[][]{new int[]{N, N, W, W, N}, new int[]{W, N, N, N, W}, new int[]{N, W, N, N, W}, new int[]{W, W, N, N, N}, new int[]{N, N, W, N, W}, new int[]{W, N, W, N, N}, new int[]{N, W, W, N, N}, new int[]{N, N, N, W, W}, new int[]{W, N, N, W, N}, new int[]{N, W, N, W, N}};
-
- public override Result decodeRow(int rowNumber, BitArray row, System.Collections.Hashtable hints)
+
+ private static readonly int MAX_AVG_VARIANCE = (int)(PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.42f);
+ private static readonly int MAX_INDIVIDUAL_VARIANCE = (int)(PATTERN_MATCH_RESULT_SCALE_FACTOR * 0.8f);
+
+ private const int W = 3; // Pixel width of a wide line
+ private const int N = 1; // Pixed width of a narrow line
+
+ private static readonly int[] DEFAULT_ALLOWED_LENGTHS = {44, 24, 20, 18, 16, 14, 12, 10, 8, 6};
+
+ // Stores the actual narrow line width of the image being decoded.
+ private int narrowLineWidth = -1;
+
+ ///
+ /// Start/end guard pattern.
+ ///
+ /// Note: The end pattern is reversed because the row is reversed before
+ /// searching for the END_PATTERN
+ ///
+ private static readonly int[] START_PATTERN = {N, N, N, N};
+ private static readonly int[] END_PATTERN_REVERSED = {N, N, W};
+
+ ///
+ /// Patterns of Wide / Narrow lines to indicate each digit
+ ///
+ internal static readonly int[][] PATTERNS = {new int[] {N, N, W, W, N}, new int[] {W, N, N, N, W}, new int[] {N, W, N, N, W}, new int[] {W, W, N, N, N}, new int[] {N, N, W, N, W}, new int[] {W, N, W, N, N}, new int[] {N, W, W, N, N}, new int[] {N, N, N, W, W}, new int[] {W, N, N, W, N}, new int[] {N, W, N, W, N}};
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decodeRow(int rowNumber, com.google.zxing.common.BitArray row, java.util.Map hints) throws com.google.zxing.FormatException, com.google.zxing.NotFoundException
+ public override Result decodeRow(int rowNumber, BitArray row, IDictionary hints)
+ {
+
+ // Find out where the Middle section (payload) starts & ends
+ int[] startRange = decodeStart(row);
+ int[] endRange = decodeEnd(row);
+
+ StringBuilder result = new StringBuilder(20);
+ decodeMiddle(row, startRange[1], endRange[0], result);
+ string resultString = result.ToString();
+
+ int[] allowedLengths = null;
+ if (hints != null && hints.ContainsKey(DecodeHintType.ALLOWED_LENGTHS))
{
-
- // Find out where the Middle section (payload) starts & ends
- int[] startRange = decodeStart(row);
- int[] endRange = decodeEnd(row);
-
- System.Text.StringBuilder result = new System.Text.StringBuilder(20);
- decodeMiddle(row, startRange[1], endRange[0], result);
- System.String resultString = result.ToString();
-
- int[] allowedLengths = null;
- if (hints != null)
- {
- allowedLengths = (int[]) hints[DecodeHintType.ALLOWED_LENGTHS];
- }
- if (allowedLengths == null)
- {
- allowedLengths = DEFAULT_ALLOWED_LENGTHS;
- }
-
- // To avoid false positives with 2D barcodes (and other patterns), make
- // an assumption that the decoded string must be 6, 10 or 14 digits.
- int length = resultString.Length;
- bool lengthOK = false;
- for (int i = 0; i < allowedLengths.Length; i++)
- {
- if (length == allowedLengths[i])
- {
- lengthOK = true;
- break;
- }
- }
- if (!lengthOK)
- {
- throw ReaderException.Instance;
- }
-
- //UPGRADE_WARNING: Data types in Visual C# might be different. Verify the accuracy of narrowing conversions. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1042'"
- return new Result(resultString, null, new ResultPoint[]{new ResultPoint(startRange[1], (float) rowNumber), new ResultPoint(endRange[0], (float) rowNumber)}, BarcodeFormat.ITF);
+ allowedLengths = (int[]) hints[DecodeHintType.ALLOWED_LENGTHS];
+
}
-
- /// row of black/white values to search
- ///
- /// offset of start pattern
- ///
- /// {@link StringBuffer} to append decoded chars to
- ///
- /// ReaderException if decoding could not complete successfully
- private static void decodeMiddle(BitArray row, int payloadStart, int payloadEnd, System.Text.StringBuilder resultString)
+ if (allowedLengths == null)
{
-
- // Digits are interleaved in pairs - 5 black lines for one digit, and the
- // 5
- // interleaved white lines for the second digit.
- // Therefore, need to scan 10 lines and then
- // split these into two arrays
- int[] counterDigitPair = new int[10];
- int[] counterBlack = new int[5];
- int[] counterWhite = new int[5];
-
- while (payloadStart < payloadEnd)
- {
-
- // Get 10 runs of black/white.
- recordPattern(row, payloadStart, counterDigitPair);
- // Split them into each array
- for (int k = 0; k < 5; k++)
- {
- int twoK = k << 1;
- counterBlack[k] = counterDigitPair[twoK];
- counterWhite[k] = counterDigitPair[twoK + 1];
- }
-
- int bestMatch = decodeDigit(counterBlack);
- resultString.Append((char) ('0' + bestMatch));
- bestMatch = decodeDigit(counterWhite);
- resultString.Append((char) ('0' + bestMatch));
-
- for (int i = 0; i < counterDigitPair.Length; i++)
- {
- payloadStart += counterDigitPair[i];
- }
- }
+ allowedLengths = DEFAULT_ALLOWED_LENGTHS;
}
-
- /// Identify where the start of the middle / payload section starts.
- ///
- ///
- /// row of black/white values to search
- ///
- /// Array, containing index of start of 'start block' and end of
- /// 'start block'
- ///
- /// ReaderException
- internal int[] decodeStart(BitArray row)
+
+ // To avoid false positives with 2D barcodes (and other patterns), make
+ // an assumption that the decoded string must be 6, 10 or 14 digits.
+ int length = resultString.Length;
+ bool lengthOK = false;
+ foreach (int allowedLength in allowedLengths)
{
- int endStart = skipWhiteSpace(row);
- int[] startPattern = findGuardPattern(row, endStart, START_PATTERN);
-
- // Determine the width of a narrow line in pixels. We can do this by
- // getting the width of the start pattern and dividing by 4 because its
- // made up of 4 narrow lines.
- this.narrowLineWidth = (startPattern[1] - startPattern[0]) >> 2;
-
- validateQuietZone(row, startPattern[0]);
-
- return startPattern;
+ if (length == allowedLength)
+ {
+ lengthOK = true;
+ break;
+ }
}
-
- /// The start & end patterns must be pre/post fixed by a quiet zone. This
- /// zone must be at least 10 times the width of a narrow line. Scan back until
- /// we either get to the start of the barcode or match the necessary number of
- /// quiet zone pixels.
- ///
- /// Note: Its assumed the row is reversed when using this method to find
- /// quiet zone after the end pattern.
- ///
- /// ref: http://www.barcode-1.net/i25code.html
- ///
- ///
- /// bit array representing the scanned barcode.
- ///
- /// index into row of the start or end pattern.
- ///
- /// ReaderException if the quiet zone cannot be found, a ReaderException is thrown.
- private void validateQuietZone(BitArray row, int startPattern)
+ if (!lengthOK)
{
-
- int quietCount = this.narrowLineWidth * 10; // expect to find this many pixels of quiet zone
-
- for (int i = startPattern - 1; quietCount > 0 && i >= 0; i--)
- {
- if (row.get_Renamed(i))
- {
- break;
- }
- quietCount--;
- }
- if (quietCount != 0)
- {
- // Unable to find the necessary number of quiet zone pixels.
- throw ReaderException.Instance;
- }
+ throw FormatException.FormatInstance;
}
-
- /// Skip all whitespace until we get to the first black line.
- ///
- ///
- /// row of black/white values to search
- ///
- /// index of the first black line.
- ///
- /// ReaderException Throws exception if no black lines are found in the row
- private static int skipWhiteSpace(BitArray row)
+
+ return new Result(resultString, null, new ResultPoint[] {new ResultPoint(startRange[1], (float) rowNumber), new ResultPoint(endRange[0], (float) rowNumber)}, BarcodeFormat.ITF); // no natural byte representation for these barcodes
+ }
+
+ /// row of black/white values to search
+ /// offset of start pattern
+ /// to append decoded chars to
+ /// if decoding could not complete successfully
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static void decodeMiddle(com.google.zxing.common.BitArray row, int payloadStart, int payloadEnd, StringBuilder resultString) throws com.google.zxing.NotFoundException
+ private static void decodeMiddle(BitArray row, int payloadStart, int payloadEnd, StringBuilder resultString)
+ {
+
+ // Digits are interleaved in pairs - 5 black lines for one digit, and the
+ // 5
+ // interleaved white lines for the second digit.
+ // Therefore, need to scan 10 lines and then
+ // split these into two arrays
+ int[] counterDigitPair = new int[10];
+ int[] counterBlack = new int[5];
+ int[] counterWhite = new int[5];
+
+ while (payloadStart < payloadEnd)
{
- int width = row.Size;
- int endStart = 0;
- while (endStart < width)
- {
- if (row.get_Renamed(endStart))
- {
- break;
- }
- endStart++;
- }
- if (endStart == width)
- {
- throw ReaderException.Instance;
- }
-
- return endStart;
+
+ // Get 10 runs of black/white.
+ recordPattern(row, payloadStart, counterDigitPair);
+ // Split them into each array
+ for (int k = 0; k < 5; k++)
+ {
+ int twoK = k << 1;
+ counterBlack[k] = counterDigitPair[twoK];
+ counterWhite[k] = counterDigitPair[twoK + 1];
+ }
+
+ int bestMatch = decodeDigit(counterBlack);
+ resultString.Append((char)('0' + bestMatch));
+ bestMatch = decodeDigit(counterWhite);
+ resultString.Append((char)('0' + bestMatch));
+
+ foreach (int counterDigit in counterDigitPair)
+ {
+ payloadStart += counterDigit;
+ }
}
-
- /// Identify where the end of the middle / payload section ends.
- ///
- ///
- /// row of black/white values to search
- ///
- /// Array, containing index of start of 'end block' and end of 'end
- /// block'
- ///
- /// ReaderException
-
- internal int[] decodeEnd(BitArray row)
+ }
+
+ ///
+ /// Identify where the start of the middle / payload section starts.
+ ///
+ /// row of black/white values to search
+ /// Array, containing index of start of 'start block' and end of
+ /// 'start block'
+ ///
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: int[] decodeStart(com.google.zxing.common.BitArray row) throws com.google.zxing.NotFoundException
+ internal int[] decodeStart(BitArray row)
+ {
+ int endStart = skipWhiteSpace(row);
+ int[] startPattern = findGuardPattern(row, endStart, START_PATTERN);
+
+ // Determine the width of a narrow line in pixels. We can do this by
+ // getting the width of the start pattern and dividing by 4 because its
+ // made up of 4 narrow lines.
+ this.narrowLineWidth = (startPattern[1] - startPattern[0]) >> 2;
+
+ validateQuietZone(row, startPattern[0]);
+
+ return startPattern;
+ }
+
+ ///
+ /// The start & end patterns must be pre/post fixed by a quiet zone. This
+ /// zone must be at least 10 times the width of a narrow line. Scan back until
+ /// we either get to the start of the barcode or match the necessary number of
+ /// quiet zone pixels.
+ ///
+ /// Note: Its assumed the row is reversed when using this method to find
+ /// quiet zone after the end pattern.
+ ///
+ /// ref: http://www.barcode-1.net/i25code.html
+ ///
+ /// bit array representing the scanned barcode.
+ /// index into row of the start or end pattern.
+ /// if the quiet zone cannot be found, a ReaderException is thrown.
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private void validateQuietZone(com.google.zxing.common.BitArray row, int startPattern) throws com.google.zxing.NotFoundException
+ private void validateQuietZone(BitArray row, int startPattern)
+ {
+
+ int quietCount = this.narrowLineWidth * 10; // expect to find this many pixels of quiet zone
+
+ for (int i = startPattern - 1; quietCount > 0 && i >= 0; i--)
{
-
- // For convenience, reverse the row and then
- // search from 'the start' for the end block
- row.reverse();
- try
- {
- int endStart = skipWhiteSpace(row);
- int[] endPattern = findGuardPattern(row, endStart, END_PATTERN_REVERSED);
-
- // The start & end patterns must be pre/post fixed by a quiet zone. This
- // zone must be at least 10 times the width of a narrow line.
- // ref: http://www.barcode-1.net/i25code.html
- validateQuietZone(row, endPattern[0]);
-
- // Now recalculate the indices of where the 'endblock' starts & stops to
- // accommodate
- // the reversed nature of the search
- int temp = endPattern[0];
- endPattern[0] = row.Size - endPattern[1];
- endPattern[1] = row.Size - temp;
-
- return endPattern;
- }
- finally
- {
- // Put the row back the right way.
- row.reverse();
- }
+ if (row.get(i))
+ {
+ break;
+ }
+ quietCount--;
}
-
- /// row of black/white values to search
- ///
- /// position to start search
- ///
- /// pattern of counts of number of black and white pixels that are
- /// being searched for as a pattern
- ///
- /// start/end horizontal offset of guard pattern, as an array of two
- /// ints
- ///
- /// ReaderException if pattern is not found
- private static int[] findGuardPattern(BitArray row, int rowOffset, int[] pattern)
+ if (quietCount != 0)
{
-
- // TODO: This is very similar to implementation in UPCEANReader. Consider if they can be
- // merged to a single method.
- int patternLength = pattern.Length;
- int[] counters = new int[patternLength];
- int width = row.Size;
- bool isWhite = false;
-
- int counterPosition = 0;
- int patternStart = rowOffset;
- for (int x = rowOffset; x < width; x++)
- {
- bool pixel = row.get_Renamed(x);
- if (pixel ^ isWhite)
- {
- counters[counterPosition]++;
- }
- else
- {
- if (counterPosition == patternLength - 1)
- {
- if (patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE)
- {
- return new int[]{patternStart, x};
- }
- patternStart += counters[0] + counters[1];
- for (int y = 2; y < patternLength; y++)
- {
- counters[y - 2] = counters[y];
- }
- counters[patternLength - 2] = 0;
- counters[patternLength - 1] = 0;
- counterPosition--;
- }
- else
- {
- counterPosition++;
- }
- counters[counterPosition] = 1;
- isWhite = !isWhite;
- }
- }
- throw ReaderException.Instance;
+ // Unable to find the necessary number of quiet zone pixels.
+ throw NotFoundException.NotFoundInstance;
}
-
- /// Attempts to decode a sequence of ITF black/white lines into single
- /// digit.
- ///
- ///
- /// the counts of runs of observed black/white/black/... values
- ///
- /// The decoded digit
- ///
- /// ReaderException if digit cannot be decoded
- private static int decodeDigit(int[] counters)
+ }
+
+ ///
+ /// Skip all whitespace until we get to the first black line.
+ ///
+ /// row of black/white values to search
+ /// index of the first black line.
+ /// Throws exception if no black lines are found in the row
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static int skipWhiteSpace(com.google.zxing.common.BitArray row) throws com.google.zxing.NotFoundException
+ private static int skipWhiteSpace(BitArray row)
+ {
+ int width = row.Size;
+ int endStart = row.getNextSet(0);
+ if (endStart == width)
{
-
- int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept
- int bestMatch = - 1;
- int max = PATTERNS.Length;
- for (int i = 0; i < max; i++)
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ return endStart;
+ }
+
+ ///
+ /// Identify where the end of the middle / payload section ends.
+ ///
+ /// row of black/white values to search
+ /// Array, containing index of start of 'end block' and end of 'end
+ /// block'
+ ///
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: int[] decodeEnd(com.google.zxing.common.BitArray row) throws com.google.zxing.NotFoundException
+ internal int[] decodeEnd(BitArray row)
+ {
+
+ // For convenience, reverse the row and then
+ // search from 'the start' for the end block
+ row.reverse();
+ try
+ {
+ int endStart = skipWhiteSpace(row);
+ int[] endPattern = findGuardPattern(row, endStart, END_PATTERN_REVERSED);
+
+ // The start & end patterns must be pre/post fixed by a quiet zone. This
+ // zone must be at least 10 times the width of a narrow line.
+ // ref: http://www.barcode-1.net/i25code.html
+ validateQuietZone(row, endPattern[0]);
+
+ // Now recalculate the indices of where the 'endblock' starts & stops to
+ // accommodate
+ // the reversed nature of the search
+ int temp = endPattern[0];
+ endPattern[0] = row.Size - endPattern[1];
+ endPattern[1] = row.Size - temp;
+
+ return endPattern;
+ }
+ finally
+ {
+ // Put the row back the right way.
+ row.reverse();
+ }
+ }
+
+ /// row of black/white values to search
+ /// position to start search
+ /// pattern of counts of number of black and white pixels that are
+ /// being searched for as a pattern
+ /// start/end horizontal offset of guard pattern, as an array of two
+ /// ints
+ /// if pattern is not found
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static int[] findGuardPattern(com.google.zxing.common.BitArray row, int rowOffset, int[] pattern) throws com.google.zxing.NotFoundException
+ private static int[] findGuardPattern(BitArray row, int rowOffset, int[] pattern)
+ {
+
+ // TODO: This is very similar to implementation in UPCEANReader. Consider if they can be
+ // merged to a single method.
+ int patternLength = pattern.Length;
+ int[] counters = new int[patternLength];
+ int width = row.Size;
+ bool isWhite = false;
+
+ int counterPosition = 0;
+ int patternStart = rowOffset;
+ for (int x = rowOffset; x < width; x++)
+ {
+ if (row.get(x) ^ isWhite)
+ {
+ counters[counterPosition]++;
+ }
+ else
+ {
+ if (counterPosition == patternLength - 1)
{
- int[] pattern = PATTERNS[i];
- int variance = patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE);
- if (variance < bestVariance)
- {
- bestVariance = variance;
- bestMatch = i;
- }
- }
- if (bestMatch >= 0)
- {
- return bestMatch;
+ if (patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE)
+ {
+ return new int[]{patternStart, x};
+ }
+ patternStart += counters[0] + counters[1];
+ Array.Copy(counters, 2, counters, 0, patternLength - 2);
+ counters[patternLength - 2] = 0;
+ counters[patternLength - 1] = 0;
+ counterPosition--;
}
else
{
- throw ReaderException.Instance;
+ counterPosition++;
}
+ counters[counterPosition] = 1;
+ isWhite = !isWhite;
+ }
}
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ ///
+ /// Attempts to decode a sequence of ITF black/white lines into single
+ /// digit.
+ ///
+ /// the counts of runs of observed black/white/black/... values
+ /// The decoded digit
+ /// if digit cannot be decoded
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private static int decodeDigit(int[] counters) throws com.google.zxing.NotFoundException
+ private static int decodeDigit(int[] counters)
+ {
+
+ int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept
+ int bestMatch = -1;
+ int max = PATTERNS.Length;
+ for (int i = 0; i < max; i++)
+ {
+ int[] pattern = PATTERNS[i];
+ int variance = patternMatchVariance(counters, pattern, MAX_INDIVIDUAL_VARIANCE);
+ if (variance < bestVariance)
+ {
+ bestVariance = variance;
+ bestMatch = i;
+ }
+ }
+ if (bestMatch >= 0)
+ {
+ return bestMatch;
+ }
+ else
+ {
+ throw NotFoundException.NotFoundInstance;
+ }
+ }
+
}
+
}
\ No newline at end of file
diff --git a/csharp/oned/MultiFormatOneDReader.cs b/csharp/oned/MultiFormatOneDReader.cs
index e058354de..f698f0bb6 100755
--- a/csharp/oned/MultiFormatOneDReader.cs
+++ b/csharp/oned/MultiFormatOneDReader.cs
@@ -1,89 +1,133 @@
+using System.Collections;
+using System.Collections.Generic;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using DecodeHintType = com.google.zxing.DecodeHintType;
-using ReaderException = com.google.zxing.ReaderException;
-using Result = com.google.zxing.Result;
-using BitArray = com.google.zxing.common.BitArray;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.oned
{
-
- /// dswitkin@google.com (Daniel Switkin)
- ///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class MultiFormatOneDReader:OneDReader
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using Reader = com.google.zxing.Reader;
+ using ReaderException = com.google.zxing.ReaderException;
+ using Result = com.google.zxing.Result;
+ using BitArray = com.google.zxing.common.BitArray;
+ using RSS14Reader = com.google.zxing.oned.rss.RSS14Reader;
+ using RSSExpandedReader = com.google.zxing.oned.rss.expanded.RSSExpandedReader;
+
+
+ ///
+ /// @author dswitkin@google.com (Daniel Switkin)
+ /// @author Sean Owen
+ ///
+ public sealed class MultiFormatOneDReader : OneDReader
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'readers '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.Collections.ArrayList readers;
-
- public MultiFormatOneDReader(System.Collections.Hashtable hints)
+
+ private readonly OneDReader[] readers;
+
+ public MultiFormatOneDReader(IDictionary hints)
+ {
+ //ICollection possibleFormats = hints == null ? null : (ICollection) hints[DecodeHintType.POSSIBLE_FORMATS];
+ ICollection possibleFormats = null;
+ if (hints !=null && hints.ContainsKey(DecodeHintType.POSSIBLE_FORMATS))
+ {
+ possibleFormats = (ICollection)hints[DecodeHintType.POSSIBLE_FORMATS];
+ }
+
+ //bool useCode39CheckDigit = hints != null && hints[DecodeHintType.ASSUME_CODE_39_CHECK_DIGIT] != null;
+ bool useCode39CheckDigit = hints != null && hints.ContainsKey(DecodeHintType.ASSUME_CODE_39_CHECK_DIGIT);
+ List readers = new List();
+ if (possibleFormats != null)
{
- System.Collections.ArrayList possibleFormats = hints == null?null:(System.Collections.ArrayList) hints[DecodeHintType.POSSIBLE_FORMATS];
- bool useCode39CheckDigit = hints != null && hints[DecodeHintType.ASSUME_CODE_39_CHECK_DIGIT] != null;
- readers = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10));
- if (possibleFormats != null)
- {
- if (possibleFormats.Contains(BarcodeFormat.EAN_13) || possibleFormats.Contains(BarcodeFormat.UPC_A) || possibleFormats.Contains(BarcodeFormat.EAN_8) || possibleFormats.Contains(BarcodeFormat.UPC_E))
- {
- readers.Add(new MultiFormatUPCEANReader(hints));
- }
- if (possibleFormats.Contains(BarcodeFormat.CODE_39))
- {
- readers.Add(new Code39Reader(useCode39CheckDigit));
- }
- if (possibleFormats.Contains(BarcodeFormat.CODE_128))
- {
- readers.Add(new Code128Reader());
- }
- if (possibleFormats.Contains(BarcodeFormat.ITF))
- {
- readers.Add(new ITFReader());
- }
- }
- if ((readers.Count == 0))
- {
- readers.Add(new MultiFormatUPCEANReader(hints));
- readers.Add(new Code39Reader());
- readers.Add(new Code128Reader());
- readers.Add(new ITFReader());
- }
+ if (possibleFormats.Contains(BarcodeFormat.EAN_13) || possibleFormats.Contains(BarcodeFormat.UPC_A) || possibleFormats.Contains(BarcodeFormat.EAN_8) || possibleFormats.Contains(BarcodeFormat.UPC_E))
+ {
+ readers.Add(new MultiFormatUPCEANReader(hints));
+ }
+ if (possibleFormats.Contains(BarcodeFormat.CODE_39))
+ {
+ readers.Add(new Code39Reader(useCode39CheckDigit));
+ }
+ if (possibleFormats.Contains(BarcodeFormat.CODE_93))
+ {
+ readers.Add(new Code93Reader());
+ }
+ if (possibleFormats.Contains(BarcodeFormat.CODE_128))
+ {
+ readers.Add(new Code128Reader());
+ }
+ if (possibleFormats.Contains(BarcodeFormat.ITF))
+ {
+ readers.Add(new ITFReader());
+ }
+ if (possibleFormats.Contains(BarcodeFormat.CODABAR))
+ {
+ readers.Add(new CodaBarReader());
+ }
+ if (possibleFormats.Contains(BarcodeFormat.RSS_14))
+ {
+ readers.Add(new RSS14Reader());
+ }
+ if (possibleFormats.Contains(BarcodeFormat.RSS_EXPANDED))
+ {
+ readers.Add(new RSSExpandedReader());
+ }
}
-
- public override Result decodeRow(int rowNumber, BitArray row, System.Collections.Hashtable hints)
+ if (readers.Count == 0)
{
- int size = readers.Count;
- for (int i = 0; i < size; i++)
- {
- OneDReader reader = (OneDReader) readers[i];
- try
- {
- return reader.decodeRow(rowNumber, row, hints);
- }
- catch (ReaderException)
- {
- // continue
- }
- }
-
- throw ReaderException.Instance;
+ readers.Add(new MultiFormatUPCEANReader(hints));
+ readers.Add(new Code39Reader());
+ readers.Add(new CodaBarReader());
+ readers.Add(new Code93Reader());
+ readers.Add(new Code128Reader());
+ readers.Add(new ITFReader());
+ readers.Add(new RSS14Reader());
+ readers.Add(new RSSExpandedReader());
}
+ this.readers = readers.ToArray(/*new OneDReader[readers.Count]*/);
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decodeRow(int rowNumber, com.google.zxing.common.BitArray row, java.util.Map hints) throws com.google.zxing.NotFoundException
+ public override Result decodeRow(int rowNumber, BitArray row, IDictionary hints)
+ {
+ foreach (OneDReader reader in readers)
+ {
+ try
+ {
+ return reader.decodeRow(rowNumber, row, hints);
+ }
+ catch (ReaderException re)
+ {
+ // continue
+ }
+ }
+
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ public override void reset()
+ {
+ foreach (Reader reader in readers)
+ {
+ reader.reset();
+ }
+ }
+
}
-}
+
+}
\ No newline at end of file
diff --git a/csharp/oned/MultiFormatUPCEANReader.cs b/csharp/oned/MultiFormatUPCEANReader.cs
index fa12ac51b..e0e435be4 100755
--- a/csharp/oned/MultiFormatUPCEANReader.cs
+++ b/csharp/oned/MultiFormatUPCEANReader.cs
@@ -1,109 +1,144 @@
+using System.Collections;
+using System.Collections.Generic;
+
/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-using System;
-using BarcodeFormat = com.google.zxing.BarcodeFormat;
-using DecodeHintType = com.google.zxing.DecodeHintType;
-using ReaderException = com.google.zxing.ReaderException;
-using Result = com.google.zxing.Result;
-using BitArray = com.google.zxing.common.BitArray;
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.oned
{
-
- /// A reader that can read all available UPC/EAN formats. If a caller wants to try to
+
+ using BarcodeFormat = com.google.zxing.BarcodeFormat;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using Reader = com.google.zxing.Reader;
+ using ReaderException = com.google.zxing.ReaderException;
+ using Result = com.google.zxing.Result;
+ using BitArray = com.google.zxing.common.BitArray;
+
+
+ ///
+ /// A reader that can read all available UPC/EAN formats. If a caller wants to try to
/// read all such formats, it is most efficient to use this implementation rather than invoke
/// individual readers.
///
+ /// @author Sean Owen
///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public sealed class MultiFormatUPCEANReader:OneDReader
+ public sealed class MultiFormatUPCEANReader : OneDReader
{
-
- //UPGRADE_NOTE: Final was removed from the declaration of 'readers '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- private System.Collections.ArrayList readers;
-
- public MultiFormatUPCEANReader(System.Collections.Hashtable hints)
+
+ private readonly UPCEANReader[] readers;
+
+ public MultiFormatUPCEANReader(IDictionary hints)
+ {
+ //ICollection possibleFormats = hints == null ? null : (ICollection) hints[DecodeHintType.POSSIBLE_FORMATS];
+ ICollection possibleFormats = null;
+ if (hints != null && hints.ContainsKey(DecodeHintType.POSSIBLE_FORMATS))
+ {
+ possibleFormats = (ICollection)hints[DecodeHintType.POSSIBLE_FORMATS];
+ }
+ List readers = new List();
+ if (possibleFormats != null)
{
- System.Collections.ArrayList possibleFormats = hints == null?null:(System.Collections.ArrayList) hints[DecodeHintType.POSSIBLE_FORMATS];
- readers = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10));
- if (possibleFormats != null)
- {
- if (possibleFormats.Contains(BarcodeFormat.EAN_13))
- {
- readers.Add(new EAN13Reader());
- }
- else if (possibleFormats.Contains(BarcodeFormat.UPC_A))
- {
- readers.Add(new UPCAReader());
- }
- if (possibleFormats.Contains(BarcodeFormat.EAN_8))
- {
- readers.Add(new EAN8Reader());
- }
- if (possibleFormats.Contains(BarcodeFormat.UPC_E))
- {
- readers.Add(new UPCEReader());
- }
- }
- if ((readers.Count == 0))
- {
- readers.Add(new EAN13Reader());
- // UPC-A is covered by EAN-13
- readers.Add(new EAN8Reader());
- readers.Add(new UPCEReader());
- }
+ if (possibleFormats.Contains(BarcodeFormat.EAN_13))
+ {
+ readers.Add(new EAN13Reader());
+ }
+ else if (possibleFormats.Contains(BarcodeFormat.UPC_A))
+ {
+ readers.Add(new UPCAReader());
+ }
+ if (possibleFormats.Contains(BarcodeFormat.EAN_8))
+ {
+ readers.Add(new EAN8Reader());
+ }
+ if (possibleFormats.Contains(BarcodeFormat.UPC_E))
+ {
+ readers.Add(new UPCEReader());
+ }
}
-
- public override Result decodeRow(int rowNumber, BitArray row, System.Collections.Hashtable hints)
+ if (readers.Count == 0)
{
- // Compute this location once and reuse it on multiple implementations
- int[] startGuardPattern = UPCEANReader.findStartGuardPattern(row);
- int size = readers.Count;
- for (int i = 0; i < size; i++)
- {
- UPCEANReader reader = (UPCEANReader) readers[i];
- Result result;
- try
- {
- result = reader.decodeRow(rowNumber, row, startGuardPattern, hints);
- }
- catch (ReaderException)
- {
- continue;
- }
- // Special case: a 12-digit code encoded in UPC-A is identical to a "0"
- // followed by those 12 digits encoded as EAN-13. Each will recognize such a code,
- // UPC-A as a 12-digit string and EAN-13 as a 13-digit string starting with "0".
- // Individually these are correct and their readers will both read such a code
- // and correctly call it EAN-13, or UPC-A, respectively.
- //
- // In this case, if we've been looking for both types, we'd like to call it
- // a UPC-A code. But for efficiency we only run the EAN-13 decoder to also read
- // UPC-A. So we special case it here, and convert an EAN-13 result to a UPC-A
- // result if appropriate.
- if (result.BarcodeFormat.Equals(BarcodeFormat.EAN_13) && result.Text[0] == '0')
- {
- return new Result(result.Text.Substring(1), null, result.ResultPoints, BarcodeFormat.UPC_A);
- }
- return result;
- }
-
- throw ReaderException.Instance;
+ readers.Add(new EAN13Reader());
+ // UPC-A is covered by EAN-13
+ readers.Add(new EAN8Reader());
+ readers.Add(new UPCEReader());
}
+ this.readers = readers.ToArray(/*new UPCEANReader[readers.Count]*/);
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decodeRow(int rowNumber, com.google.zxing.common.BitArray row, java.util.Map hints) throws com.google.zxing.NotFoundException
+ public override Result decodeRow(int rowNumber, BitArray row, IDictionary hints)
+ {
+ // Compute this location once and reuse it on multiple implementations
+ int[] startGuardPattern = UPCEANReader.findStartGuardPattern(row);
+ foreach (UPCEANReader reader in readers)
+ {
+ Result result;
+ try
+ {
+ result = reader.decodeRow(rowNumber, row, startGuardPattern, hints);
+ }
+ catch (ReaderException re)
+ {
+ continue;
+ }
+ // Special case: a 12-digit code encoded in UPC-A is identical to a "0"
+ // followed by those 12 digits encoded as EAN-13. Each will recognize such a code,
+ // UPC-A as a 12-digit string and EAN-13 as a 13-digit string starting with "0".
+ // Individually these are correct and their readers will both read such a code
+ // and correctly call it EAN-13, or UPC-A, respectively.
+ //
+ // In this case, if we've been looking for both types, we'd like to call it
+ // a UPC-A code. But for efficiency we only run the EAN-13 decoder to also read
+ // UPC-A. So we special case it here, and convert an EAN-13 result to a UPC-A
+ // result if appropriate.
+ //
+ // But, don't return UPC-A if UPC-A was not a requested format!
+ bool ean13MayBeUPCA = result.BarcodeFormat == BarcodeFormat.EAN_13 && result.Text[0] == '0';
+ //ICollection possibleFormats = hints == null ? null : (ICollection) hints[DecodeHintType.POSSIBLE_FORMATS];
+ ICollection possibleFormats = null;
+ if (hints != null && hints.ContainsKey(DecodeHintType.POSSIBLE_FORMATS))
+ {
+ possibleFormats = (ICollection)hints[DecodeHintType.POSSIBLE_FORMATS];
+ }
+
+ bool canReturnUPCA = possibleFormats == null || possibleFormats.Contains(BarcodeFormat.UPC_A);
+
+ if (ean13MayBeUPCA && canReturnUPCA)
+ {
+ // Transfer the metdata across
+ Result resultUPCA = new Result(result.Text.Substring(1), result.RawBytes, result.ResultPoints, BarcodeFormat.UPC_A);
+ resultUPCA.putAllMetadata(result.ResultMetadata);
+ return resultUPCA;
+ }
+ return result;
+ }
+
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ public override void reset()
+ {
+ foreach (Reader reader in readers)
+ {
+ reader.reset();
+ }
+ }
+
}
-}
+
+}
\ No newline at end of file
diff --git a/csharp/oned/OneDReader.cs b/csharp/oned/OneDReader.cs
index a3d6ccee1..c33d7f63e 100755
--- a/csharp/oned/OneDReader.cs
+++ b/csharp/oned/OneDReader.cs
@@ -1,332 +1,368 @@
-/*
-* Copyright 2008 ZXing authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
using System;
-using BinaryBitmap = com.google.zxing.BinaryBitmap;
-using DecodeHintType = com.google.zxing.DecodeHintType;
-using Reader = com.google.zxing.Reader;
-using ReaderException = com.google.zxing.ReaderException;
-using Result = com.google.zxing.Result;
-using ResultMetadataType = com.google.zxing.ResultMetadataType;
-using ResultPoint = com.google.zxing.ResultPoint;
-using BitArray = com.google.zxing.common.BitArray;
+using System.Collections;
+using System.Collections.Generic;
+
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
namespace com.google.zxing.oned
{
-
- /// Encapsulates functionality and implementation that is common to all families
+
+ using BinaryBitmap = com.google.zxing.BinaryBitmap;
+ using ChecksumException = com.google.zxing.ChecksumException;
+ using DecodeHintType = com.google.zxing.DecodeHintType;
+ using FormatException = com.google.zxing.FormatException;
+ using NotFoundException = com.google.zxing.NotFoundException;
+ using Reader = com.google.zxing.Reader;
+ using ReaderException = com.google.zxing.ReaderException;
+ using Result = com.google.zxing.Result;
+ using ResultMetadataType = com.google.zxing.ResultMetadataType;
+ using ResultPoint = com.google.zxing.ResultPoint;
+ using BitArray = com.google.zxing.common.BitArray;
+
+
+ ///
+ /// Encapsulates functionality and implementation that is common to all families
/// of one-dimensional barcodes.
///
+ /// @author dswitkin@google.com (Daniel Switkin)
+ /// @author Sean Owen
///
- /// dswitkin@google.com (Daniel Switkin)
- ///
- /// Sean Owen
- ///
- /// www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source
- ///
- public abstract class OneDReader : Reader
+ public abstract class OneDReader : com.google.zxing.Reader
{
-
- private const int INTEGER_MATH_SHIFT = 8;
- //UPGRADE_NOTE: Final was removed from the declaration of 'PATTERN_MATCH_RESULT_SCALE_FACTOR '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"
- internal static readonly int PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << INTEGER_MATH_SHIFT;
-
- public virtual Result decode(BinaryBitmap image)
+
+ protected internal const int INTEGER_MATH_SHIFT = 8;
+ protected internal static readonly int PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << INTEGER_MATH_SHIFT;
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decode(com.google.zxing.BinaryBitmap image) throws com.google.zxing.NotFoundException, com.google.zxing.FormatException
+ public virtual Result decode(BinaryBitmap image)
+ {
+ return decode(image, null);
+ }
+
+ // Note that we don't try rotation without the try harder flag, even if rotation was supported.
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: public com.google.zxing.Result decode(com.google.zxing.BinaryBitmap image, java.util.Map hints) throws com.google.zxing.NotFoundException, com.google.zxing.FormatException
+ public virtual Result decode(BinaryBitmap image, IDictionary hints)
+ {
+ try
{
- return decode(image, null);
+ return doDecode(image, hints);
}
-
- // Note that we don't try rotation without the try harder flag, even if rotation was supported.
- public virtual Result decode(BinaryBitmap image, System.Collections.Hashtable hints)
+ catch (NotFoundException nfe)
{
+ bool tryHarder = hints != null && hints.ContainsKey(DecodeHintType.TRY_HARDER);
+ if (tryHarder && image.RotateSupported)
+ {
+ BinaryBitmap rotatedImage = image.rotateCounterClockwise();
+ Result result = doDecode(rotatedImage, hints);
+ // Record that we found it rotated 90 degrees CCW / 270 degrees CW
+//JAVA TO C# CONVERTER TODO TASK: Java wildcard generics are not converted to .NET:
+//ORIGINAL LINE: java.util.Map metadata = result.getResultMetadata();
+ IDictionary metadata = result.ResultMetadata;
+ int orientation = 270;
+ if (metadata != null && metadata.ContainsKey(ResultMetadataType.ORIENTATION))
+ {
+ // But if we found it reversed in doDecode(), add in that result here:
+ orientation = (orientation + (int) metadata[ResultMetadataType.ORIENTATION]) % 360;
+ }
+ result.putMetadata(ResultMetadataType.ORIENTATION, orientation);
+ // Update result points
+ ResultPoint[] points = result.ResultPoints;
+ if (points != null)
+ {
+ int height = rotatedImage.Height;
+ for (int i = 0; i < points.Length; i++)
+ {
+ points[i] = new ResultPoint(height - points[i].Y - 1, points[i].X);
+ }
+ }
+ return result;
+ }
+ else
+ {
+ throw nfe;
+ }
+ }
+ }
+
+ public virtual void reset()
+ {
+ // do nothing
+ }
+
+ ///
+ /// We're going to examine rows from the middle outward, searching alternately above and below the
+ /// middle, and farther out each time. rowStep is the number of rows between each successive
+ /// attempt above and below the middle. So we'd scan row middle, then middle - rowStep, then
+ /// middle + rowStep, then middle - (2 * rowStep), etc.
+ /// rowStep is bigger as the image is taller, but is always at least 1. We've somewhat arbitrarily
+ /// decided that moving up and down by about 1/16 of the image is pretty good; we try more of the
+ /// image if "trying harder".
+ ///
+ /// The image to decode
+ /// Any hints that were requested
+ /// The contents of the decoded barcode
+ /// Any spontaneous errors which occur
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: private com.google.zxing.Result doDecode(com.google.zxing.BinaryBitmap image, java.util.Map hints) throws com.google.zxing.NotFoundException
+ private Result doDecode(BinaryBitmap image, IDictionary hints)
+ {
+ int width = image.Width;
+ int height = image.Height;
+ BitArray row = new BitArray(width);
+
+ int middle = height >> 1;
+ bool tryHarder = hints != null && hints.ContainsKey(DecodeHintType.TRY_HARDER);
+ int rowStep = Math.Max(1, height >> (tryHarder ? 8 : 5));
+ int maxLines;
+ if (tryHarder)
+ {
+ maxLines = height; // Look at the whole image, not just the center
+ }
+ else
+ {
+ maxLines = 15; // 15 rows spaced 1/32 apart is roughly the middle half of the image
+ }
+
+ for (int x = 0; x < maxLines; x++)
+ {
+
+ // Scanning from the middle out. Determine which row we're looking at next:
+ int rowStepsAboveOrBelow = (x + 1) >> 1;
+ bool isAbove = (x & 0x01) == 0; // i.e. is x even?
+ int rowNumber = middle + rowStep * (isAbove ? rowStepsAboveOrBelow : -rowStepsAboveOrBelow);
+ if (rowNumber < 0 || rowNumber >= height)
+ {
+ // Oops, if we run off the top or bottom, stop
+ break;
+ }
+
+ // Estimate black point for this row and load it:
+ try
+ {
+ row = image.getBlackRow(rowNumber, row);
+ }
+ catch (NotFoundException nfe)
+ {
+ continue;
+ }
+
+ // While we have the image data in a BitArray, it's fairly cheap to reverse it in place to
+ // handle decoding upside down barcodes.
+ for (int attempt = 0; attempt < 2; attempt++)
+ {
+ if (attempt == 1) // trying again?
+ {
+ row.reverse(); // reverse the row and continue
+ // This means we will only ever draw result points *once* in the life of this method
+ // since we want to avoid drawing the wrong points after flipping the row, and,
+ // don't want to clutter with noise from every single row scan -- just the scans
+ // that start on the center line.
+ if (hints != null && hints.ContainsKey(DecodeHintType.NEED_RESULT_POINT_CALLBACK))
+ {
+ //IDictionary newHints = new EnumMap(typeof(DecodeHintType));
+ Dictionary newHints = new Dictionary();
+//JAVA TO C# CONVERTER TODO TASK: There is no .NET Dictionary equivalent to the Java 'putAll' method:
+ //newHints.putAll(hints);
+ //foreach (DecodeHintType dht in Enum.GetValues(typeof(DecodeHintType)))
+ //{
+ // newHints.Add(dht,dht);
+ //}
+ foreach (KeyValuePair kvp in hints)
+ {
+ newHints.Add(kvp.Key,kvp.Value);
+ }
+
+ if (newHints.ContainsKey(DecodeHintType.NEED_RESULT_POINT_CALLBACK))
+ {
+ newHints.Remove(DecodeHintType.NEED_RESULT_POINT_CALLBACK);
+ }
+ hints = newHints;
+ }
+ }
try
{
- return doDecode(image, hints);
+ // Look for a barcode
+ Result result = decodeRow(rowNumber, row, hints);
+ // We found our barcode
+ if (attempt == 1)
+ {
+ // But it was upside down, so note that
+ result.putMetadata(ResultMetadataType.ORIENTATION, 180);
+ // And remember to flip the result points horizontally.
+ ResultPoint[] points = result.ResultPoints;
+ if (points != null)
+ {
+ points[0] = new ResultPoint(width - points[0].X - 1, points[0].Y);
+ points[1] = new ResultPoint(width - points[1].X - 1, points[1].Y);
+ }
+ }
+ return result;
}
catch (ReaderException re)
{
- bool tryHarder = hints != null && hints.ContainsKey(DecodeHintType.TRY_HARDER);
- if (tryHarder && image.RotateSupported)
- {
- BinaryBitmap rotatedImage = image.rotateCounterClockwise();
- Result result = doDecode(rotatedImage, hints);
- // Record that we found it rotated 90 degrees CCW / 270 degrees CW
- System.Collections.Hashtable metadata = result.ResultMetadata;
- int orientation = 270;
- if (metadata != null && metadata.ContainsKey(ResultMetadataType.ORIENTATION))
- {
- // But if we found it reversed in doDecode(), add in that result here:
- orientation = (orientation + ((System.Int32) metadata[ResultMetadataType.ORIENTATION])) % 360;
- }
- result.putMetadata(ResultMetadataType.ORIENTATION, (System.Object) orientation);
- // Update result points
- ResultPoint[] points = result.ResultPoints;
- int height = rotatedImage.Height;
- for (int i = 0; i < points.Length; i++)
- {
- points[i] = new ResultPoint(height - points[i].Y - 1, points[i].X);
- }
- return result;
- }
- else
- {
- throw re;
- }
+ // continue -- just couldn't decode this row
}
+ }
}
-
- /// We're going to examine rows from the middle outward, searching alternately above and below the
- /// middle, and farther out each time. rowStep is the number of rows between each successive
- /// attempt above and below the middle. So we'd scan row middle, then middle - rowStep, then
- /// middle + rowStep, then middle - (2 * rowStep), etc.
- /// rowStep is bigger as the image is taller, but is always at least 1. We've somewhat arbitrarily
- /// decided that moving up and down by about 1/16 of the image is pretty good; we try more of the
- /// image if "trying harder".
- ///
- ///
- /// The image to decode
- ///
- /// Any hints that were requested
- ///
- /// The contents of the decoded barcode
- ///
- /// ReaderException Any spontaneous errors which occur
- private Result doDecode(BinaryBitmap image, System.Collections.Hashtable hints)
+
+ throw NotFoundException.NotFoundInstance;
+ }
+
+ ///
+ /// Records the size of successive runs of white and black pixels in a row, starting at a given point.
+ /// The values are recorded in the given array, and the number of runs recorded is equal to the size
+ /// of the array. If the row starts on a white pixel at the given start point, then the first count
+ /// recorded is the run of white pixels starting from that point; likewise it is the count of a run
+ /// of black pixels if the row begin on a black pixels at that point.
+ ///
+ /// row to count from
+ /// offset into row to start at
+ /// array into which to record counts
+ /// if counters cannot be filled entirely from row before running out
+ /// of pixels
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: protected static void recordPattern(com.google.zxing.common.BitArray row, int start, int[] counters) throws com.google.zxing.NotFoundException
+ protected internal static void recordPattern(BitArray row, int start, int[] counters)
+ {
+ int numCounters = counters.Length;
+ //Arrays.fill(counters, 0, numCounters, 0);
+ counters.Fill(0);
+ int end = row.Size;
+ if (start >= end)
{
- int width = image.Width;
- int height = image.Height;
- BitArray row = new BitArray(width);
-
- int middle = height >> 1;
- bool tryHarder = hints != null && hints.ContainsKey(DecodeHintType.TRY_HARDER);
- int rowStep = System.Math.Max(1, height >> (tryHarder?7:4));
- int maxLines;
- if (tryHarder)
+ throw NotFoundException.NotFoundInstance;
+ }
+ bool isWhite = !row.get(start);
+ int counterPosition = 0;
+ int i = start;
+ while (i < end)
+ {
+ if (row.get(i) ^ isWhite) // that is, exactly one is true
+ {
+ counters[counterPosition]++;
+ }
+ else
+ {
+ counterPosition++;
+ if (counterPosition == numCounters)
{
- maxLines = height; // Look at the whole image, not just the center
+ break;
}
else
{
- maxLines = 9; // Nine rows spaced 1/16 apart is roughly the middle half of the image
+ counters[counterPosition] = 1;
+ isWhite = !isWhite;
}
-
- for (int x = 0; x < maxLines; x++)
- {
-
- // Scanning from the middle out. Determine which row we're looking at next:
- int rowStepsAboveOrBelow = (x + 1) >> 1;
- bool isAbove = (x & 0x01) == 0; // i.e. is x even?
- int rowNumber = middle + rowStep * (isAbove?rowStepsAboveOrBelow:- rowStepsAboveOrBelow);
- if (rowNumber < 0 || rowNumber >= height)
- {
- // Oops, if we run off the top or bottom, stop
- break;
- }
-
- // Estimate black point for this row and load it:
- try
- {
- row = image.getBlackRow(rowNumber, row);
- }
- catch (ReaderException)
- {
- continue;
- }
-
- // While we have the image data in a BitArray, it's fairly cheap to reverse it in place to
- // handle decoding upside down barcodes.
- for (int attempt = 0; attempt < 2; attempt++)
- {
- if (attempt == 1)
- {
- // trying again?
- row.reverse(); // reverse the row and continue
- // This means we will only ever draw result points *once* in the life of this method
- // since we want to avoid drawing the wrong points after flipping the row, and,
- // don't want to clutter with noise from every single row scan -- just the scans
- // that start on the center line.
- if (hints != null && hints.ContainsKey(DecodeHintType.NEED_RESULT_POINT_CALLBACK))
- {
- System.Collections.Hashtable newHints = System.Collections.Hashtable.Synchronized(new System.Collections.Hashtable()); // Can't use clone() in J2ME
- System.Collections.IEnumerator hintEnum = hints.Keys.GetEnumerator();
- //UPGRADE_TODO: Method 'java.util.Enumeration.hasMoreElements' was converted to 'System.Collections.IEnumerator.MoveNext' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javautilEnumerationhasMoreElements'"
- while (hintEnum.MoveNext())
- {
- //UPGRADE_TODO: Method 'java.util.Enumeration.nextElement' was converted to 'System.Collections.IEnumerator.Current' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073_javautilEnumerationnextElement'"
- System.Object key = hintEnum.Current;
- if (!key.Equals(DecodeHintType.NEED_RESULT_POINT_CALLBACK))
- {
- newHints[key] = hints[key];
- }
- }
- hints = newHints;
- }
- }
- try
- {
- // Look for a barcode
- Result result = decodeRow(rowNumber, row, hints);
- // We found our barcode
- if (attempt == 1)
- {
- // But it was upside down, so note that
- result.putMetadata(ResultMetadataType.ORIENTATION, (System.Object) 180);
- // And remember to flip the result points horizontally.
- ResultPoint[] points = result.ResultPoints;
- points[0] = new ResultPoint(width - points[0].X - 1, points[0].Y);
- points[1] = new ResultPoint(width - points[1].X - 1, points[1].Y);
- }
- return result;
- }
- catch (ReaderException)
- {
- // continue -- just couldn't decode this row
- }
- }
- }
-
- throw ReaderException.Instance;
+ }
+ i++;
}
-
- /// Records the size of successive runs of white and black pixels in a row, starting at a given point.
- /// The values are recorded in the given array, and the number of runs recorded is equal to the size
- /// of the array. If the row starts on a white pixel at the given start point, then the first count
- /// recorded is the run of white pixels starting from that point; likewise it is the count of a run
- /// of black pixels if the row begin on a black pixels at that point.
- ///
- ///
- /// row to count from
- ///
- /// offset into row to start at
- ///
- /// array into which to record counts
- ///
- /// ReaderException if counters cannot be filled entirely from row before running out
- /// of pixels
- ///
- internal static void recordPattern(BitArray row, int start, int[] counters)
+ // If we read fully the last section of pixels and filled up our counters -- or filled
+ // the last counter but ran off the side of the image, OK. Otherwise, a problem.
+ if (!(counterPosition == numCounters || (counterPosition == numCounters - 1 && i == end)))
{
- int numCounters = counters.Length;
- for (int i = 0; i < numCounters; i++)
- {
- counters[i] = 0;
- }
- int end = row.Size;
- if (start >= end)
- {
- throw ReaderException.Instance;
- }
- bool isWhite = !row.get_Renamed(start);
- int counterPosition = 0;
- int i2 = start;
- while (i2 < end)
- {
- bool pixel = row.get_Renamed(i2);
- if (pixel ^ isWhite)
- {
- // that is, exactly one is true
- counters[counterPosition]++;
- }
- else
- {
- counterPosition++;
- if (counterPosition == numCounters)
- {
- break;
- }
- else
- {
- counters[counterPosition] = 1;
- isWhite ^= true; // isWhite = !isWhite;
- }
- }
- i2++;
- }
- // If we read fully the last section of pixels and filled up our counters -- or filled
- // the last counter but ran off the side of the image, OK. Otherwise, a problem.
- if (!(counterPosition == numCounters || (counterPosition == numCounters - 1 && i2 == end)))
- {
- throw ReaderException.Instance;
- }
+ throw NotFoundException.NotFoundInstance;
}
-
- /// Determines how closely a set of observed counts of runs of black/white values matches a given
- /// target pattern. This is reported as the ratio of the total variance from the expected pattern
- /// proportions across all pattern elements, to the length of the pattern.
- ///
- ///
- /// observed counters
- ///
- /// expected pattern
- ///
- /// The most any counter can differ before we give up
- ///
- /// ratio of total variance between counters and pattern compared to total pattern size,
- /// where the ratio has been multiplied by 256. So, 0 means no variance (perfect match); 256 means
- /// the total variance between counters and patterns equals the pattern length, higher values mean
- /// even more variance
- ///
- internal static int patternMatchVariance(int[] counters, int[] pattern, int maxIndividualVariance)
+ }
+
+//JAVA TO C# CONVERTER WARNING: Method 'throws' clauses are not available in .NET:
+//ORIGINAL LINE: protected static void recordPatternInReverse(com.google.zxing.common.BitArray row, int start, int[] counters) throws com.google.zxing.NotFoundException
+ protected internal static void recordPatternInReverse(BitArray row, int start, int[] counters)
+ {
+ // This could be more efficient I guess
+ int numTransitionsLeft = counters.Length;
+ bool last = row.get(start);
+ while (start > 0 && numTransitionsLeft >= 0)
{
- int numCounters = counters.Length;
- int total = 0;
- int patternLength = 0;
- for (int i = 0; i < numCounters; i++)
- {
- total += counters[i];
- patternLength += pattern[i];
- }
- if (total < patternLength)
- {
- // If we don't even have one pixel per unit of bar width, assume this is too small
- // to reliably match, so fail:
- return System.Int32.MaxValue;
- }
- // We're going to fake floating-point math in integers. We just need to use more bits.
- // Scale up patternLength so that intermediate values below like scaledCounter will have
- // more "significant digits"
- int unitBarWidth = (total << INTEGER_MATH_SHIFT) / patternLength;
- maxIndividualVariance = (maxIndividualVariance * unitBarWidth) >> INTEGER_MATH_SHIFT;
-
- int totalVariance = 0;
- for (int x = 0; x < numCounters; x++)
- {
- int counter = counters[x] << INTEGER_MATH_SHIFT;
- int scaledPattern = pattern[x] * unitBarWidth;
- int variance = counter > scaledPattern?counter - scaledPattern:scaledPattern - counter;
- if (variance > maxIndividualVariance)
- {
- return System.Int32.MaxValue;
- }
- totalVariance += variance;
- }
- return totalVariance / total;
+ if (row.get(--start) != last)
+ {
+ numTransitionsLeft--;
+ last = !last;
+ }
}
-
- ///