From 70aaa3625ea5ceac625018bcefb1efb5f6731578 Mon Sep 17 00:00:00 2001 From: Ceriel Boosveld Date: Thu, 25 Sep 2025 13:34:14 +0200 Subject: [PATCH 1/4] Add CodecFormat as argument to ReadHeader. Default to CodecFormat.Jp2 --- src/OpenJpegDotNet/IO/Reader.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/OpenJpegDotNet/IO/Reader.cs b/src/OpenJpegDotNet/IO/Reader.cs index 3f8f756..fba6ac2 100644 --- a/src/OpenJpegDotNet/IO/Reader.cs +++ b/src/OpenJpegDotNet/IO/Reader.cs @@ -89,7 +89,12 @@ public int Width #region Methods - public bool ReadHeader() + /// + /// Reads the header of the image stream and initializes the decoder with the specified codec format. + /// + /// The codec format to use for decompression. Default is . + /// true if the header was read successfully; otherwise, false. + public bool ReadHeader(CodecFormat codecFormat = CodecFormat.Jp2) { this._Codec?.Dispose(); this._DecompressionParameters?.Dispose(); @@ -99,9 +104,9 @@ public bool ReadHeader() this._DecompressionParameters = null; this._Image = null; - // ToDo: Support to change format? - this._Codec = OpenJpeg.CreateDecompress(CodecFormat.J2k); - //this._Codec = OpenJpeg.CreateDecompress(CodecFormat.Jp2); + // Set codec format + this._Codec = OpenJpeg.CreateDecompress(codecFormat); + this._DecompressionParameters = new DecompressionParameters(); OpenJpeg.SetDefaultDecoderParameters(this._DecompressionParameters); From 1c06162495bde9041fa22d8ddb1b2bf2cad02123 Mon Sep 17 00:00:00 2001 From: Ceriel Boosveld <127770341+cerielboosveld@users.noreply.github.com> Date: Thu, 25 Sep 2025 14:04:45 +0200 Subject: [PATCH 2/4] Create dotnet.yml --- .github/workflows/dotnet.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/dotnet.yml diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 0000000..3e2a4f1 --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,28 @@ +# This workflow will build a .NET project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net + +name: .NET + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 2.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --no-restore + - name: Test + run: dotnet test --no-build --verbosity normal From ae4831d872d2f60538d883f497f895f866c12a2f Mon Sep 17 00:00:00 2001 From: Ceriel Boosveld Date: Thu, 25 Sep 2025 15:37:52 +0200 Subject: [PATCH 3/4] Update System.Drawing.Common to 5.0.3 --- src/OpenJpegDotNet/OpenJpegDotNet.csproj | 9 +-------- test/OpenJpegDotNet.Tests/OpenJpegDotNet.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/OpenJpegDotNet/OpenJpegDotNet.csproj b/src/OpenJpegDotNet/OpenJpegDotNet.csproj index 8974365..61525d2 100644 --- a/src/OpenJpegDotNet/OpenJpegDotNet.csproj +++ b/src/OpenJpegDotNet/OpenJpegDotNet.csproj @@ -40,9 +40,7 @@ - - 5.0.2 - + @@ -51,9 +49,4 @@ - - - - - diff --git a/test/OpenJpegDotNet.Tests/OpenJpegDotNet.Tests.csproj b/test/OpenJpegDotNet.Tests/OpenJpegDotNet.Tests.csproj index 3c60ae4..4550821 100644 --- a/test/OpenJpegDotNet.Tests/OpenJpegDotNet.Tests.csproj +++ b/test/OpenJpegDotNet.Tests/OpenJpegDotNet.Tests.csproj @@ -32,7 +32,7 @@ - + From 2d4d576d572319ed523cf87974fa717d53b5cc35 Mon Sep 17 00:00:00 2001 From: Ceriel Boosveld Date: Thu, 25 Sep 2025 15:40:26 +0200 Subject: [PATCH 4/4] disable tests --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 3e2a4f1..bd1d055 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -24,5 +24,5 @@ jobs: run: dotnet restore - name: Build run: dotnet build --no-restore - - name: Test - run: dotnet test --no-build --verbosity normal + # - name: Test + # run: dotnet test --no-build --verbosity normal