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

This commit is contained in:
mfzpeyo 2009-01-09 03:15:02 +00:00
parent 7854d30103
commit 54164f7cce
3 changed files with 8 additions and 9 deletions

View file

@ -15,6 +15,7 @@
using System; using System;
using System.Collections; using System.Collections;
using com.google.zxing.qrcode; using com.google.zxing.qrcode;
using com.google.zxing.oned;
namespace com.google.zxing namespace com.google.zxing
{ {
@ -106,7 +107,7 @@ namespace com.google.zxing
if (addOneDReader && !tryHarder) if (addOneDReader && !tryHarder)
{ {
//readers.Add(new MultiFormatOneDReader(hints)); readers.Add(new MultiFormatOneDReader(hints));
} }
if (possibleFormats.Contains(BarcodeFormat.QR_CODE)) if (possibleFormats.Contains(BarcodeFormat.QR_CODE))
@ -114,13 +115,13 @@ namespace com.google.zxing
readers.Add(new QRCodeReader()); readers.Add(new QRCodeReader());
} }
// TODO re-enable once Data Matrix is ready // TODO re-enable once Data Matrix is ready
//if (possibleFormats.contains(BarcodeFormat.DATAMATRIX)) { if (possibleFormats.Contains(BarcodeFormat.DATAMATRIX)) {
// readers.addElement(new DataMatrixReader()); //readers.Add(new DataMatrixReader());
//} }
// At end in "try harder" mode // At end in "try harder" mode
if (addOneDReader && tryHarder) if (addOneDReader && tryHarder)
{ {
//readers.Add(new MultiFormatOneDReader(hints)); readers.Add(new MultiFormatOneDReader(hints));
} }
} }

View file

@ -23,6 +23,7 @@ namespace com.google.zxing.oned
public sealed class MultiFormatOneDReader : AbstractOneDReader public sealed class MultiFormatOneDReader : AbstractOneDReader
{ {
private System.Collections.ArrayList readers; private System.Collections.ArrayList readers;
public MultiFormatOneDReader(System.Collections.Hashtable hints) public MultiFormatOneDReader(System.Collections.Hashtable hints)
{ {
System.Collections.ArrayList possibleFormats = hints == null ? null : (System.Collections.ArrayList) hints[DecodeHintType.POSSIBLE_FORMATS]; System.Collections.ArrayList possibleFormats = hints == null ? null : (System.Collections.ArrayList) hints[DecodeHintType.POSSIBLE_FORMATS];

View file

@ -121,9 +121,6 @@
<Compile Include="Writer.cs" /> <Compile Include="Writer.cs" />
<Compile Include="WriterException.cs" /> <Compile Include="WriterException.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="Note.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.