Skip to content

Account for image resolution units other than pixels per inch #1519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tonyqus merged 2 commits into from
Apr 18, 2025
Merged

Account for image resolution units other than pixels per inch #1519

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
114120f
Account for image resolution units other than pixels per inch
bmlpg Mar 22, 2025
2dd0fa7
Added "using SixLabors.ImageSharp.Metadata"
bmlpg Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions main/SS/Util/ImageUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ namespace NPOI.SS.Util
using NPOI.SS.UserModel;
using NPOI.Util;
using SixLabors.ImageSharp;

using SixLabors.ImageSharp.Metadata;

/**
* @author Yegor Kozlov
*/
Expand Down Expand Up @@ -103,7 +104,28 @@ public static Size GetImageDimension(Stream is1, PictureType type)
*/
public static int[] GetResolution(Image r)
{
return new int[] { (int)r.Metadata.HorizontalResolution, (int)r.Metadata.VerticalResolution };
ImageMetadata imageMetadata = r.Metadata;

double horizontalResolution = 0;
double verticalResolution = 0;

if (imageMetadata.ResolutionUnits == PixelResolutionUnit.PixelsPerMeter)
{
horizontalResolution = imageMetadata.HorizontalResolution * 0.0254D;
verticalResolution = imageMetadata.VerticalResolution * 0.0254D;
}
else if (imageMetadata.ResolutionUnits == PixelResolutionUnit.PixelsPerCentimeter)
{
horizontalResolution = imageMetadata.HorizontalResolution * 2.54D;
verticalResolution = imageMetadata.VerticalResolution * 2.54D;
}
else
{
horizontalResolution = imageMetadata.HorizontalResolution;
verticalResolution = imageMetadata.VerticalResolution;
}

return new int[] { (int)Math.Round(horizontalResolution), (int)Math.Round(verticalResolution) };
}

/**
Expand Down Expand Up @@ -296,4 +318,4 @@ private static double GetRowHeightInPixels(ISheet sheet, int rowNum)
}
}

}
}