git-svn-id: http://zxing.googlecode.com/svn/trunk@818 59b500cc-1b3d-0410-9834-0bbf25f...

diff --git a/csharp/MultiFormatReader.cs b/csharp/MultiFormatReader.cs
index 0fed777..9c0f09c 100755 (executable)
--- a/csharp/MultiFormatReader.cs
+++ b/csharp/MultiFormatReader.cs
@@ -14,7 +14,8 @@
 \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
 \r
 namespace com.google.zxing\r
 {\r
@@ -106,7 +107,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 +115,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

diff --git a/csharp/oned/MultiFormatOneDReader.cs b/csharp/oned/MultiFormatOneDReader.cs
index 9bb314b..b421435 100755 (executable)
--- a/csharp/oned/MultiFormatOneDReader.cs
+++ b/csharp/oned/MultiFormatOneDReader.cs
@@ -23,6 +23,7 @@ namespace com.google.zxing.oned
     public sealed class MultiFormatOneDReader : AbstractOneDReader\r
     { \r
           private System.Collections.ArrayList readers;\r
+\r
           public MultiFormatOneDReader(System.Collections.Hashtable hints)\r
           {\r
             System.Collections.ArrayList possibleFormats = hints == null ? null : (System.Collections.ArrayList) hints[DecodeHintType.POSSIBLE_FORMATS];\r

diff --git a/csharp/zxing.csproj b/csharp/zxing.csproj
index 364b718..3bebda4 100755 (executable)
--- a/csharp/zxing.csproj
+++ b/csharp/zxing.csproj
@@ -121,9 +121,6 @@
     <Compile Include="Writer.cs" />\r
     <Compile Include="WriterException.cs" />\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <Content Include="Note.txt" />\r
-  </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r