Removed dependency on System.Drawing. Bumped framework to netstandard…

…1.3 in order to have System.IO.File available.
asido · Sep 28, 2016 · 17ad512 · 17ad512
1 parent 50ca450
commit 17ad512
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 21 deletions.
diff --git a/EpubSharp.Tests/EpubWriterTests.cs b/EpubSharp.Tests/EpubWriterTests.cs
@@ -98,7 +98,7 @@ public void AddRemoveTitleTest()
         public void SetCoverTest()
         {
             var writer = new EpubWriter();
-            writer.SetCover(File.ReadAllBytes("Cover.png"));
+            writer.SetCover(File.ReadAllBytes("Cover.png"), ImageFormat.Png);
 
             var epub = WriteAndRead(writer);
 

diff --git a/EpubSharp/EpubBook.cs b/EpubSharp/EpubBook.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using EpubSharp.Format;

diff --git a/EpubSharp/EpubReader.cs b/EpubSharp/EpubReader.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 using EpubSharp.Format;
 using EpubSharp.Format.Readers;

diff --git a/EpubSharp/EpubWriter.cs b/EpubSharp/EpubWriter.cs
@@ -1,16 +1,18 @@
 using System;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 using EpubSharp.Format;
 using EpubSharp.Format.Writers;
 
 namespace EpubSharp
 {
+    public enum ImageFormat
+    {
+        Gif, Png, Jpeg, Svg
+    }
+
     public class EpubWriter
     {
         private readonly string opfPath = "EPUB/package.opf";
@@ -277,27 +279,42 @@ public void RemoveCover()
             }
         }
 
-        public void SetCover(byte[] data)
+        public void SetCover(byte[] data, ImageFormat imageFormat)
         {
             if (data == null) throw new ArgumentNullException(nameof(data));
 
             RemoveCover();
 
-            var image = Image.FromStream(new MemoryStream(data));
-            if (image.RawFormat.Equals(ImageFormat.Png))
+            string filename;
+            EpubContentType type;
+
+            switch (imageFormat)
             {
-                using (var stream = new MemoryStream())
-                {
-                    image.Save(stream, ImageFormat.Png);
-                    data = stream.ReadToEnd();
-                }
+                case ImageFormat.Gif:
+                    filename = "cover.gif";
+                    type = EpubContentType.ImageGif;
+                    break;
+                case ImageFormat.Jpeg:
+                    filename = "cover.jpeg";
+                    type = EpubContentType.ImageJpeg;
+                    break;
+                case ImageFormat.Png:
+                    filename = "cover.png";
+                    type = EpubContentType.ImagePng;
+                    break;
+                case ImageFormat.Svg:
+                    filename = "cover.svg";
+                    type = EpubContentType.ImageSvg;
+                    break;
+                default:
+                    throw new ArgumentException($"Unsupported cover format: {format}", nameof(format));
             }
 
             var coverResource = new EpubByteFile
             {
                 Content = data,
-                FileName = "cover.png",
-                ContentType = EpubContentType.ImagePng
+                FileName = filename,
+                ContentType = type
             };
             coverResource.MimeType = ContentType.ContentTypeToMimeType[coverResource.ContentType];
             resources.Images.Add(coverResource);

diff --git a/EpubSharp/project.json b/EpubSharp/project.json
@@ -3,12 +3,11 @@
 
   "dependencies": {
     "NETStandard.Library": "1.6.0",
-    "CoreCompat.System.Drawing": "1.0.0-beta006",
     "System.Xml.XmlDocument": "4.0.1"
   },
 
   "frameworks": {
-    "netstandard1.2": {
+    "netstandard1.3": {
       "imports": "dnxcore50"
     }
   }