Merge pull request #812 from JimBobSquarePants/js/fix-811

Sanitize Metadata on Jpeg Save.

build/build.ps1

@@ -8,7 +8,7 @@ $nugetOutput = Join-Path $binPath "NuGets";
 # Projects (NuGet dependencies are handled in the nuspec files themselves)
 $imageprocessor = @{
  name = "ImageProcessor"
- version = "2.9.0"
+ version = "2.9.1"
  folder = Join-Path $buildPath "src\ImageProcessor"
  output = Join-Path $binPath "ImageProcessor\lib\net452"
  csproj = "ImageProcessor.csproj"

src/ImageProcessor/Imaging/Formats/JpegFormat.cs

@@ -11,10 +11,12 @@
 namespace ImageProcessor.Imaging.Formats
 {
  using System;
+ using System.Collections.Generic;
  using System.Drawing;
  using System.Drawing.Imaging;
  using System.IO;
  using System.Text;
+ using ImageProcessor.Imaging.MetaData;
 
  /// <summary>
  /// Provides the necessary information to support jpeg images.
@@ -66,6 +68,8 @@ public sealed class JpegFormat : FormatBase
  /// </returns>
  public override Image Save(Stream stream, Image image, long bitDepth)
  {
+ SantizeMetadata(image);
+
  // Jpegs can be saved with different settings to include a quality setting for the JPEG compression.
  // This improves output compression and quality.
  using (EncoderParameters encoderParameters = FormatUtilities.GetEncodingParameters(this.Quality))
@@ -97,6 +101,8 @@ public override Image Save(Stream stream, Image image, long bitDepth)
  /// </returns>
  public override Image Save(string path, Image image, long bitDepth)
  {
+ SantizeMetadata(image);
+
  // Jpegs can be saved with different settings to include a quality setting for the JPEG compression.
  // This improves output compression and quality.
  using (EncoderParameters encoderParameters = FormatUtilities.GetEncodingParameters(this.Quality))
@@ -112,5 +118,18 @@ public override Image Save(string path, Image image, long bitDepth)
 
  return image;
  }
+
+ // System.Drawing's jpeg encoder throws when proprietary tags are included in the metadata
+ // https://github.com/JimBobSquarePants/ImageProcessor/issues/811
+ private static void SantizeMetadata(Image image)
+ {
+ foreach (int id in image.PropertyIdList)
+ {
+ if (Array.IndexOf(ExifPropertyTagConstants.Ids, id) == -1)
+ {
+ image.RemovePropertyItem(id);
+ }
+ }
+ }
  }
 }

src/ImageProcessor/Imaging/MetaData/ExifPropertyTagConstants.cs

@@ -83,5 +83,10 @@ public static class ExifPropertyTagConstants
  /// Gets all known property items
  /// </summary>
  public static readonly ExifPropertyTag[] All = (ExifPropertyTag[])Enum.GetValues(typeof(ExifPropertyTag));
+
+ /// <summary>
+ /// Gets the ids of all valid EXIF property items.
+ /// </summary>
+ public static readonly int[] Ids = Enum.GetValues(typeof(ExifPropertyTag)).Cast<int>().ToArray();
  }
 }