Skip to content

Commit 1d8a416

Browse files
micjahnmicjahn
committed
Merge from TFS remote branch
2 parents 2502fb2 + 5b81b84 commit 1d8a416

25 files changed

Lines changed: 4503 additions & 99 deletions

‎Source/Bindings/ZXing.ImageSharp/BarcodeReader.Extensions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
using ImageSharp;
18-
using ImageSharp.PixelFormats;
17+
using SixLabors.ImageSharp;
18+
using SixLabors.ImageSharp.PixelFormats;
1919
using ZXing.ImageSharp;
2020

2121
namespace ZXing
@@ -31,7 +31,7 @@ public static class BarcodeReaderExtensions
3131
/// <param name="reader"></param>
3232
/// <param name="image"></param>
3333
/// <returns></returns>
34-
public static Result Decode<TPixel>(this IBarcodeReaderGeneric reader, ImageBase<TPixel> image) where TPixel : struct, IPixel<TPixel>
34+
public static Result Decode<TPixel>(this IBarcodeReaderGeneric reader, Image<TPixel> image) where TPixel : struct, IPixel<TPixel>
3535
{
3636
var luminanceSource = new ImageSharpLuminanceSource<TPixel>(image);
3737
return reader.Decode(luminanceSource);
@@ -43,7 +43,7 @@ public static Result Decode<TPixel>(this IBarcodeReaderGeneric reader, ImageBase
4343
/// <param name="reader"></param>
4444
/// <param name="image"></param>
4545
/// <returns></returns>
46-
public static Result[] DecodeMultiple<TPixel>(this IBarcodeReaderGeneric reader, ImageBase<TPixel> image) where TPixel : struct, IPixel<TPixel>
46+
public static Result[] DecodeMultiple<TPixel>(this IBarcodeReaderGeneric reader, Image<TPixel> image) where TPixel : struct, IPixel<TPixel>
4747
{
4848
var luminanceSource = new ImageSharpLuminanceSource<TPixel>(image);
4949
return reader.DecodeMultiple(luminanceSource);

‎Source/Bindings/ZXing.ImageSharp/BarcodeReader.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
* limitations under the License.
1515
*/
1616

17-
using ImageSharp;
18-
using ImageSharp.PixelFormats;
17+
using SixLabors.ImageSharp;
18+
using SixLabors.ImageSharp.PixelFormats;
1919

2020
namespace ZXing.ImageSharp
2121
{
2222
/// <summary>
2323
/// specific implementation of a barcode reader which can be used with ImageSharp ImageBase objects
2424
/// </summary>
25-
public class BarcodeReader<TPixel> : ZXing.BarcodeReader<ImageBase<TPixel>> where TPixel : struct, IPixel<TPixel>
25+
public class BarcodeReader<TPixel> : ZXing.BarcodeReader<Image<TPixel>> where TPixel : struct, IPixel<TPixel>
2626
{
27-
private static readonly Func<ImageBase<TPixel>, LuminanceSource> defaultCreateLuminanceSource =
27+
private static readonly Func<Image<TPixel>, LuminanceSource> defaultCreateLuminanceSource =
2828
(bitmap) => new ImageSharpLuminanceSource<TPixel>(bitmap);
2929

3030
/// <summary>
@@ -45,7 +45,7 @@ public BarcodeReader()
4545
/// <param name="createBinarizer">Sets the function to create a binarizer object for a luminance source.
4646
/// If null then HybridBinarizer is used</param>
4747
public BarcodeReader(Reader reader,
48-
Func<ImageBase<TPixel>, LuminanceSource> createLuminanceSource,
48+
Func<Image<TPixel>, LuminanceSource> createLuminanceSource,
4949
Func<LuminanceSource, Binarizer> createBinarizer)
5050
: base(reader, createLuminanceSource ?? defaultCreateLuminanceSource, createBinarizer)
5151
{
@@ -62,7 +62,7 @@ public BarcodeReader(Reader reader,
6262
/// If null then HybridBinarizer is used</param>
6363
/// <param name="createRGBLuminanceSource">Sets the function to create a luminance source object for a rgb raw byte array.</param>
6464
public BarcodeReader(Reader reader,
65-
Func<ImageBase<TPixel>, LuminanceSource> createLuminanceSource,
65+
Func<Image<TPixel>, LuminanceSource> createLuminanceSource,
6666
Func<LuminanceSource, Binarizer> createBinarizer,
6767
Func<byte[], int, int, RGBLuminanceSource.BitmapFormat, LuminanceSource> createRGBLuminanceSource)
6868
: base(reader, createLuminanceSource ?? defaultCreateLuminanceSource, createBinarizer, createRGBLuminanceSource)

‎Source/Bindings/ZXing.ImageSharp/BarcodeWriter.Extensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
using ImageSharp;
18-
using ImageSharp.PixelFormats;
17+
using SixLabors.ImageSharp;
18+
using SixLabors.ImageSharp.PixelFormats;
1919
using ZXing.ImageSharp.Rendering;
2020

2121
namespace ZXing

‎Source/Bindings/ZXing.ImageSharp/BarcodeWriter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
using ImageSharp;
18-
using ImageSharp.PixelFormats;
17+
using SixLabors.ImageSharp;
18+
using SixLabors.ImageSharp.PixelFormats;
1919
using ZXing.ImageSharp.Rendering;
2020

2121
namespace ZXing.ImageSharp

‎Source/Bindings/ZXing.ImageSharp/ImageSharpLuminanceSource.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
using ImageSharp;
18-
using ImageSharp.PixelFormats;
17+
using SixLabors.ImageSharp;
18+
using SixLabors.ImageSharp.PixelFormats;
1919

2020
namespace ZXing.ImageSharp
2121
{
@@ -39,7 +39,7 @@ protected ImageSharpLuminanceSource(int width, int height)
3939
/// with the image of a Bitmap instance
4040
/// </summary>
4141
/// <param name="bitmap">The bitmap.</param>
42-
public ImageSharpLuminanceSource(ImageBase<TPixel> bitmap)
42+
public ImageSharpLuminanceSource(Image<TPixel> bitmap)
4343
: base(bitmap.Width, bitmap.Height)
4444
{
4545
var height = bitmap.Height;

‎Source/Bindings/ZXing.ImageSharp/Rendering/ImageSharpRenderer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
using ImageSharp;
18-
using ImageSharp.PixelFormats;
17+
using SixLabors.ImageSharp;
18+
using SixLabors.ImageSharp.PixelFormats;
1919

2020
using ZXing.Common;
2121

‎Source/Bindings/ZXing.ImageSharp/project.json‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
{
22
"name": "ZXing.ImageSharp",
3-
"version": "0.16.3",
4-
"dependencies": {
5-
"ImageSharp": "1.0.0-alpha9-00182",
6-
"NETStandard.Library": "1.6.1"
7-
},
3+
"version": "0.16.4",
4+
"dependencies": {
5+
"NETStandard.Library": "1.6.1",
6+
"SixLabors.ImageSharp": "1.0.0-beta0001"
7+
},
88
"frameworks": {
99
"netstandard1.1": {
1010
"dependencies": {
1111
"ZXing.Net": {
1212
"target": "project"
1313
}
1414
}
15+
},
16+
"netstandard1.3": {
17+
"dependencies": {
18+
"ZXing.Net": {
19+
"target": "project"
20+
}
21+
}
1522
}
1623
},
1724
"buildOptions": {

‎Source/Bindings/ZXing.ImageSharp/project.nuspec‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
4-
<version>0.16.3-beta</version>
4+
<version>0.16.4-beta</version>
55
<authors>Michael Jahn</authors>
66
<owners>Michael Jahn</owners>
77
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
@@ -10,14 +10,19 @@
1010
<id>ZXing.Net.Bindings.ImageSharp</id>
1111
<title>ZXing.Net.Bindings.ImageSharp</title>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13-
<description>ZXing.Net Bindings for ImageSharp - use ImageSharp with ZXing.Net for barcode reading (you have to add https://www.myget.org/F/imagesharp/ as a package source for nuget)</description>
14-
<summary>ZXing.Net Bindings for ImageSharp</summary>
13+
<description>ZXing.Net Bindings for ImageSharp - use ImageSharp with ZXing.Net for barcode reading</description>
14+
<summary>ZXing.Net Bindings for SixLabors.ImageSharp</summary>
1515
<releaseNotes></releaseNotes>
1616
<tags>ZXing ImageSharp</tags>
1717
<dependencies>
1818
<group targetFramework="netstandard1.1">
1919
<dependency id="ZXing.Net" version="0.16.2.0" exclude="Build,Analyzers" />
20-
<dependency id="ImageSharp" version="1.0.0-alpha9-00182" exclude="Build,Analyzers" />
20+
<dependency id="SixLabors.ImageSharp" version="1.0.0-beta0001" exclude="Build,Analyzers" />
21+
<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
22+
</group>
23+
<group targetFramework="netstandard1.3">
24+
<dependency id="ZXing.Net" version="0.16.2.0" exclude="Build,Analyzers" />
25+
<dependency id="SixLabors.ImageSharp" version="1.0.0-beta0001" exclude="Build,Analyzers" />
2126
<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
2227
</group>
2328
</dependencies>
@@ -26,5 +31,8 @@
2631
<file src="bin\Release\netstandard1.1\zxing.imagesharp.dll" target="lib\netstandard1.1\zxing.imagesharp.dll" />
2732
<file src="bin\Release\netstandard1.1\zxing.imagesharp.pdb" target="lib\netstandard1.1\zxing.imagesharp.pdb" />
2833
<file src="bin\Release\netstandard1.1\zxing.imagesharp.xml" target="lib\netstandard1.1\zxing.imagesharp.xml" />
34+
<file src="bin\Release\netstandard1.3\zxing.imagesharp.dll" target="lib\netstandard1.3\zxing.imagesharp.dll" />
35+
<file src="bin\Release\netstandard1.3\zxing.imagesharp.pdb" target="lib\netstandard1.3\zxing.imagesharp.pdb" />
36+
<file src="bin\Release\netstandard1.3\zxing.imagesharp.xml" target="lib\netstandard1.3\zxing.imagesharp.xml" />
2937
</files>
3038
</package>

‎Source/Bindings/ZXing.Kinect/project.V1.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
4-
<version>0.16.1</version>
4+
<version>0.16.2</version>
55
<authors>Michael Jahn</authors>
66
<owners>Michael Jahn</owners>
77
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
@@ -16,7 +16,7 @@
1616
<tags>ZXing Kinect</tags>
1717
<dependencies>
1818
<group targetFramework="net40">
19-
<dependency id="ZXing.Net" version="0.16.1.0" exclude="Build,Analyzers" />
19+
<dependency id="ZXing.Net" version="0.16.2.0" exclude="Build,Analyzers" />
2020
</group>
2121
</dependencies>
2222
</metadata>

‎Source/Bindings/ZXing.Kinect/project.V2.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
4-
<version>0.16.1</version>
4+
<version>0.16.2</version>
55
<authors>Michael Jahn</authors>
66
<owners>Michael Jahn</owners>
77
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
@@ -16,7 +16,7 @@
1616
<tags>ZXing Kinect</tags>
1717
<dependencies>
1818
<group targetFramework="net45">
19-
<dependency id="ZXing.Net" version="0.16.1.0" exclude="Build,Analyzers" />
19+
<dependency id="ZXing.Net" version="0.16.2.0" exclude="Build,Analyzers" />
2020
</group>
2121
</dependencies>
2222
</metadata>

0 commit comments

Comments
 (0)