From bbb4ad1aa27f973cd7425da3256d550ae64cc3f1 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Wed, 7 Sep 2016 12:25:25 +1000 Subject: [PATCH] JpegDecoder now supports Cmyk Fix #444 Touch #446 Former-commit-id: c46493a2a08e77b870a0c1f9c5606c019c7f3a63 Former-commit-id: 4f7f58f1fa7d3e8f4f113c07236d7561f8d65f05 Former-commit-id: ead2c2298e2b056bc7b3785018c7e3cb29d7e47f --- .../Formats/Jpg/JpegDecoderCore.cs.REMOVED.git-id | 2 +- tests/ImageProcessorCore.Tests/TestImages.cs | 2 +- .../TestImages/Formats/Jpg/cmyk.jpg.REMOVED.git-id | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 tests/ImageProcessorCore.Tests/TestImages/Formats/Jpg/cmyk.jpg.REMOVED.git-id diff --git a/src/ImageProcessorCore/Formats/Jpg/JpegDecoderCore.cs.REMOVED.git-id b/src/ImageProcessorCore/Formats/Jpg/JpegDecoderCore.cs.REMOVED.git-id index 1f1ad448b..4834b4f8c 100644 --- a/src/ImageProcessorCore/Formats/Jpg/JpegDecoderCore.cs.REMOVED.git-id +++ b/src/ImageProcessorCore/Formats/Jpg/JpegDecoderCore.cs.REMOVED.git-id @@ -1 +1 @@ -c27ddeac481f3a9631dcb53248a98676c8016f42 \ No newline at end of file +d658b8da439c129fd21231f809b0edc27fc0f099 \ No newline at end of file diff --git a/tests/ImageProcessorCore.Tests/TestImages.cs b/tests/ImageProcessorCore.Tests/TestImages.cs index 61c5f25cd..965418b93 100644 --- a/tests/ImageProcessorCore.Tests/TestImages.cs +++ b/tests/ImageProcessorCore.Tests/TestImages.cs @@ -24,7 +24,7 @@ namespace ImageProcessorCore.Tests public static class Jpg { private static readonly string folder = "TestImages/Formats/Jpg/"; - + public static string Cmyk { get { return folder + "cmyk.jpg"; } } public static string Exif { get { return folder + "exif.jpeg"; } } public static string Floorplan { get { return folder + "Floorplan.jpeg"; } } public static string Calliphora { get { return folder + "Calliphora.jpg"; } } diff --git a/tests/ImageProcessorCore.Tests/TestImages/Formats/Jpg/cmyk.jpg.REMOVED.git-id b/tests/ImageProcessorCore.Tests/TestImages/Formats/Jpg/cmyk.jpg.REMOVED.git-id new file mode 100644 index 000000000..fb900876a --- /dev/null +++ b/tests/ImageProcessorCore.Tests/TestImages/Formats/Jpg/cmyk.jpg.REMOVED.git-id @@ -0,0 +1 @@ +30e88773ededd890ad97f0a5cfac372e1af07aa5 \ No newline at end of file