C# port, add datamatrix code

[zxing.git] / csharp / MultiFormatReader.cs

diff --git a/csharp/MultiFormatReader.cs b/csharp/MultiFormatReader.cs
index 0fed777..74a04ed 100755 (executable)
--- a/csharp/MultiFormatReader.cs
+++ b/csharp/MultiFormatReader.cs
@@ -14,7 +14,9 @@
 \r
 using System;\r
 using System.Collections;\r
-using com.google.zxing.qrcode;  \r
+using com.google.zxing.qrcode;\r
+using com.google.zxing.oned;\r
+using com.google.zxing.datamatrix;\r
 \r
 namespace com.google.zxing\r
 {\r
@@ -106,7 +108,7 @@ namespace com.google.zxing
 \r
                   if (addOneDReader && !tryHarder)\r
                   {\r
-                      //readers.Add(new MultiFormatOneDReader(hints));\r
+                      readers.Add(new MultiFormatOneDReader(hints));\r
                   }\r
 \r
                   if (possibleFormats.Contains(BarcodeFormat.QR_CODE))\r
@@ -114,13 +116,13 @@ namespace com.google.zxing
                       readers.Add(new QRCodeReader());\r
                   }\r
                   // TODO re-enable once Data Matrix is ready\r
-                  //if (possibleFormats.contains(BarcodeFormat.DATAMATRIX)) {\r
-                  //  readers.addElement(new DataMatrixReader());\r
-                  //}\r
+                  if (possibleFormats.Contains(BarcodeFormat.DATAMATRIX)) {\r
+                    readers.Add(new DataMatrixReader());\r
+                  }\r
                   // At end in "try harder" mode\r
                   if (addOneDReader && tryHarder)\r
                   {\r
-                      //readers.Add(new MultiFormatOneDReader(hints));\r
+                      readers.Add(new MultiFormatOneDReader(hints));\r
                   }\r
               }\r
 \r
@@ -128,14 +130,14 @@ namespace com.google.zxing
               {\r
                   if (!tryHarder)\r
                   {\r
-                      //readers.Add(new MultiFormatOneDReader(hints));\r
+                      readers.Add(new MultiFormatOneDReader(hints));\r
                   }\r
                   readers.Add(new QRCodeReader());\r
                   // TODO re-enable once Data Matrix is ready\r
-                  // readers.addElement(new DataMatrixReader());\r
+                    readers.Add(new DataMatrixReader());\r
                   if (tryHarder)\r
                   {\r
-                      //readers.Add(new MultiFormatOneDReader(hints));\r
+                      readers.Add(new MultiFormatOneDReader(hints));\r
                   }\r
               }\r
           }\r