From: mfzpeyo <mfzpeyo@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Fri, 9 Jan 2009 03:15:02 +0000 (+0000)
Subject: git-svn-id: http://zxing.googlecode.com/svn/trunk@818 59b500cc-1b3d-0410-9834-0bbf25f... 
X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=68dbcb841d3a184168e1228abc0eeba96d2d3eb8

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

diff --git a/csharp/MultiFormatReader.cs b/csharp/MultiFormatReader.cs
index 0fed7777..9c0f09ca 100755
--- a/csharp/MultiFormatReader.cs
+++ b/csharp/MultiFormatReader.cs
@@ -14,7 +14,8 @@
 
 using System;
 using System.Collections;
-using com.google.zxing.qrcode;  
+using com.google.zxing.qrcode;
+using com.google.zxing.oned;
 
 namespace com.google.zxing
 {
@@ -106,7 +107,7 @@ namespace com.google.zxing
 
                   if (addOneDReader && !tryHarder)
                   {
-                      //readers.Add(new MultiFormatOneDReader(hints));
+                      readers.Add(new MultiFormatOneDReader(hints));
                   }
 
                   if (possibleFormats.Contains(BarcodeFormat.QR_CODE))
@@ -114,13 +115,13 @@ namespace com.google.zxing
                       readers.Add(new QRCodeReader());
                   }
                   // TODO re-enable once Data Matrix is ready
-                  //if (possibleFormats.contains(BarcodeFormat.DATAMATRIX)) {
-                  //  readers.addElement(new DataMatrixReader());
-                  //}
+                  if (possibleFormats.Contains(BarcodeFormat.DATAMATRIX)) {
+                    //readers.Add(new DataMatrixReader());
+                  }
                   // At end in "try harder" mode
                   if (addOneDReader && tryHarder)
                   {
-                      //readers.Add(new MultiFormatOneDReader(hints));
+                      readers.Add(new MultiFormatOneDReader(hints));
                   }
               }
 
diff --git a/csharp/oned/MultiFormatOneDReader.cs b/csharp/oned/MultiFormatOneDReader.cs
index 9bb314b9..b4214359 100755
--- a/csharp/oned/MultiFormatOneDReader.cs
+++ b/csharp/oned/MultiFormatOneDReader.cs
@@ -23,6 +23,7 @@ namespace com.google.zxing.oned
     public sealed class MultiFormatOneDReader : AbstractOneDReader
     { 
           private System.Collections.ArrayList readers;
+
           public MultiFormatOneDReader(System.Collections.Hashtable hints)
           {
             System.Collections.ArrayList possibleFormats = hints == null ? null : (System.Collections.ArrayList) hints[DecodeHintType.POSSIBLE_FORMATS];
diff --git a/csharp/zxing.csproj b/csharp/zxing.csproj
index 364b718b..3bebda4c 100755
--- a/csharp/zxing.csproj
+++ b/csharp/zxing.csproj
@@ -121,9 +121,6 @@
     <Compile Include="Writer.cs" />
     <Compile Include="WriterException.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Note.txt" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.