Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-03 09:46:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Image Resizer] Fix image resizer unexpected property type or value (#14475)

Browse Source 
* fixes issue #9885, image 2 and 3

* fixes issue #9885, image 1

* fixes issue #9885, image 2 and 3 (refactoring)

* try to get past the spell checker

* Loop over all metadata and try to read the actual value. Remove metadata item if exception is thrown on reading the value.

* Add debug utils which will help to troubleshoot further metadata bugs

* Revert "try to get past the spell checker"

This reverts commit 34aa0728b5.

* I gave up on fiddling with individual metadata decided to  build up the metadata object from the scratch

* Improved log messages, add comments, renamed variables
This commit is contained in:
CleanCodeDeveloper
2021-11-23 12:19:09 +01:00
committed by GitHub
parent 641d838140
commit 6452369351
2 changed files with 214 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/modules/imageresizer/ui/Models/ResizeOperation.cs
View File

@@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
using System;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.IO.Abstractions;
@@ -83,11 +84,36 @@ namespace ImageResizer.Models
try
{
// Detect whether metadata can copied successfully
_ = metadata.Clone();
var modifiableMetadata = metadata.Clone();
#if DEBUG
Debug.WriteLine($"### Processing metadata of file {_file}");
modifiableMetadata.PrintsAllMetadataToDebugOutput();
#endif
// read all metadata and build up metadata object from the scratch. Discard invalid (unreadable/unwritable) metadata.
var newMetadata = new BitmapMetadata(metadata.Format);
var listOfMetadata = modifiableMetadata.GetListOfMetadata();
foreach (var (metadataPath, value) in listOfMetadata)
{
if (value is BitmapMetadata bitmapMetadata)
{
var innerMetadata = new BitmapMetadata(bitmapMetadata.Format);
newMetadata.SetQuerySafe(metadataPath, innerMetadata);
}
else
{
newMetadata.SetQuerySafe(metadataPath, value);
}
}
metadata = newMetadata;
}
catch (ArgumentException)
catch (ArgumentException ex)
{
metadata = null;
Debug.WriteLine(ex);
}
}
@@ -105,9 +131,9 @@ namespace ImageResizer.Models
encoder.Frames.Add(
BitmapFrame.Create(
Transform(originalFrame),
thumbnail: null,
originalFrame.Thumbnail,
metadata,
colorContexts: null));
originalFrame.ColorContexts));
}
path = GetDestinationPath(encoder);