Update sample code (#14)

samples/Convert/Program.cs

@@ -1,129 +1,46 @@
 // Copyright (c) Team CharLS.
 // SPDX-License-Identifier: BSD-3-Clause
 
+using CharLS.Managed.ImageSharp;
+using SixLabors.ImageSharp;
+
 const int success = 0;
 const int failure = 1;
 
 // This sample demonstrates how to convert another encoded image to a JPEG-LS encoded image.
 // The input path should be an absolute path to a file format .NET can read (.bmp, .png, etc.).
-if (!TryParseArguments(args, out string _))
+if (!TryParseArguments(args, out string inputPath))
 {
     Console.WriteLine("Usage: Convert input-image-filename");
     return failure;
 }
 
-return success;
-
-//try
-//{
-//    using Bitmap sourceImage = new(inputPath);
-
-//    if (!TryGetFrameInfoAndPixelFormat(sourceImage, out var frameInfo, out var filePixelFormat))
-//    {
-//        Console.WriteLine($"Conversion not supported: {sourceImage.PixelFormat}");
-//        return failure;
-//    }
-
-//    var bitmapData = sourceImage.LockBits(
-//            new Rectangle(0, 0, sourceImage.Width, sourceImage.Height),
-//            ImageLockMode.ReadOnly,
-//            filePixelFormat);
-//    try
-//    {
-//        if (bitmapData.Stride < 0)
-//        {
-//            Console.WriteLine($"Image {inputPath} is not top down.");
-//            return failure;
-//        }
-
-//        Span<byte> pixels;
-//        unsafe
-//        {
-//            pixels = new Span<byte>(bitmapData.Scan0.ToPointer(), bitmapData.Stride * sourceImage.Height);
-//        }
-
-//        // GDI+ returns BGR pixels, JPEG-LS (Spiff) only knows RGB as color space.
-//        if (frameInfo.ComponentCount == 3)
-//        {
-//            ConvertBgrToRgb(pixels, sourceImage.Width, sourceImage.Height, bitmapData.Stride);
-//        }
-
-//        JpegLSEncoder encoder = new(frameInfo)
-//        {
-//            InterleaveMode = frameInfo.ComponentCount == 1 ? InterleaveMode.None : InterleaveMode.Sample
-//        };
-
-//        encoder.WriteStandardSpiffHeader(MapComponentCountToSpiffColorSpace(frameInfo.ComponentCount));
-//        encoder.Encode(pixels, bitmapData.Stride);
-
-//        Save(GetOutputPath(inputPath), encoder.EncodedData.Span);
-//    }
-//    finally
-//    {
-//        sourceImage.UnlockBits(bitmapData);
-//    }
-
-//    return success;
-//}
-//catch (IOException e)
-//{
-//    Console.WriteLine("Error: " + e.Message);
-//    return failure;
-//}
-//catch (ArgumentException e)
-//{
-//    Console.WriteLine($"Invalid path: {inputPath}.");
-//    Console.WriteLine("Error: " + e.Message);
-//    return failure;
-//}
-
-//// GetPixelFormat() does not tell anything about the file format, it tells what the image codec
-//// chose for the in-memory representation of the bitmap data.
-//// PNG 8bits/grayscale is loaded as PixelFormat32bppARGB
-//// JPG/TIFF 8bits/grayscale are loaded as PixelFormat8bppIndexed
-//bool TryGetFrameInfoAndPixelFormat(Image sourceImage, [NotNullWhen(true)] out FrameInfo frameInfo, out PixelFormat filePixelFormat)
-//{
-//    var pixelFormat = sourceImage.PixelFormat;
-//    var flags = sourceImage.Flags;
-//    var colorSpaceGray = (flags & (int)ImageFlags.ColorSpaceGray) > 0;
-
-//    frameInfo = default;
-//    filePixelFormat = default;
-//    if (pixelFormat is PixelFormat.Format8bppIndexed
-//        or PixelFormat.Format24bppRgb)
-//    {
-//        filePixelFormat = pixelFormat;
-//    }
-//    else if (pixelFormat == PixelFormat.Format32bppArgb)
-//    {
-//        filePixelFormat = colorSpaceGray ? PixelFormat.Format8bppIndexed : PixelFormat.Format24bppRgb;
-//    }
+try
+{
+    using var image = Image.Load(inputPath);
 
-//    if (filePixelFormat != default)
-//    {
-//        var componentCount = Image.GetPixelFormatSize(filePixelFormat) / 8;
-//        frameInfo = new FrameInfo
-//        {
-//            Width = sourceImage.Width,
-//            Height = sourceImage.Height,
-//            BitsPerSample = 8,
-//            ComponentCount = componentCount
-//        };
-//    }
+    Configuration configuration = new(new JpegLSConfigurationModule());
+    var encoder = configuration.ImageFormatsManager.GetEncoder(JpegLSFormat.Instance);
 
-//    return filePixelFormat != default;
-//}
+    using FileStream output = new(GetOutputPath(inputPath), FileMode.OpenOrCreate);
+    image.Save(output, encoder);
 
-//string GetOutputPath(string inputPathArg)
-//{
-//    return Path.ChangeExtension(inputPathArg, ".jls");
-//}
+    return success;
+}
+catch (IOException e)
+{
+    Console.WriteLine("Error: " + e.Message);
+    return failure;
+}
+catch (ArgumentException e)
+{
+    Console.WriteLine($"Invalid path: {inputPath}.");
+    Console.WriteLine("Error: " + e.Message);
+    return failure;
+}
 
-//void Save(string path, ReadOnlySpan<byte> encodedData)
-//{
-//    using FileStream output = new(path, FileMode.OpenOrCreate);
-//    output.Write(encodedData);
-//}
+static string GetOutputPath(string inputPathArg)
+    => Path.ChangeExtension(inputPathArg, ".jls");
 
 static bool TryParseArguments(IReadOnlyList<string> args, out string inputPathArg)
 {
@@ -136,31 +53,3 @@ static bool TryParseArguments(IReadOnlyList<string> args, out string inputPathAr
     inputPathArg = args[0];
     return true;
 }
-
-//void ConvertBgrToRgb(Span<byte> pixels, int width, int height, int stride)
-//{
-//    const int bytesPerRgbPixel = 3;
-
-//    for (int line = 0; line < height; ++line)
-//    {
-//        int lineStart = line * stride;
-//        for (int pixel = 0; pixel < width; ++pixel)
-//        {
-//            int column = pixel * bytesPerRgbPixel;
-//            int a = lineStart + column;
-//            int b = lineStart + column + 2;
-
-//            (pixels[a], pixels[b]) = (pixels[b], pixels[a]);
-//        }
-//    }
-//}
-
-//SpiffColorSpace MapComponentCountToSpiffColorSpace(int componentCount)
-//{
-//    return componentCount switch
-//    {
-//        1 => SpiffColorSpace.Grayscale,
-//        3 => SpiffColorSpace.Rgb,
-//        _ => SpiffColorSpace.None
-//    };
-//}