Change image dimentions from double to int

Rename ImageSize -> ImageDimensions

4 files changed, 15 insertions, 14 deletions

diff --git a/MediaBrowser.Controller/Drawing/IImageEncoder.cs b/MediaBrowser.Controller/Drawing/IImageEncoder.cs
index 6e2d5781ac..5b8c9da6fd 100644
--- a/MediaBrowser.Controller/Drawing/IImageEncoder.cs
+++ b/MediaBrowser.Controller/Drawing/IImageEncoder.cs
@@ -44,6 +44,6 @@ namespace MediaBrowser.Controller.Drawing
         /// <value><c>true</c> if [supports image encoding]; otherwise, <c>false</c>.</value>
         bool SupportsImageEncoding { get; }
 
-        ImageSize GetImageSize(string path);
+        ImageDimensions GetImageSize(string path);
     }
 }
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index 7e6e0127fb..7831827309 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -26,16 +26,16 @@ namespace MediaBrowser.Controller.Drawing
         /// <value>The image enhancers.</value>
         IImageEnhancer[] ImageEnhancers { get; }
 
-        ImageSize GetImageSize(string path);
+        ImageDimensions GetImageSize(string path);
 
         /// <summary>
         /// Gets the size of the image.
         /// </summary>
         /// <param name="info">The information.</param>
         /// <returns>ImageSize.</returns>
-        ImageSize GetImageSize(BaseItem item, ItemImageInfo info);
+        ImageDimensions GetImageSize(BaseItem item, ItemImageInfo info);
 
-        ImageSize GetImageSize(BaseItem item, ItemImageInfo info, bool updateItem);
+        ImageDimensions GetImageSize(BaseItem item, ItemImageInfo info, bool updateItem);
 
         /// <summary>
         /// Adds the parts.
diff --git a/MediaBrowser.Controller/Drawing/ImageHelper.cs b/MediaBrowser.Controller/Drawing/ImageHelper.cs
index 2680c60bd3..f88a632236 100644
--- a/MediaBrowser.Controller/Drawing/ImageHelper.cs
+++ b/MediaBrowser.Controller/Drawing/ImageHelper.cs
@@ -1,3 +1,4 @@
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
@@ -6,7 +7,7 @@ namespace MediaBrowser.Controller.Drawing
 {
     public static class ImageHelper
     {
-        public static ImageSize GetNewImageSize(ImageProcessingOptions options, ImageSize? originalImageSize)
+        public static ImageDimensions GetNewImageSize(ImageProcessingOptions options, ImageDimensions? originalImageSize)
         {
             if (originalImageSize.HasValue)
             {
@@ -20,26 +21,26 @@ namespace MediaBrowser.Controller.Drawing
 
         public static IImageProcessor ImageProcessor { get; set; }
 
-        private static ImageSize GetSizeEstimate(ImageProcessingOptions options)
+        private static ImageDimensions GetSizeEstimate(ImageProcessingOptions options)
         {
             if (options.Width.HasValue && options.Height.HasValue)
             {
-                return new ImageSize(options.Width.Value, options.Height.Value);
+                return new ImageDimensions(options.Width.Value, options.Height.Value);
             }
 
-            var aspect = GetEstimatedAspectRatio(options.Image.Type, options.Item);
+            double aspect = GetEstimatedAspectRatio(options.Image.Type, options.Item);
 
-            var width = options.Width ?? options.MaxWidth;
+            int? width = options.Width ?? options.MaxWidth;
 
             if (width.HasValue)
             {
-                var heightValue = width.Value / aspect;
-                return new ImageSize(width.Value, heightValue);
+                int heightValue = Convert.ToInt32((double)width.Value / aspect);
+                return new ImageDimensions(width.Value, heightValue);
             }
 
             var height = options.Height ?? options.MaxHeight ?? 200;
-            var widthValue = aspect * height;
-            return new ImageSize(widthValue, height);
+            int widthValue = Convert.ToInt32(aspect * height);
+            return new ImageDimensions(widthValue, height);
         }
 
         private static double GetEstimatedAspectRatio(ImageType type, BaseItem item)
diff --git a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
index 00d93930fd..db432f500e 100644
--- a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
+++ b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
@@ -57,7 +57,7 @@ namespace MediaBrowser.Controller.Drawing
                 !MaxHeight.HasValue;
         }
 
-        public bool HasDefaultOptions(string originalImagePath, ImageSize? size)
+        public bool HasDefaultOptions(string originalImagePath, ImageDimensions? size)
         {
             if (!size.HasValue)
             {