aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.Providers/Photos/PhotoProvider.cs26
1 files changed, 6 insertions, 20 deletions
diff --git a/MediaBrowser.Providers/Photos/PhotoProvider.cs b/MediaBrowser.Providers/Photos/PhotoProvider.cs
index 96160dcc4..b635d4ead 100644
--- a/MediaBrowser.Providers/Photos/PhotoProvider.cs
+++ b/MediaBrowser.Providers/Photos/PhotoProvider.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
@@ -18,12 +17,10 @@ namespace MediaBrowser.Providers.Photos
public class PhotoProvider : ICustomMetadataProvider<Photo>, IHasItemChangeMonitor, IForcedProvider
{
private readonly ILogger _logger;
- private readonly IImageProcessor _imageProcessor;
- public PhotoProvider(ILogger logger, IImageProcessor imageProcessor)
+ public PhotoProvider(ILogger logger)
{
_logger = logger;
- _imageProcessor = imageProcessor;
}
public Task<ItemUpdateType> FetchAsync(Photo item, MetadataRefreshOptions options, CancellationToken cancellationToken)
@@ -75,10 +72,13 @@ namespace MediaBrowser.Providers.Photos
}
}
}
-
+
item.CameraMake = image.ImageTag.Make;
item.CameraModel = image.ImageTag.Model;
+ item.Width = image.Properties.PhotoWidth;
+ item.Height = image.Properties.PhotoHeight;
+
var rating = image.ImageTag.Rating;
if (rating.HasValue)
{
@@ -142,20 +142,6 @@ namespace MediaBrowser.Providers.Photos
_logger.ErrorException("Image Provider - Error reading image tag for {0}", e, item.Path);
}
- var imageInfo = item.GetImageInfo(ImageType.Primary, 0);
-
- try
- {
- var size = _imageProcessor.GetImageSize(imageInfo);
-
- item.Width = Convert.ToInt32(size.Width);
- item.Height = Convert.ToInt32(size.Height);
- }
- catch
- {
-
- }
-
const ItemUpdateType result = ItemUpdateType.ImageUpdate | ItemUpdateType.MetadataImport;
return Task.FromResult(result);
}