Exif XPSubject conversion #145

Ruben2776 · Sep 19, 2024 · d9043b0 · d9043b0
1 parent 53f7047
commit d9043b0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/PicView.Avalonia/Navigation/ExifHandling.cs b/src/PicView.Avalonia/Navigation/ExifHandling.cs
@@ -216,7 +216,7 @@ public static void UpdateExifValues(ImageModel imageModel, MainViewModel vm)
             vm.GetDateTaken = EXIFHelper.GetDateTaken(profile);
             vm.GetCopyright = profile?.GetValue(ExifTag.Copyright)?.Value ?? string.Empty;
             vm.GetTitle = EXIFHelper.GetTitle(profile);
-            vm.GetSubject = profile?.GetValue(ExifTag.XPSubject)?.Value.ToString() ?? string.Empty;
+            vm.GetSubject = EXIFHelper.GetSubject(profile);
             vm.GetSoftware = profile?.GetValue(ExifTag.Software)?.Value ?? string.Empty;
             vm.GetResolutionUnit = EXIFHelper.GetResolutionUnit(profile);
             vm.GetColorRepresentation = EXIFHelper.GetColorSpace(profile);

diff --git a/src/PicView.Core/ImageDecoding/EXIFHelper.cs b/src/PicView.Core/ImageDecoding/EXIFHelper.cs
@@ -469,4 +469,16 @@ public static string GetExifVersion(IExifProfile? profile)
         var titleTag = profile?.GetValue(ExifTag.ImageDescription)?.Value;
         return titleTag ?? string.Empty;
     }
+
+    public static string? GetSubject(IExifProfile? profile)
+    {
+        var xPSubject = profile?.GetValue(ExifTag.XPSubject)?.Value;
+        var subject = xPSubject is null ? string.Empty : Encoding.ASCII.GetString(xPSubject);
+        if (!string.IsNullOrEmpty(subject))
+        {
+            return subject;
+        }
+        var subjectTag = profile?.GetValue(ExifTag.XPSubject)?.Value;
+        return subjectTag?.GetValue(0)?.ToString() ?? string.Empty;
+    }
 }