michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Luke Pulverenti 2015-11-12 14:30:07 -05:00
parent e71d02e8b1
commit 0bdc25382a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Controller/Drawing/IImageProcessor.cs
View File

@ -19,7 +19,7 @@ namespace MediaBrowser.Controller.Drawing
/// </summary> /// </summary>
/// <value>The supported input formats.</value> /// <value>The supported input formats.</value>
string[] SupportedInputFormats { get; } string[] SupportedInputFormats { get; }
/// <summary> /// <summary>
/// Gets the image enhancers. /// Gets the image enhancers.
/// </summary> /// </summary>
@ -39,7 +39,7 @@ namespace MediaBrowser.Controller.Drawing
/// <param name="path">The path.</param> /// <param name="path">The path.</param>
/// <returns>ImageSize.</returns> /// <returns>ImageSize.</returns>
ImageSize GetImageSize(string path); ImageSize GetImageSize(string path);
/// <summary> /// <summary>
/// Adds the parts. /// Adds the parts.
/// </summary> /// </summary>
@ -78,13 +78,13 @@ namespace MediaBrowser.Controller.Drawing
/// <param name="toStream">To stream.</param> /// <param name="toStream">To stream.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
Task ProcessImage(ImageProcessingOptions options, Stream toStream); Task ProcessImage(ImageProcessingOptions options, Stream toStream);
/// <summary> /// <summary>
/// Processes the image. /// Processes the image.
/// </summary> /// </summary>
/// <param name="options">The options.</param> /// <param name="options">The options.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
Task<Tuple<string,string>> ProcessImage(ImageProcessingOptions options); Task<Tuple<string, string>> ProcessImage(ImageProcessingOptions options);
/// <summary> /// <summary>
/// Gets the enhanced image. /// Gets the enhanced image.