diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-11-12 14:30:07 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-11-12 14:30:07 -0500 |
| commit | 0bdc25382a57b06d491b8e3c85b3fcbae02e7ec4 (patch) | |
| tree | ad2fc0a09843ecdaadd1c0aa6fc24555342c7c88 /MediaBrowser.Controller/Drawing | |
| parent | e71d02e8b193beb051b0fec2c74754ddda18cbca (diff) | |
fix merge conflicts
Diffstat (limited to 'MediaBrowser.Controller/Drawing')
| -rw-r--r-- | MediaBrowser.Controller/Drawing/IImageProcessor.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs index 058bf70cd..d42a04f2e 100644 --- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs +++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs @@ -19,7 +19,7 @@ namespace MediaBrowser.Controller.Drawing /// </summary> /// <value>The supported input formats.</value> string[] SupportedInputFormats { get; } - + /// <summary> /// Gets the image enhancers. /// </summary> @@ -39,7 +39,7 @@ namespace MediaBrowser.Controller.Drawing /// <param name="path">The path.</param> /// <returns>ImageSize.</returns> ImageSize GetImageSize(string path); - + /// <summary> /// Adds the parts. /// </summary> @@ -78,13 +78,13 @@ namespace MediaBrowser.Controller.Drawing /// <param name="toStream">To stream.</param> /// <returns>Task.</returns> Task ProcessImage(ImageProcessingOptions options, Stream toStream); - + /// <summary> /// Processes the image. /// </summary> /// <param name="options">The options.</param> /// <returns>Task.</returns> - Task<Tuple<string,string>> ProcessImage(ImageProcessingOptions options); + Task<Tuple<string, string>> ProcessImage(ImageProcessingOptions options); /// <summary> /// Gets the enhanced image. |