Preserve query in geo URI

[zxing.git] / csharp / common / DecoderResult.cs

diff --git a/csharp/common/DecoderResult.cs b/csharp/common/DecoderResult.cs
index ad3c81a..8cbf31a 100755 (executable)
--- a/csharp/common/DecoderResult.cs
+++ b/csharp/common/DecoderResult.cs
@@ -1,5 +1,5 @@
-/*\r
-* Copyright 2008 ZXing authors\r
+/*\r
+* Copyright 2007 ZXing authors\r
 *\r
 * Licensed under the Apache License, Version 2.0 (the "License");\r
 * you may not use this file except in compliance with the License.\r
@@ -13,51 +13,74 @@
 * See the License for the specific language governing permissions and\r
 * limitations under the License.\r
 */\r
+using System;\r
+using ErrorCorrectionLevel = com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;\r
 namespace com.google.zxing.common\r
 {\r
-    using System;\r
-    using System.Text;\r
-\r
-    /// <summary> A class which wraps a 2D array of bytes. The default usage is signed. If you want to use it as a\r
-    /// unsigned container, it's up to you to do byteValue & 0xff at each location.\r
-    /// *\r
-    /// JAVAPORT: I'm not happy about the argument ordering throughout the file, as I always like to have\r
-    /// the horizontal component first, but this is for compatibility with the C++ code. The original\r
-    /// code was a 2D array of ints, but since it only ever gets assigned -1, 0, and 1, I'm going to use\r
-    /// less memory and go with bytes.\r
-    /// *\r
-    /// </summary>\r
-    /// <author>  dswitkin@google.com (Daniel Switkin)\r
-    /// \r
-    /// </author>\r
-    public sealed class DecoderResult\r
-    {\r
-          private sbyte[] rawBytes;\r
-          private String text;\r
-          private System.Collections.ArrayList byteSegments;\r
-\r
-          public DecoderResult(sbyte[] rawBytes, String text, System.Collections.ArrayList byteSegments)\r
-          {\r
-            if (rawBytes == null && text == null) {\r
-              throw new Exception();\r
-            }\r
-            this.rawBytes = rawBytes;\r
-            this.text = text;\r
-            this.byteSegments = byteSegments;\r
-          }\r
-\r
-          public sbyte[] getRawBytes() {\r
-            return this.rawBytes;\r
-          }\r
-\r
-          public String getText() {\r
-            return text;\r
-          }\r
-\r
-          public System.Collections.ArrayList getByteSegments()\r
-          {\r
-            return byteSegments;\r
-          }\r
-    \r
-    }\r
+       \r
+       /// <summary> <p>Encapsulates the result of decoding a matrix of bits. This typically\r
+       /// applies to 2D barcode formats. For now it contains the raw bytes obtained,\r
+       /// as well as a String interpretation of those bytes, if applicable.</p>\r
+       /// \r
+       /// </summary>\r
+       /// <author>  Sean Owen\r
+       /// </author>\r
+       /// <author>www.Redivivus.in (suraj.supekar@redivivus.in) - Ported from ZXING Java Source \r
+       /// </author>\r
+       public sealed class DecoderResult\r
+       {\r
+               public sbyte[] RawBytes\r
+               {\r
+                       get\r
+                       {\r
+                               return rawBytes;\r
+                       }\r
+                       \r
+               }\r
+               public System.String Text\r
+               {\r
+                       get\r
+                       {\r
+                               return text;\r
+                       }\r
+                       \r
+               }\r
+               public System.Collections.ArrayList ByteSegments\r
+               {\r
+                       get\r
+                       {\r
+                               return byteSegments;\r
+                       }\r
+                       \r
+               }\r
+               public ErrorCorrectionLevel ECLevel\r
+               {\r
+                       get\r
+                       {\r
+                               return ecLevel;\r
+                       }\r
+                       \r
+               }\r
+               \r
+               //UPGRADE_NOTE: Final was removed from the declaration of 'rawBytes '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"\r
+               private sbyte[] rawBytes;\r
+               //UPGRADE_NOTE: Final was removed from the declaration of 'text '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"\r
+               private System.String text;\r
+               //UPGRADE_NOTE: Final was removed from the declaration of 'byteSegments '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"\r
+               private System.Collections.ArrayList byteSegments;\r
+               //UPGRADE_NOTE: Final was removed from the declaration of 'ecLevel '. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1003'"\r
+               private ErrorCorrectionLevel ecLevel;\r
+               \r
+               public DecoderResult(sbyte[] rawBytes, System.String text, System.Collections.ArrayList byteSegments, ErrorCorrectionLevel ecLevel)\r
+               {\r
+                       if (rawBytes == null && text == null)\r
+                       {\r
+                               throw new System.ArgumentException();\r
+                       }\r
+                       this.rawBytes = rawBytes;\r
+                       this.text = text;\r
+                       this.byteSegments = byteSegments;\r
+                       this.ecLevel = ecLevel;\r
+               }\r
+       }\r
 }
\ No newline at end of file