Change image dimentions from double to int

Rename ImageSize -> ImageDimensions

3 files changed, 28 insertions, 111 deletions

diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 522c10980..6d03a03b0 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -953,22 +953,11 @@ namespace MediaBrowser.Model.Dlna
 
                 if (videoStream != null && videoStream.Width.HasValue && videoStream.Height.HasValue)
                 {
-                    var size = new ImageSize
-                    {
-                        Width = videoStream.Width.Value,
-                        Height = videoStream.Height.Value
-                    };
-
-                    double? maxWidth = MaxWidth.HasValue ? (double)MaxWidth.Value : (double?)null;
-                    double? maxHeight = MaxHeight.HasValue ? (double)MaxHeight.Value : (double?)null;
+                    ImageDimensions size = new ImageDimensions(videoStream.Width.Value, videoStream.Height.Value);
 
-                    var newSize = DrawingUtils.Resize(size,
-                        0,
-                        0,
-                        maxWidth ?? 0,
-                        maxHeight ?? 0);
+                    size = DrawingUtils.Resize(size, 0, 0, MaxWidth ?? 0, MaxHeight ?? 0);
 
-                    return Convert.ToInt32(newSize.Width);
+                    return size.Width;
                 }
 
                 return MaxWidth;
@@ -983,22 +972,11 @@ namespace MediaBrowser.Model.Dlna
 
                 if (videoStream != null && videoStream.Width.HasValue && videoStream.Height.HasValue)
                 {
-                    var size = new ImageSize
-                    {
-                        Width = videoStream.Width.Value,
-                        Height = videoStream.Height.Value
-                    };
-
-                    double? maxWidth = MaxWidth.HasValue ? (double)MaxWidth.Value : (double?)null;
-                    double? maxHeight = MaxHeight.HasValue ? (double)MaxHeight.Value : (double?)null;
+                    ImageDimensions size = new ImageDimensions(videoStream.Width.Value, videoStream.Height.Value);
 
-                    var newSize = DrawingUtils.Resize(size,
-                        0,
-                        0,
-                        maxWidth ?? 0,
-                        maxHeight ?? 0);
+                    size = DrawingUtils.Resize(size, 0, 0, MaxWidth ?? 0, MaxHeight ?? 0);
 
-                    return Convert.ToInt32(newSize.Height);
+                    return size.Height;
                 }
 
                 return MaxHeight;
diff --git a/MediaBrowser.Model/Drawing/DrawingUtils.cs b/MediaBrowser.Model/Drawing/DrawingUtils.cs
index fbd074218..9fe85512f 100644
--- a/MediaBrowser.Model/Drawing/DrawingUtils.cs
+++ b/MediaBrowser.Model/Drawing/DrawingUtils.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace MediaBrowser.Model.Drawing
 {
     /// <summary>
@@ -14,27 +16,25 @@ namespace MediaBrowser.Model.Drawing
         /// <param name="maxWidth">A max fixed width, if desired</param>
         /// <param name="maxHeight">A max fixed height, if desired</param>
         /// <returns>A new size object</returns>
-        public static ImageSize Resize(ImageSize size,
-            double width,
-            double height,
-            double maxWidth,
-            double maxHeight)
+        public static ImageDimensions Resize(ImageDimensions size,
+            int width,
+            int height,
+            int maxWidth,
+            int maxHeight)
         {
-            double newWidth = size.Width;
-            double newHeight = size.Height;
+            int newWidth = size.Width;
+            int newHeight = size.Height;
 
             if (width > 0 && height > 0)
             {
                 newWidth = width;
                 newHeight = height;
             }
-
             else if (height > 0)
             {
                 newWidth = GetNewWidth(newHeight, newWidth, height);
                 newHeight = height;
             }
-
             else if (width > 0)
             {
                 newHeight = GetNewHeight(newHeight, newWidth, width);
@@ -53,7 +53,7 @@ namespace MediaBrowser.Model.Drawing
                 newWidth = maxWidth;
             }
 
-            return new ImageSize { Width = newWidth, Height = newHeight };
+            return new ImageDimensions(newWidth, newHeight);
         }
 
         /// <summary>
@@ -62,15 +62,9 @@ namespace MediaBrowser.Model.Drawing
         /// <param name="currentHeight">Height of the current.</param>
         /// <param name="currentWidth">Width of the current.</param>
         /// <param name="newHeight">The new height.</param>
-        /// <returns>System.Double.</returns>
-        private static double GetNewWidth(double currentHeight, double currentWidth, double newHeight)
-        {
-            double scaleFactor = newHeight;
-            scaleFactor /= currentHeight;
-            scaleFactor *= currentWidth;
-
-            return scaleFactor;
-        }
+        /// <returns>the new width</returns>
+        private static int GetNewWidth(int currentHeight, int currentWidth, int newHeight)
+            => Convert.ToInt32((double)newHeight / currentHeight * currentWidth);
 
         /// <summary>
         /// Gets the new height.
@@ -79,13 +73,7 @@ namespace MediaBrowser.Model.Drawing
         /// <param name="currentWidth">Width of the current.</param>
         /// <param name="newWidth">The new width.</param>
         /// <returns>System.Double.</returns>
-        private static double GetNewHeight(double currentHeight, double currentWidth, double newWidth)
-        {
-            double scaleFactor = newWidth;
-            scaleFactor /= currentWidth;
-            scaleFactor *= currentHeight;
-
-            return scaleFactor;
-        }
+        private static int GetNewHeight(int currentHeight, int currentWidth, int newWidth)
+            => Convert.ToInt32((double)newWidth / currentWidth * currentHeight);
     }
 }
diff --git a/MediaBrowser.Model/Drawing/ImageSize.cs b/MediaBrowser.Model/Drawing/ImageSize.cs
index 87764bbf4..75591d83d 100644
--- a/MediaBrowser.Model/Drawing/ImageSize.cs
+++ b/MediaBrowser.Model/Drawing/ImageSize.cs
@@ -1,36 +1,23 @@
-using System.Globalization;
-
 namespace MediaBrowser.Model.Drawing
 {
     /// <summary>
     /// Struct ImageSize
     /// </summary>
-    public struct ImageSize
+    public struct ImageDimensions
     {
-        private double _height;
-        private double _width;
-
         /// <summary>
         /// Gets or sets the height.
         /// </summary>
         /// <value>The height.</value>
-        public double Height
-        {
-            get => _height;
-            set => _height = value;
-        }
+        public int Height { get; set; }
 
         /// <summary>
         /// Gets or sets the width.
         /// </summary>
         /// <value>The width.</value>
-        public double Width
-        {
-            get => _width;
-            set => _width = value;
-        }
+        public int Width { get; set; }
 
-        public bool Equals(ImageSize size)
+        public bool Equals(ImageDimensions size)
         {
             return Width.Equals(size.Width) && Height.Equals(size.Height);
         }
@@ -40,46 +27,10 @@ namespace MediaBrowser.Model.Drawing
             return string.Format("{0}-{1}", Width, Height);
         }
 
-        public ImageSize(string value)
+        public ImageDimensions(int width, int height)
         {
-            _width = 0;
-
-            _height = 0;
-
-            ParseValue(value);
-        }
-
-        public ImageSize(int width, int height)
-        {
-            _width = width;
-            _height = height;
-        }
-
-        public ImageSize(double width, double height)
-        {
-            _width = width;
-            _height = height;
-        }
-
-        private void ParseValue(string value)
-        {
-            if (!string.IsNullOrEmpty(value))
-            {
-                string[] parts = value.Split('-');
-
-                if (parts.Length == 2)
-                {
-                    if (double.TryParse(parts[0], NumberStyles.Any, CultureInfo.InvariantCulture, out var val))
-                    {
-                        _width = val;
-                    }
-
-                    if (double.TryParse(parts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out val))
-                    {
-                        _height = val;
-                    }
-                }
-            }
+            Width = width;
+            Height = height;
         }
     }
 }