Browse Source

Merge branch 'main' into bp/Issue2877

pull/2878/head
James Jackson-South 10 months ago
committed by GitHub
parent
commit
85c7ed2855
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      .github/workflows/build-and-test.yml
  2. 4
      .github/workflows/code-coverage.yml
  3. 5
      Directory.Build.props
  4. 2
      src/ImageSharp/Formats/Webp/BitWriter/Vp8BitWriter.cs

4
.github/workflows/build-and-test.yml

@ -74,7 +74,9 @@ jobs:
steps:
- name: Install libgdi+, which is required for tests running on ubuntu
if: ${{ contains(matrix.options.os, 'ubuntu') }}
run: sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
run: |
sudo apt-get update
sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
- name: Git Config
shell: bash

4
.github/workflows/code-coverage.yml

@ -20,7 +20,9 @@ jobs:
- name: Install libgdi+, which is required for tests running on ubuntu
if: ${{ contains(matrix.options.os, 'ubuntu') }}
run: sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
run: |
sudo apt-get update
sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
- name: Git Config
shell: bash

5
Directory.Build.props

@ -21,9 +21,8 @@
<!-- Import the shared global .props file -->
<Import Project="$(MSBuildThisFileDirectory)shared-infrastructure\msbuild\props\SixLabors.Global.props" />
<PropertyGroup Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
<!-- Workaround various issues bound to implicit language features. -->
<LangVersion>preview</LangVersion>
<PropertyGroup>
<LangVersion>12.0</LangVersion>
</PropertyGroup>
<!--

2
src/ImageSharp/Formats/Webp/BitWriter/Vp8BitWriter.cs

@ -604,7 +604,7 @@ internal class Vp8BitWriter : BitWriterBase
uint profile = 0;
int width = this.enc.Width;
int height = this.enc.Height;
byte[] vp8FrameHeader = new byte[WebpConstants.Vp8FrameHeaderSize];
Span<byte> vp8FrameHeader = stackalloc byte[WebpConstants.Vp8FrameHeaderSize];
// Paragraph 9.1.
uint bits = 0 // keyframe (1b)

Loading…
Cancel
Save