Use light WebP library rather than Skia

Author: eltos

PasteIntoFile.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFile", "PasteIntoFile\PasteIntoFile.csproj", "{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebP", "WebP\WebP.csproj", "{D0BAB316-8DF0-4955-8B5A-E4909402A906}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0BAB316-8DF0-4955-8B5A-E4909402A906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0BAB316-8DF0-4955-8B5A-E4909402A906}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0BAB316-8DF0-4955-8B5A-E4909402A906}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0BAB316-8DF0-4955-8B5A-E4909402A906}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

PasteIntoFile/ClipboardContents.cs

@@ -16,7 +16,7 @@
 using PasteIntoFile.Properties;
 using PdfSharp.Drawing;
 using PdfSharp.Pdf;
-using SkiaSharp;
+using WebP;
 
 namespace PasteIntoFile {
 
@@ -186,20 +186,17 @@ public override void SaveAs(string path, string extension, bool append = false)
             if (image == null)
                 throw new FormatException(string.Format(Resources.str_error_cliboard_format_missmatch, extension));
 
-            var stream = new MemoryStream();
-            image.Save(stream, image.RawFormat);
-            stream.Position = 0;
 
             switch (NormalizeExtension(extension)) {
                 case "webp":
-                    //SKImage.FromEncodedData(stream).Encode(SKEncodedImageFormat.Webp, 90).SaveTo(File.OpenWrite(path));
-                    var webp = SKBitmap.Decode(stream).PeekPixels().Encode(new SKWebpEncoderOptions(SKWebpEncoderCompression.Lossless, 100));
-                    using (var fs = new FileStream(path, FileMode.Create)) {
-                        webp.SaveTo(fs);
-                        return;
-                    }
+                    var bytes = new WebPObject(image).GetWebPLossless();
+                    File.WriteAllBytes(path, bytes);
+                    return;
                 case "pdf":
                     // convert image to ximage
+                    var stream = new MemoryStream();
+                    image.Save(stream, image.RawFormat);
+                    stream.Position = 0;
                     XImage img = XImage.FromStream(stream);
                     // create pdf document
                     PdfDocument document = new PdfDocument();
@@ -235,10 +232,12 @@ public override PreviewHolder Preview(string extension) {
             // Special formats with intermediate conversion types
             switch (extension) {
                 case "pdf":
-                case "webp":
                     // Use png as intermediate format
                     extension = "png";
                     break;
+                case "webp":
+                    // Lossless as-is
+                    return PreviewHolder.ForImage(Image);
                 case "ico":
                     return PreviewHolder.ForImage(ImageAsIcon.ToBitmap());
             }
@@ -300,7 +299,8 @@ public TransparentImageContent(Image image) : base(image) { }
     /// Like ImageContent, but only for formats which support animated frames
     /// </summary>
     public class AnimatedImageContent : ImageContent {
-        public static new readonly string[] EXTENSIONS = { "gif" }; // TODO: in principle "webp" can also support animated frames
+        // TODO: in principle "webp" can also support animated frames, but the library we use doesn't support it
+        public static new readonly string[] EXTENSIONS = { "gif" };
         public AnimatedImageContent(Image image) : base(image) { }
         public override string[] Extensions => EXTENSIONS;
     }
@@ -1008,31 +1008,9 @@ public static ClipboardContents FromFile(string path) {
             // add the file itself
             container.Contents.Add(new FilesContent(new StringCollection { path }));
 
-            // if it's an image (try&catch instead of maintaining a list of supported extensions)
-            try {
-                var img = Image.FromFile(path);
-                img = RotateFlipImageFromExif(img);
-                if (img is Metafile mf) {
-                    container.Contents.Add(new VectorImageContent(mf));
-                } else {
-                    container.Contents.Add(new ImageContent(img));
-                }
-            } catch {
-                // Try again with Skia (to support webp)
-                try {
-                    using (var fs = new FileStream(path, FileMode.Open, FileAccess.Read)) {
-                        var img = SKBitmap.Decode(fs);
-                        using (var stream = img.PeekPixels().Encode(SKPngEncoderOptions.Default).AsStream()) {
-                            if (img.AlphaType == SKAlphaType.Opaque) {
-                                container.Contents.Add(new ImageContent(Image.FromStream(stream)));
-                            } else {
-                                // TODO: FIXME: transparency seems to get lost during conversion
-                                container.Contents.Add(new TransparentImageContent(Image.FromStream(stream)));
-                            }
-                        }
-                    }
-                } catch { /* it's not */ }
-            }
+            // if it's an image
+            if (ImageContentFromBytes(ext, File.ReadAllBytes(path)) is BaseContent content)
+                container.Contents.Add(content);
 
 
             // if it's text like (check for absence of zero byte)
@@ -1114,6 +1092,38 @@ private static Image ImageFromDataUri(string uri) {
             return null;
         }
 
+        private static ImageLikeContent ImageContentFromBytes(string ext, byte[] bytes) {
+            try {
+                if (ext == "webp") {
+                    var webp = new WebPObject(bytes);
+                    var img = new Bitmap(webp.GetImage()); // create copy
+                    if (webp.GetInfo().IsAnimated)
+                        return new AnimatedImageContent(img);
+                    if (webp.GetInfo().HasAlpha)
+                        return new TransparentImageContent(img);
+                    return new ImageContent(img);
+                }
+            } catch (Exception e) { /* not a webp, or an animated webp which we don't support yet */
+                Console.WriteLine(e);
+            }
+            try {
+                var img = Image.FromStream(new MemoryStream(bytes));
+                img = RotateFlipImageFromExif(img);
+                if (img is Metafile mf)
+                    return new VectorImageContent(mf);
+                try {
+                    if (img.GetFrameCount(FrameDimension.Time) > 1)
+                        return new AnimatedImageContent(img);
+                } catch { /* not an animated image */ }
+                if (((ImageFlags)img.Flags).HasFlag(ImageFlags.HasAlpha))
+                    return new TransparentImageContent(img);
+                return new ImageContent(img);
+            } catch (Exception e) { /* not an image? */
+                Console.WriteLine(e);
+            }
+            return null;
+        }
+
         /// <summary>
         /// Rotates and flips the given image according to the respective EXIF flag, and remove the EXIF flag
         /// </summary>

PasteIntoFile/PasteIntoFile.csproj

@@ -12,6 +12,7 @@
         <StartupObject>PasteIntoFile.Program</StartupObject>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <ApplicationIcon>Resources/icon.ico</ApplicationIcon>
+        <LangVersion>12</LangVersion>
     </PropertyGroup>
     <!-- Build variants -->
     <PropertyGroup>
@@ -53,7 +54,6 @@
         <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
         <PackageReference Include="PDFsharp" Version="1.50.5147" />
         <PackageReference Include="SharpClipboard" Version="3.5.2" />
-        <PackageReference Include="SkiaSharp" Version="3.116.1" />
     </ItemGroup>
     <ItemGroup Condition="'$(Flavor)'=='Portable'">
         <PackageReference Include="PortableSettingsProvider" Version="0.2.4" />
@@ -157,6 +157,12 @@
             <EmbedInteropTypes>True</EmbedInteropTypes>
         </COMReference>
     </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\WebP\WebP.csproj">
+            <Project>{20e1114b-c211-46e5-a2e0-10a598ff4a44}</Project>
+            <Name>WebP</Name>
+        </ProjectReference>
+    </ItemGroup>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.

WebP/Helpers/ThrowHelper.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Data;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
+namespace WebP.Helpers;
+
+internal static class ThrowHelper {
+    [Obsolete]
+    public static Exception Create(
+        Exception inner,
+        [CallerMemberName] string caller = "Unknown") {
+        return new Exception($"{inner.Message}\nIn {caller}", inner);
+    }
+
+    public static Exception UnknownPlatform() {
+        return new PlatformNotSupportedException("Unknown platform detected. Platform must be x86 or x64");
+    }
+
+    [Obsolete]
+    public static Exception ContainsNoData([CallerMemberName] string caller = "Unknown") {
+        return Create(new DataException("Bitmap contains no data"), caller);
+    }
+
+    [Obsolete]
+    public static Exception SizeTooBig([CallerMemberName] string caller = "Unknown") {
+        return
+            Create(new DataException($"Dimension of bitmap is too large. Max is {WebPObject.WebpMaxDimension}x{WebPObject.WebpMaxDimension} pixels"),
+                   caller);
+    }
+
+    [Obsolete]
+    public static Exception CannotEncodeByUnknown([CallerMemberName] string caller = "Unknown") {
+        return Create(new Exception("Cannot encode by unknown cause"), caller);
+    }
+
+    [Obsolete]
+    public static Exception NullReferenced(string var, [CallerMemberName] string caller = "Unknown") {
+        return Create(new NullReferenceException($"{var} is null"), caller);
+    }
+
+    [Obsolete]
+    public static Exception QualityOutOfRange([CallerMemberName] string caller = "Unknown") {
+        return Create(new NullReferenceException("Quality must be between"), caller);
+    }
+}

WebP/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Sharp0802
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

WebP/Natives/Enums/Vp8StatusCode.cs

@@ -0,0 +1,12 @@
+namespace WebP.Natives.Enums;
+
+public enum Vp8StatusCode {
+    Ok,
+    OutOfMemory,
+    InvalidParam,
+    BitstreamError,
+    UnsupportedFeature,
+    Suspended,
+    UserAbort,
+    NotEnoughData
+}

WebP/Natives/Enums/WebPCspMode.cs

@@ -0,0 +1,22 @@
+namespace WebP.Natives.Enums;
+
+public enum WebpCspMode {
+    ModeRgb,
+    ModeRgba,
+    ModeBgr,
+    ModeBgra,
+
+    ModeARGB,
+    ModeRGBA4444,
+    ModeRGB565,
+
+    ModeRgbA,
+    ModeBgrA,
+
+    ModeArgb,
+    ModeRgbA4444,
+    ModeYuv,
+
+    ModeYuva,
+    ModeLast
+}

WebP/Natives/Enums/WebPImageHint.cs

@@ -0,0 +1,9 @@
+namespace WebP.Natives.Enums;
+
+public enum WebPImageHint {
+    Default,
+    Picture,
+    Photo,
+    Graph,
+    Last
+}

WebP/Natives/Enums/WebPPreset.cs

@@ -0,0 +1,10 @@
+namespace WebP.Natives.Enums;
+
+public enum WebPPreset {
+    Default,
+    Picture,
+    Photo,
+    Drawing,
+    Icon,
+    Text
+}