mirror of
https://github.com/QL-Win/QuickLook.git
synced 2025-09-13 02:49:06 +00:00
Fix preview HEIC #1470
This commit is contained in:
@@ -86,7 +86,7 @@ internal class ImageMagickProvider : AnimationProvider
|
|||||||
Defines = new DngReadDefines
|
Defines = new DngReadDefines
|
||||||
{
|
{
|
||||||
OutputColor = DngOutputColor.SRGB,
|
OutputColor = DngOutputColor.SRGB,
|
||||||
UseCameraWhitebalance = true,
|
UseCameraWhiteBalance = true,
|
||||||
DisableAutoBrightness = false
|
DisableAutoBrightness = false
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -119,7 +119,7 @@ internal class ImageMagickProvider : AnimationProvider
|
|||||||
mi.AutoOrient();
|
mi.AutoOrient();
|
||||||
|
|
||||||
if (mi.Width != (int)fullSize.Width || mi.Height != (int)fullSize.Height)
|
if (mi.Width != (int)fullSize.Width || mi.Height != (int)fullSize.Height)
|
||||||
mi.Resize((int)fullSize.Width, (int)fullSize.Height);
|
mi.Resize((uint)fullSize.Width, (uint)fullSize.Height);
|
||||||
|
|
||||||
mi.Density = new Density(DisplayDeviceHelper.DefaultDpi * DisplayDeviceHelper.GetCurrentScaleFactor().Horizontal,
|
mi.Density = new Density(DisplayDeviceHelper.DefaultDpi * DisplayDeviceHelper.GetCurrentScaleFactor().Horizontal,
|
||||||
DisplayDeviceHelper.DefaultDpi * DisplayDeviceHelper.GetCurrentScaleFactor().Vertical);
|
DisplayDeviceHelper.DefaultDpi * DisplayDeviceHelper.GetCurrentScaleFactor().Vertical);
|
||||||
@@ -232,12 +232,12 @@ file static class Extension
|
|||||||
}
|
}
|
||||||
|
|
||||||
var step = format.BitsPerPixel / 8;
|
var step = format.BitsPerPixel / 8;
|
||||||
var stride = image.Width * step;
|
var stride = (int)image.Width * step;
|
||||||
|
|
||||||
using var pixels = image.GetPixelsUnsafe();
|
using var pixels = image.GetPixelsUnsafe();
|
||||||
var bytes = pixels.ToByteArray(mapping);
|
var bytes = pixels.ToByteArray(mapping);
|
||||||
var dpi = GetDefaultDensity(image, useDensity ? DensityUnit.PixelsPerInch : DensityUnit.Undefined);
|
var dpi = GetDefaultDensity(image, useDensity ? DensityUnit.PixelsPerInch : DensityUnit.Undefined);
|
||||||
return BitmapSource.Create(image.Width, image.Height, dpi.X, dpi.Y, format, null, bytes, stride);
|
return BitmapSource.Create((int)image.Width, (int)image.Height, dpi.X, dpi.Y, format, null, bytes, stride);
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
@@ -1,17 +1,17 @@
|
|||||||
// Copyright © 2020 Paddy Xu
|
// Copyright © 2020 Paddy Xu
|
||||||
//
|
//
|
||||||
// This file is part of QuickLook program.
|
// This file is part of QuickLook program.
|
||||||
//
|
//
|
||||||
// This program is free software: you can redistribute it and/or modify
|
// This program is free software: you can redistribute it and/or modify
|
||||||
// it under the terms of the GNU General Public License as published by
|
// it under the terms of the GNU General Public License as published by
|
||||||
// the Free Software Foundation, either version 3 of the License, or
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
// (at your option) any later version.
|
// (at your option) any later version.
|
||||||
//
|
//
|
||||||
// This program is distributed in the hope that it will be useful,
|
// This program is distributed in the hope that it will be useful,
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
// GNU General Public License for more details.
|
// GNU General Public License for more details.
|
||||||
//
|
//
|
||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
@@ -85,8 +85,8 @@ namespace QuickLook.Plugin.ImageViewer
|
|||||||
using (var mi = new MagickImage())
|
using (var mi = new MagickImage())
|
||||||
{
|
{
|
||||||
mi.Ping(_path);
|
mi.Ping(_path);
|
||||||
w = mi.Width;
|
w = (int)mi.Width;
|
||||||
h = mi.Height;
|
h = (int)mi.Height;
|
||||||
}
|
}
|
||||||
|
|
||||||
return w + h == 0 ? new Size(800, 600) : new Size(w, h);
|
return w + h == 0 ? new Size(800, 600) : new Size(w, h);
|
||||||
@@ -94,7 +94,7 @@ namespace QuickLook.Plugin.ImageViewer
|
|||||||
|
|
||||||
public Orientation GetOrientation()
|
public Orientation GetOrientation()
|
||||||
{
|
{
|
||||||
return (Orientation) NativeMethods.GetOrientation(_path);
|
return (Orientation)NativeMethods.GetOrientation(_path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,4 +190,4 @@ namespace QuickLook.Plugin.ImageViewer
|
|||||||
RightBottom = 7,
|
RightBottom = 7,
|
||||||
LeftBottom = 8
|
LeftBottom = 8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -49,7 +49,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.9.1" />
|
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.2.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
Reference in New Issue
Block a user