Skip to content

Commit

Permalink
Bump SixLabors.ImageSharp from 2.1.3 to 3.0.0 (#1233) #minor
Browse files Browse the repository at this point in the history
Bumps [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp)
from 2.1.3 to 3.0.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/SixLabors/ImageSharp/releases">SixLabors.ImageSharp's
releases</a>.</em></p>
<blockquote>
<h2>v3.0.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Use .NET 6 only by <a
href="https://github.com/JimBobSquarePants"><code>@​JimBobSquarePants</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2098">SixLabors/ImageSharp#2098</a></li>
<li>Convolution: Border wrapping modes by <a
href="https://github.com/ynse01"><code>@​ynse01</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2060">SixLabors/ImageSharp#2060</a></li>
<li>Use ReadOnlySpan<!-- raw HTML omitted --> static data compiler
optimization in more places by <a
href="https://github.com/turbedi"><code>@​turbedi</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2101">SixLabors/ImageSharp#2101</a></li>
<li>Add support for decoding jpeg's with arithmetic coding by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2073">SixLabors/ImageSharp#2073</a></li>
<li>Replace Array.Clear(array, 0, array.Length) calls with
Array.Clear(array) by <a
href="https://github.com/turbedi"><code>@​turbedi</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2103">SixLabors/ImageSharp#2103</a></li>
<li>Preserve color profile when encoding bitmaps by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2108">SixLabors/ImageSharp#2108</a></li>
<li>Preserve color profile when encoding webp images by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2109">SixLabors/ImageSharp#2109</a></li>
<li>Preserve color profile when encoding PNG images by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2110">SixLabors/ImageSharp#2110</a></li>
<li>Add support for decoding webp images with animations by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/1985">SixLabors/ImageSharp#1985</a></li>
<li>Jpeg compressed tiff: jpeg decoder should handle the conversion from
YCbCr to RGB by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2124">SixLabors/ImageSharp#2124</a></li>
<li>Deduce color space as YCbCr if component id's are 1, 2, 3 by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2135">SixLabors/ImageSharp#2135</a></li>
<li>Bump actions/checkout from 2 to 3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2145">SixLabors/ImageSharp#2145</a></li>
<li>Bump actions/setup-dotnet from 1 to 2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2143">SixLabors/ImageSharp#2143</a></li>
<li>Bump actions/cache from 2 to 3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2142">SixLabors/ImageSharp#2142</a></li>
<li>Bump actions/upload-artifact from 2 to 3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2146">SixLabors/ImageSharp#2146</a></li>
<li>Bump codecov/codecov-action from 1 to 3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2144">SixLabors/ImageSharp#2144</a></li>
<li>Skip invalid markers during jpeg decoding by <a
href="https://github.com/br3aker"><code>@​br3aker</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2147">SixLabors/ImageSharp#2147</a></li>
<li>Tiff: Performance improvements for Fax4 decompression by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2134">SixLabors/ImageSharp#2134</a></li>
<li>Fix regression in TIF image loading by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2150">SixLabors/ImageSharp#2150</a></li>
<li>Used inline SIMD vectors if they are constants by <a
href="https://github.com/gfoidl"><code>@​gfoidl</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2122">SixLabors/ImageSharp#2122</a></li>
<li>Print environment info on tests start by <a
href="https://github.com/JimBobSquarePants"><code>@​JimBobSquarePants</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2175">SixLabors/ImageSharp#2175</a></li>
<li>Update License by <a
href="https://github.com/JimBobSquarePants"><code>@​JimBobSquarePants</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2176">SixLabors/ImageSharp#2176</a></li>
<li>Jpeg downscaling decoding by <a
href="https://github.com/br3aker"><code>@​br3aker</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2076">SixLabors/ImageSharp#2076</a></li>
<li>Add support for decoding tiff images with CieLab color space by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2127">SixLabors/ImageSharp#2127</a></li>
<li>Assembly Trimming Support by <a
href="https://github.com/ds5678"><code>@​ds5678</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2160">SixLabors/ImageSharp#2160</a></li>
<li>Jpeg color space deduction fix by <a
href="https://github.com/br3aker"><code>@​br3aker</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2177">SixLabors/ImageSharp#2177</a></li>
<li>Add support for decoding tiff with webp compressed data by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2128">SixLabors/ImageSharp#2128</a></li>
<li>Fix issue when writing lossy webp with alpha data by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2173">SixLabors/ImageSharp#2173</a></li>
<li>Fix run-length encode compression implementation mistake in tga
encoder by <a href="https://github.com/l1nxy"><code>@​l1nxy</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2172">SixLabors/ImageSharp#2172</a></li>
<li>TGA Encoder/Decoder Improvements by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2197">SixLabors/ImageSharp#2197</a></li>
<li>Tiff: Make sure 1 Bit compression is only used with 1 bit pixel type
by <a href="https://github.com/brianpopow"><code>@​brianpopow</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2201">SixLabors/ImageSharp#2201</a></li>
<li>Refactor <code>EnumUtils</code> and make it AOT-friendly. by <a
href="https://github.com/teo-tsirpanis"><code>@​teo-tsirpanis</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2200">SixLabors/ImageSharp#2200</a></li>
<li>Jpeg encoder complete rewrite by <a
href="https://github.com/br3aker"><code>@​br3aker</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2120">SixLabors/ImageSharp#2120</a></li>
<li>Fix IPTC tags written on jpg files that contains non-English
characters can't be correctly displayed on external apps <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/issues/2212">#2212</a>
by <a href="https://github.com/lmerino-ep"><code>@​lmerino-ep</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2213">SixLabors/ImageSharp#2213</a></li>
<li>Identify transparency for indexed PNG correctly by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2215">SixLabors/ImageSharp#2215</a></li>
<li>Introduce Shared General Decoder Options plus Specialization by <a
href="https://github.com/JimBobSquarePants"><code>@​JimBobSquarePants</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2180">SixLabors/ImageSharp#2180</a></li>
<li>Add option to encode 2-bit Bitmap's by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2220">SixLabors/ImageSharp#2220</a></li>
<li>Fix AdaptiveThresholdProcessor throws IndexOutOfRangeException by <a
href="https://github.com/brianpopow"><code>@​brianpopow</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2221">SixLabors/ImageSharp#2221</a></li>
<li>Relaxed bmp dimensions validation by <a
href="https://github.com/smorokin"><code>@​smorokin</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2192">SixLabors/ImageSharp#2192</a></li>
<li>Remove obsolete code by <a
href="https://github.com/JimBobSquarePants"><code>@​JimBobSquarePants</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2189">SixLabors/ImageSharp#2189</a></li>
<li>Implement Median Blur processor by <a
href="https://github.com/ynse01"><code>@​ynse01</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2219">SixLabors/ImageSharp#2219</a></li>
<li>Make TestFile Image threadsafe. by <a
href="https://github.com/JimBobSquarePants"><code>@​JimBobSquarePants</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2225">SixLabors/ImageSharp#2225</a></li>
<li>PNG filter improvements by <a
href="https://github.com/saucecontrol"><code>@​saucecontrol</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2226">SixLabors/ImageSharp#2226</a></li>
<li>Use File-Scoped Namespaces and Global Implicit Usings by <a
href="https://github.com/JimBobSquarePants"><code>@​JimBobSquarePants</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2229">SixLabors/ImageSharp#2229</a></li>
<li>Fix for issue <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/issues/2117">#2117</a>
by <a href="https://github.com/brianpopow"><code>@​brianpopow</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2230">SixLabors/ImageSharp#2230</a></li>
<li>Use System.Half for HalfTypeHelper by <a
href="https://github.com/JimBobSquarePants"><code>@​JimBobSquarePants</code></a>
in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2233">SixLabors/ImageSharp#2233</a></li>
<li>[Chore] Remove InlineningOption from ThrowHelpers by <a
href="https://github.com/blouflashdb"><code>@​blouflashdb</code></a> in
<a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2234">SixLabors/ImageSharp#2234</a></li>
<li>Implement AutoLevel processor - Attempt 2 by <a
href="https://github.com/ynse01"><code>@​ynse01</code></a> in <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/pull/2235">SixLabors/ImageSharp#2235</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/SixLabors/ImageSharp/commit/6ec1692ee295923d9d40956befd4417d6735507b"><code>6ec1692</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/issues/2363">#2363</a>
from IldarKhayrutdinov/tiff-frames-meta</li>
<li><a
href="https://github.com/SixLabors/ImageSharp/commit/24a0a5f9a207428430dd225de87de3b74819953d"><code>24a0a5f</code></a>
Update build-and-test.yml</li>
<li><a
href="https://github.com/SixLabors/ImageSharp/commit/99038f2c3aa519c598e955690c88e2c3c369b882"><code>99038f2</code></a>
Merge remote-tracking branch 'upstream/main' into tiff-frames-meta</li>
<li><a
href="https://github.com/SixLabors/ImageSharp/commit/747923d953666c72bcde99919115f55c09f1f248"><code>747923d</code></a>
Add Bit64 and cleanup</li>
<li><a
href="https://github.com/SixLabors/ImageSharp/commit/91c3d5ecf84300ee21476d14dee05e4f84cf9067"><code>91c3d5e</code></a>
cleanup</li>
<li><a
href="https://github.com/SixLabors/ImageSharp/commit/cfaf555c1fa0126d680733bd5c3466eccbc169d4"><code>cfaf555</code></a>
add test for notSupported 64 bit cmyk, add more tests for Identify (incl
64 b...</li>
<li><a
href="https://github.com/SixLabors/ImageSharp/commit/07ca4055fd13d5c13a46d7a4f7dc56a1af37c55f"><code>07ca405</code></a>
add Bit32 value for TiffBitsPerPixel</li>
<li><a
href="https://github.com/SixLabors/ImageSharp/commit/215c609a4a4f166036b9fb578b6cad7632ad4f46"><code>215c609</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/SixLabors/ImageSharp/issues/2373">#2373</a>
from SixLabors/js/publish-config</li>
<li><a
href="https://github.com/SixLabors/ImageSharp/commit/f60bfdf3c77cf967e0130585494364b156e9e876"><code>f60bfdf</code></a>
skip duplicates on 409</li>
<li><a
href="https://github.com/SixLabors/ImageSharp/commit/d19b128ed8bdec6b93e749227b17b6c4b19a19b5"><code>d19b128</code></a>
update README.md</li>
<li>Additional commits viewable in <a
href="https://github.com/SixLabors/ImageSharp/compare/v2.1.3...v3.0.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=SixLabors.ImageSharp&package-manager=nuget&previous-version=2.1.3&new-version=3.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Seweryn Presnal <[email protected]>
  • Loading branch information
dependabot[bot] and IhateTrains authored Mar 2, 2023
1 parent de34dee commit 7bc040a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ImperatorToCK3/CK3/Map/MapData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ public override int GetHashCode() {
public MapData(ModFilesystem ck3ModFS) {
const string mapPath = "map_data/provinces.png";
var provincesMapPath = ck3ModFS.GetActualFileLocation(mapPath);
if (provincesMapPath is null) {
throw new FileNotFoundException($"{nameof(provincesMapPath)} not found!");
}

Logger.Info("Loading province definitions...");
ProvinceDefinitions = new ProvinceDefinitions(ck3ModFS);
Expand Down
2 changes: 1 addition & 1 deletion ImperatorToCK3/ImperatorToCK3.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="CsvHelper" Version="30.0.1" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="12.3.0" />
<PackageReference Include="PGCG.commonItems" Version="7.8.8" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 4 additions & 2 deletions ImperatorToCK3/Outputter/BookmarkOutputter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using ImperatorToCK3.CK3;
using ImperatorToCK3.CK3.Map;
using ImperatorToCK3.CK3.Titles;
using ImperatorToCK3.Exceptions;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Formats.Png;
using SixLabors.ImageSharp.PixelFormats;
Expand Down Expand Up @@ -167,9 +166,12 @@ private static void DrawBookmarkMap(Configuration config, List<Title> playerTitl
Logger.Info("Drawing bookmark map...");
var ck3ModFS = ck3World.ModFS;
var provincesMapPath = ck3ModFS.GetActualFileLocation("map_data/provinces.png");
if (provincesMapPath is null) {
throw new FileNotFoundException($"{nameof(provincesMapPath)} not found!");
}
var flatmapPath = ck3ModFS.GetActualFileLocation("gfx/map/terrain/flatmap.dds");
if (flatmapPath is null) {
throw new ConverterException($"{nameof(flatmapPath)} not found!");
throw new FileNotFoundException($"{nameof(flatmapPath)} not found!");
}
const string tmpFlatmapPath = "temp/flatmap.png";

Expand Down

0 comments on commit 7bc040a

Please sign in to comment.