add pixel stride + update zxing

jamie-mh · jamie-mh · commit be479e4884ec · 2025-03-04T20:48:33.000+01:00
diff --git a/Stratum.Droid/Stratum.Droid.csproj b/Stratum.Droid/Stratum.Droid.csproj
@@ -53,7 +53,7 @@
         <PackageReference Include="Xamarin.AndroidX.ViewPager2" Version="1.1.0.5" />
         <PackageReference Include="Xamarin.AndroidX.Work.Runtime" Version="2.10.0.3" />
         <PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
-        <PackageReference Include="StratumAuth.ZXing" Version="1.2.0" />
+        <PackageReference Include="StratumAuth.ZXing" Version="1.2.1" />
     </ItemGroup>
     <ItemGroup Condition="!$(DefineConstants.Contains(FDROID))">
         <PackageReference Include="Xamarin.GooglePlayServices.Wearable" Version="119.0.0.1" />
diff --git a/Stratum.Droid/src/QrCode/QrCodeImageAnalyser.cs b/Stratum.Droid/src/QrCode/QrCodeImageAnalyser.cs
@@ -44,16 +44,16 @@ public void Analyze(IImageProxy imageProxy)
 
         private void AnalyseInternal(IImageProxy imageProxy)
         {
-            using var yuvPlane = imageProxy.Image.GetPlanes()[0];
+            using var lumPlane = imageProxy.Image.GetPlanes()[0];
             ReadOnlySpan<byte> bytes;
             
             unsafe
             {
-                var bufferAddress = yuvPlane.Buffer.GetDirectBufferAddress().ToPointer();
-                bytes = new ReadOnlySpan<byte>(bufferAddress, yuvPlane.Buffer.Remaining());
+                var bufferAddress = lumPlane.Buffer.GetDirectBufferAddress().ToPointer();
+                bytes = new ReadOnlySpan<byte>(bufferAddress, lumPlane.Buffer.Remaining());
             }
             
-            using var imageView = new ImageView(bytes, imageProxy.Width, imageProxy.Height, ImageFormat.Lum, yuvPlane.RowStride);
+            using var imageView = new ImageView(bytes, imageProxy.Width, imageProxy.Height, ImageFormat.Lum, lumPlane.RowStride, lumPlane.PixelStride);
             imageView.Crop(imageProxy.CropRect.Left, imageProxy.CropRect.Top, imageProxy.CropRect.Width(), imageProxy.CropRect.Height());
             imageView.Rotate(imageProxy.ImageInfo.RotationDegrees);
             
diff --git a/Stratum.Test/Stratum.Test.csproj b/Stratum.Test/Stratum.Test.csproj
@@ -24,7 +24,7 @@
         <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="StratumAuth.ZXing" Version="1.2.0" />
+        <PackageReference Include="StratumAuth.ZXing" Version="1.2.1" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Stratum.Core\Stratum.Core.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -44,16 +44,16 @@ public void Analyze(IImageProxy imageProxy)`
`44`	`44`
`45`	`45`	`private void AnalyseInternal(IImageProxy imageProxy)`
`46`	`46`	`{`
`47`		`- using var yuvPlane = imageProxy.Image.GetPlanes()[0];`
	`47`	`+ using var lumPlane = imageProxy.Image.GetPlanes()[0];`
`48`	`48`	`ReadOnlySpan<byte> bytes;`
`49`	`49`
`50`	`50`	`unsafe`
`51`	`51`	`{`
`52`		`- var bufferAddress = yuvPlane.Buffer.GetDirectBufferAddress().ToPointer();`
`53`		`- bytes = new ReadOnlySpan<byte>(bufferAddress, yuvPlane.Buffer.Remaining());`
	`52`	`+ var bufferAddress = lumPlane.Buffer.GetDirectBufferAddress().ToPointer();`
	`53`	`+ bytes = new ReadOnlySpan<byte>(bufferAddress, lumPlane.Buffer.Remaining());`
`54`	`54`	`}`
`55`	`55`
`56`		`- using var imageView = new ImageView(bytes, imageProxy.Width, imageProxy.Height, ImageFormat.Lum, yuvPlane.RowStride);`
	`56`	`+ using var imageView = new ImageView(bytes, imageProxy.Width, imageProxy.Height, ImageFormat.Lum, lumPlane.RowStride, lumPlane.PixelStride);`
`57`	`57`	`imageView.Crop(imageProxy.CropRect.Left, imageProxy.CropRect.Top, imageProxy.CropRect.Width(), imageProxy.CropRect.Height());`
`58`	`58`	`imageView.Rotate(imageProxy.ImageInfo.RotationDegrees);`
`59`	`59`