tsanie/PhotoThumbnail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix some register issue

Browse Source
This commit is contained in:
Tsanie Lily 2021-12-28 17:24:41 +08:00
parent c03de86d02
commit 3007e0639c
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PhotoThumbnail/TgaThumbnailer.cs
View File

@ -13,9 +13,7 @@ namespace PhotoThumbnail
[ThumbnailProvider("TgaThumbnailer", ".tga", ThumbnailAdornment = ThumbnailAdornment.PhotoBorder)]
public class TgaThumbnailer : ThumbnailProvider, IThumbnailFromStream, IThumbnailFromFile
{
#region IThumbnailFromStream Members
public Bitmap ConstructBitmap(Stream stream, int sideSize)
private Bitmap GetBitmap(Stream stream, int sideSize)
{
Bitmap bitmap = TgaDecoder.FromStream(stream);
@ -39,6 +37,16 @@ namespace PhotoThumbnail
return bitmap;
}
#region IThumbnailFromStream Members
public Bitmap ConstructBitmap(Stream stream, int sideSize)
{
using (stream)
{
return GetBitmap(stream, sideSize);
}
}
#endregion
#region IThumbnailFromFile Members
@ -47,7 +55,7 @@ namespace PhotoThumbnail
{
using (FileStream stream = File.OpenRead(info.FullName))
{
return ConstructBitmap(stream, sideSize);
return GetBitmap(stream, sideSize);
}
}

2
ShellExtensions/PreviewHandlers/PreviewHandler.cs
View File

@ -339,7 +339,7 @@ namespace ShellExtensions
private static void ThrowIfNotValid(Type type)
{
var interfaces = type.GetInterfaces();
if (!interfaces.Any(x => x is IPreviewFromStream || x is IPreviewFromFile))
if (!interfaces.Any(x => x == typeof(IPreviewFromStream) || x == typeof(IPreviewFromFile)))
{
throw new NotImplementedException(
string.Format(System.Globalization.CultureInfo.InvariantCulture,

2
ShellExtensions/PreviewHandlers/WinFormsPreviewHandler.cs
View File

@ -1,4 +1,4 @@
#if PREVIEW_HANDLER
#if PREVIEW_HANDLER_WINFORM
using ShellExtensions.Interop;
using ShellExtensions.Interop.Common;
using ShellExtensions.Resources;

4
ShellExtensions/ThumbnailProviders/ThumbnailProvider.cs
View File

@ -200,9 +200,9 @@ namespace ShellExtensions
}
var interfaces = type.GetInterfaces();
bool interfaced = interfaces.Any(x => x is IThumbnailFromStream);
bool interfaced = interfaces.Any(x => x == typeof(IThumbnailFromStream));
if (interfaces.Any(x => x is IThumbnailFromFile))
if (interfaces.Any(x => x == typeof(IThumbnailFromFile)))
{
// According to MSDN (http://msdn.microsoft.com/en-us/library/cc144114(v=VS.85).aspx)
// A thumbnail provider that does not implement IInitializeWithStream must opt out of