cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-08-17 19:20:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use LogicalPixelFormat to keep 1bpp after rotation

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2024-03-09 16:15:59 -08:00
parent 03bd237cd3
commit a3090e1a07
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NAPS2.Images.Gtk/GtkImageTransformer.cs
View File

@ -32,10 +32,8 @@ public class GtkImageTransformer : AbstractImageTransformer<GtkImage>
CairoHelper.SetSourcePixbuf(context, image.Pixbuf, 0, 0);
context.Paint();
var newImage = new GtkImage(ImageContext, new Pixbuf(surface, 0, 0, width, height));
// TODO: In Gdi, we convert this back to BW1. Should we do the same?
newImage.LogicalPixelFormat = image.LogicalPixelFormat == ImagePixelFormat.BW1
? ImagePixelFormat.Gray8
: image.LogicalPixelFormat;
OptimizePixelFormat(image, ref newImage);
newImage.LogicalPixelFormat = image.LogicalPixelFormat;
newImage.SetResolution(xres, yres);
image.Dispose();
return newImage;

1
NAPS2.Images.Mac/MacImageTransformer.cs
View File

@ -34,6 +34,7 @@ public class MacImageTransformer : AbstractImageTransformer<MacImage>
CGRect rect = new CGRect(0, 0, image.Width, image.Height);
using var cgImage = image.Rep.AsCGImage(ref rect, null, null);
c.DrawImage(rect, cgImage);
OptimizePixelFormat(image, ref newImage);
image.Dispose();
return newImage;
}

2
NAPS2.Images/Transforms/AbstractImageTransformer.cs
View File

@ -266,7 +266,7 @@ public abstract class AbstractImageTransformer<TImage> where TImage : IMemoryIma
/// <param name="result">The result that may be replaced.</param>
protected void OptimizePixelFormat(TImage original, ref TImage result)
{
if (original.PixelFormat == ImagePixelFormat.BW1)
if (original.UpdateLogicalPixelFormat() == ImagePixelFormat.BW1)
{
result = PerformTransform(result, new BlackWhiteTransform());
}