CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

Check file path before get absolute path

Browse source
This commit is contained in:
Jaex 2018-03-22 08:16:01 +03:00
parent 3e6cf489e5
commit 6f29d7ee67
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ShareX.HelpersLib/Helpers/ImageHelpers.cs
View file

@ -1548,18 +1548,21 @@ public static Image LoadImage(string filePath)
{
try
{
filePath = Helpers.GetAbsolutePath(filePath);
if (!string.IsNullOrEmpty(filePath) && Helpers.IsImageFile(filePath) && File.Exists(filePath))
if (!string.IsNullOrEmpty(filePath))
{
Image img = Image.FromStream(new MemoryStream(File.ReadAllBytes(filePath)));
filePath = Helpers.GetAbsolutePath(filePath);
if (HelpersOptions.RotateImageByExifOrientationData)
if (!string.IsNullOrEmpty(filePath) && Helpers.IsImageFile(filePath) && File.Exists(filePath))
{
RotateImageByExifOrientationData(img);
}
Image img = Image.FromStream(new MemoryStream(File.ReadAllBytes(filePath)));
return img;
if (HelpersOptions.RotateImageByExifOrientationData)
{
RotateImageByExifOrientationData(img);
}
return img;
}
}
}
catch (Exception e)