diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-05 15:49:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 15:49:26 -0400 |
| commit | 5116b175ce4a1f3a54c64c6f8fa8e8fba1a69e1a (patch) | |
| tree | ce6784069ed4cb412c917dc1e3d884c56dea2654 /Emby.Drawing/ImageProcessor.cs | |
| parent | 637795aaf5e203d3a5a98cf9caa742663d0ee14e (diff) | |
| parent | 49b799adbe3d65973b136bee758584748ecf6c2a (diff) | |
Merge pull request #2866 from MediaBrowser/dev
3.2.30.8
Diffstat (limited to 'Emby.Drawing/ImageProcessor.cs')
| -rw-r--r-- | Emby.Drawing/ImageProcessor.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs index 356343bae..1d3f4a8e3 100644 --- a/Emby.Drawing/ImageProcessor.cs +++ b/Emby.Drawing/ImageProcessor.cs @@ -126,6 +126,7 @@ namespace Emby.Drawing return new string[] { "tiff", + "tif", "jpeg", "jpg", "png", @@ -967,8 +968,15 @@ namespace Emby.Drawing public void Dispose() { _disposed = true; - _imageEncoder.Dispose(); + + var disposable = _imageEncoder as IDisposable; + if (disposable != null) + { + disposable.Dispose(); + } + _saveImageSizeTimer.Dispose(); + GC.SuppressFinalize(this); } private void CheckDisposed() |