bump SixLabors to latest

resolves #1144

Author: jakubmisek

src/Peachpie.Library.Graphics/Exif.cs

@@ -97,7 +97,7 @@ public static PhpArray exif_read_data(Context ctx, string filename, string secti
             //array.Add("FileDateTime", (int)File.GetCreationTime(filename).ToOADate());
             array.Add("FileSize", (int)bytes.Length);
 
-            IImageInfo image;
+            ImageInfo image;
 
             using (var ms = new MemoryStream(bytes))
             {
@@ -374,22 +374,20 @@ public static PhpString exif_thumbnail(Context ctx, string filename, PhpAlias wi
                 return default(PhpString);
 
             // get thumbnail from <filename>'s content:
-            using (var ms = new MemoryStream(bytes))
+            try
             {
-                try
+                //using (var image = Image.Load(bytes.AsSpan()))
                 {
                     // TODO: Image.Identify needs a new overload that returns the format.
-                    using (var image = Image.Load(ms, out format))
-                    {
-                        // return byte[] ~ image.MetaData.ExifProfile{ this.data, this.thumbnailOffset, this.thumbnailLength }
-                        thumbnail = image.Metadata.ExifProfile.CreateThumbnail<Rgba32>();
-                    }
-                }
-                catch
-                {
-                    return default(PhpString);
+                    var imageInfo = Image.Identify(bytes.AsSpan());
+                    // return byte[] ~ image.MetaData.ExifProfile{ this.data, this.thumbnailOffset, this.thumbnailLength }
+                    imageInfo.Metadata.ExifProfile.TryCreateThumbnail<Rgba32>(out thumbnail);
                 }
             }
+            catch
+            {
+                return default(PhpString);
+            }
 
             if (thumbnail == null)
             {

src/Peachpie.Library.Graphics/Peachpie.Library.Graphics.csproj

@@ -9,9 +9,9 @@
     <Description>Peachpie PHP language library functions for image processing.</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.8" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" />
-    <PackageReference Include="SixLabors.Fonts" Version="1.0.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
+    <PackageReference Include="SixLabors.Fonts" Version="2.1.3" />
   </ItemGroup>
 
   <ItemGroup>

src/Peachpie.Library.Graphics/PhpGd2.cs

@@ -447,7 +447,7 @@ public static PhpResource imagecreatetruecolor(int x_size, int y_size)
             return img;
         }
 
-        static PhpGdImageResource imagecreatecommon(int x_size, int y_size, IConfigurationModule configuration, IImageFormat format)
+        static PhpGdImageResource imagecreatecommon(int x_size, int y_size, IImageFormatConfigurationModule configuration, IImageFormat format)
         {
             if (x_size <= 0 || y_size <= 0)
             {
@@ -472,7 +472,9 @@ public static PhpResource imagecreatefromstring(byte[] image)
 
             try
             {
-                return new PhpGdImageResource(Image.Load<Rgba32>(image, out var format), format);
+                return new PhpGdImageResource(
+                    Image.Load<Rgba32>(image.AsSpan())
+                );
             }
             catch
             {
@@ -562,35 +564,35 @@ public static PhpResource imagecreatefromxpm(Context ctx, string filename)
             return imagercreatefromfile(ctx, filename);
         }
 
-        static PhpGdImageResource imagercreatefromfile(Context ctx, string filename, IConfigurationModule formatOpt = null)
+        static PhpGdImageResource imagercreatefromfile(Context ctx, string filename, IImageFormatConfigurationModule formatOpt = null)
         {
             if (string.IsNullOrEmpty(filename))
             {
                 PhpException.Throw(PhpError.Warning, Resources.filename_cannot_be_empty);
                 return null;
             }
 
-            var configuration = (formatOpt == null)
-                ? Configuration.Default
-                : new Configuration(formatOpt);
+            var decoderOptions =  (formatOpt == null)
+                ? new DecoderOptions()
+                : new DecoderOptions() { Configuration = new Configuration(formatOpt) }
+                ;
 
             Image<Rgba32> img = null;
-            IImageFormat format = null;
-
+            
             using (var stream = Utils.OpenStream(ctx, filename))
             {
                 if (stream != null)
                 {
                     try
                     {
-                        img = Image.Load<Rgba32>(configuration, stream, out format);
+                        img = Image.Load<Rgba32>(decoderOptions, stream);
                     }
                     catch { }
                 }
             }
 
             return (img != null)
-                ? new PhpGdImageResource(img, format)
+                ? new PhpGdImageResource(img)
                 : null;
         }
 
@@ -1264,7 +1266,13 @@ static bool imagecopy(PhpResource dst_im, PhpResource src_im, int dst_x, int dst
                         .Crop(new Rectangle(src_x, src_y, src_w, src_h))
                         .Resize(new Size(src_w, src_h))))
                 {
-                    dst.Image.Mutate(o => o.DrawImage(cropped, opacity: opacity, location: new Point(dst_x, dst_y)));
+                    dst.Image.Mutate<Rgba32>(
+                        o => o.DrawImage(
+                            cropped,
+                            opacity: opacity,
+                            backgroundLocation: new Point(dst_x, dst_y)
+                        )
+                    );
                 }
             }
             catch (Exception ex)
@@ -1320,7 +1328,7 @@ public static bool imagegd(PhpResource im)
             return imagesave(ctx, im, to, (img, stream) =>
             {
                 // use the source's encoder:
-                var encoder = img.GetConfiguration().ImageFormatsManager.FindEncoder(GifFormat.Instance) as GifEncoder;
+                var encoder = img.Configuration.ImageFormatsManager.GetEncoder(GifFormat.Instance) as GifEncoder;
 
                 // or use default encoding options
                 encoder ??= new GifEncoder(); // TODO: ColorTableMode from allocated colors count?

src/Peachpie.Library.Graphics/PhpGdImageResource.cs

@@ -70,15 +70,15 @@ private PhpGdImageResource()
         {
         }
 
-        internal PhpGdImageResource(int x, int y, IConfigurationModule configuration, IImageFormat format)
+        internal PhpGdImageResource(int x, int y, IImageFormatConfigurationModule configuration, IImageFormat format)
             : this(new TImage(new Configuration(configuration), x, y), format)
         {
         }
 
         /// <summary>
         ///  Creates PhpGdImageResource without creating internal image.
         /// </summary>
-        internal PhpGdImageResource(TImage/*!*/image, IImageFormat format)
+        internal PhpGdImageResource(TImage/*!*/image, IImageFormat format = null)
             : this()
         {
             Debug.Assert(image != null);
@@ -88,7 +88,7 @@ internal PhpGdImageResource(TImage/*!*/image, IImageFormat format)
 
             //
             _image = image;
-            _format = format;
+            _format = format ?? image.Metadata.DecodedImageFormat;
         }
 
         static void RemoveFramesRange(TImage/*!*/image, int from, int count)