fixed GetJpeg

IOL0ol1 · Dec 14, 2022 · 142b954 · 142b954
1 parent 072500e
commit 142b954
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/example/SlideViewer/SlideViewer.csproj b/example/SlideViewer/SlideViewer.csproj
@@ -5,6 +5,7 @@
     <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <Version>1.1.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/OpenSlideSharp.BruTile/OpenSlideSharp.BruTile.csproj b/src/OpenSlideSharp.BruTile/OpenSlideSharp.BruTile.csproj
@@ -13,7 +13,7 @@
     <PackageReleaseNotes>OpenSlideSharp for BruTile</PackageReleaseNotes>
     <Description>OpenSlideSharp for BruTile</Description>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/OpenSlideSharp.BruTile/Utilities.cs b/src/OpenSlideSharp.BruTile/Utilities.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Range = OpenCvSharp.Range;
 
 namespace OpenSlideSharp.BruTile
 {
@@ -53,6 +52,7 @@ public static unsafe byte[] GetJpeg(byte[] bgraBytes, int bytesPerPixel, int byt
                         var scalar = new Scalar((int)(background >> 24 & 0xFF), (int)(background >> 16 & 0xFF), (int)(background >> 8 & 0xFF), (int)(background & 0xFF));
                         using (var dst = new Mat(dstHeight, dstWidth, pixel, scalar))
                         {
+                            src.SaveImage($"{Guid.NewGuid()}.jpg");
                             DrawImage(src, dst);
                             return dst.ToBytes(".jpg", prms);
                         }
@@ -71,11 +71,21 @@ private static void DrawImage(Mat src, Mat dst)
             var fx = (double)dst.Width / src.Width;
             var fy = (double)dst.Height / src.Height;
             var fmin = Math.Min(fx, fy);
-            using (var srcResized = src.Resize(new Size(src.Width * fmin, src.Height * fmin)))
+            if (fmin < 1) // src > dst
             {
-                using (var sub = new Mat(dst, new Rect(0, 0, srcResized.Width, srcResized.Height)))
+                using (var srcResized = src.Resize(new Size(src.Width * fmin, src.Height * fmin)))
                 {
-                    srcResized.CopyTo(sub);
+                    using (var sub = new Mat(dst, new Rect(0, 0, srcResized.Width, srcResized.Height)))
+                    {
+                        srcResized.CopyTo(sub);
+                    }
+                }
+            }
+            else // src <= dst
+            {
+                using (var sub = new Mat(dst, new Rect(0, 0, src.Width, src.Height)))
+                {
+                    src.CopyTo(sub);
                 }
             }
         }

diff --git a/src/OpenSlideSharp.OpencvExtensions/JpegExtensions.cs b/src/OpenSlideSharp.OpencvExtensions/JpegExtensions.cs
@@ -69,11 +69,21 @@ private static void DrawImage(Mat src, Mat dst)
             var fx = (double)dst.Width / src.Width;
             var fy = (double)dst.Height / src.Height;
             var fmin = Math.Min(fx, fy);
-            using (var srcResized = src.Resize(new Size(src.Width * fmin, src.Height * fmin)))
+            if (fmin < 1) // src > dst
             {
-                using (var sub = new Mat(dst, new Rect(0, 0, srcResized.Width, srcResized.Height)))
+                using (var srcResized = src.Resize(new Size(src.Width * fmin, src.Height * fmin)))
                 {
-                    srcResized.CopyTo(sub);
+                    using (var sub = new Mat(dst, new Rect(0, 0, srcResized.Width, srcResized.Height)))
+                    {
+                        srcResized.CopyTo(sub);
+                    }
+                }
+            }
+            else // src <= dst
+            {
+                using (var sub = new Mat(dst, new Rect(0, 0, src.Width, src.Height)))
+                {
+                    src.CopyTo(sub);
                 }
             }
         }

diff --git a/src/OpenSlideSharp.OpencvExtensions/OpenSlideSharp.OpencvExtensions.csproj b/src/OpenSlideSharp.OpencvExtensions/OpenSlideSharp.OpencvExtensions.csproj
@@ -12,7 +12,7 @@
     <PackageReleaseNotes>OpenSlideSharp opencv extensions</PackageReleaseNotes>
     <Description>OpenSlideSharp opencv mat extensions</Description>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
   </PropertyGroup>