diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-12 14:19:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 14:19:33 -0400 |
| commit | 1a6ee3d48aec8aa592ea2b0aab9560292ce717d6 (patch) | |
| tree | 558b953b1e01a16bd47d902c841cc747a50e0ae7 /MediaBrowser.Controller/Drawing | |
| parent | 65db32b1f878cd478e9f4b2b4c988890a7ca47c9 (diff) | |
| parent | 3cdb75190d457cbb3bed91bf79bfb4816cad29e2 (diff) | |
Merge pull request #2633 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.Controller/Drawing')
| -rw-r--r-- | MediaBrowser.Controller/Drawing/IImageEncoder.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Drawing/IImageProcessor.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/Drawing/IImageEncoder.cs b/MediaBrowser.Controller/Drawing/IImageEncoder.cs index de1909e54..830093fcf 100644 --- a/MediaBrowser.Controller/Drawing/IImageEncoder.cs +++ b/MediaBrowser.Controller/Drawing/IImageEncoder.cs @@ -16,12 +16,6 @@ namespace MediaBrowser.Controller.Drawing /// <value>The supported output formats.</value> ImageFormat[] SupportedOutputFormats { get; } /// <summary> - /// Crops the white space. - /// </summary> - /// <param name="inputPath">The input path.</param> - /// <param name="outputPath">The output path.</param> - void CropWhiteSpace(string inputPath, string outputPath); - /// <summary> /// Encodes the image. /// </summary> /// <param name="inputPath">The input path.</param> @@ -56,5 +50,7 @@ namespace MediaBrowser.Controller.Drawing /// </summary> /// <value><c>true</c> if [supports image encoding]; otherwise, <c>false</c>.</value> bool SupportsImageEncoding { get; } + + ImageSize GetImageSize(string path); } } diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs index 19f391b4a..a107c1232 100644 --- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs +++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs @@ -112,5 +112,7 @@ namespace MediaBrowser.Controller.Drawing /// </summary> /// <value><c>true</c> if [supports image collage creation]; otherwise, <c>false</c>.</value> bool SupportsImageCollageCreation { get; } + + IImageEncoder ImageEncoder { get; set; } } } diff --git a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs index f4b3d9455..70ac08343 100644 --- a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs +++ b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs @@ -86,6 +86,7 @@ namespace MediaBrowser.Controller.Drawing PercentPlayed.Equals(0) && !UnplayedCount.HasValue && !Blur.HasValue && + !CropWhiteSpace && string.IsNullOrEmpty(BackgroundColor) && string.IsNullOrEmpty(ForegroundLayer); } |