From b010faa85b59e24d7ae2e9056c8ebccc4ce2425b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 4 Jun 2013 21:19:25 -0400
Subject: fixes #324 - Server to return non-cropped images to clients

---
 MediaBrowser.Api/Images/ImageWriter.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Api/Images/ImageWriter.cs')

diff --git a/MediaBrowser.Api/Images/ImageWriter.cs b/MediaBrowser.Api/Images/ImageWriter.cs
index e77a2f9b0..81dbb0243 100644
--- a/MediaBrowser.Api/Images/ImageWriter.cs
+++ b/MediaBrowser.Api/Images/ImageWriter.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
 using ServiceStack.Service;
 using ServiceStack.ServiceHost;
 using System;
@@ -28,11 +29,6 @@ namespace MediaBrowser.Api.Images
         /// <value>The item.</value>
         public BaseItem Item { get; set; }
         /// <summary>
-        /// Gets or sets a value indicating whether [crop white space].
-        /// </summary>
-        /// <value><c>true</c> if [crop white space]; otherwise, <c>false</c>.</value>
-        public bool CropWhiteSpace { get; set; }
-        /// <summary>
         /// The original image date modified
         /// </summary>
         public DateTime OriginalImageDateModified;
@@ -68,7 +64,14 @@ namespace MediaBrowser.Api.Images
         /// <returns>Task.</returns>
         private Task WriteToAsync(Stream responseStream)
         {
-            return Kernel.Instance.ImageManager.ProcessImage(Item, Request.Type, Request.Index ?? 0, CropWhiteSpace,
+            var cropwhitespace = Request.Type == ImageType.Logo || Request.Type == ImageType.Art;
+
+            if (Request.CropWhitespace.HasValue)
+            {
+                cropwhitespace = Request.CropWhitespace.Value;
+            }
+
+            return Kernel.Instance.ImageManager.ProcessImage(Item, Request.Type, Request.Index ?? 0, cropwhitespace,
                                                     OriginalImageDateModified, responseStream, Request.Width, Request.Height, Request.MaxWidth,
                                                     Request.MaxHeight, Request.Quality, Enhancers);
         }
-- 
cgit v1.2.3