Korbs/LibreWolf
0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-22 05:33:03 -05:00
Code Issues Activity

Fix the JXL (large jpeg) improvements patch

Browse source
This commit is contained in:
Bert van der Weerd 2024-04-23 17:52:45 +02:00
parent 35f1f5a1e3
commit 745742db51
No known key found for this signature in database
GPG key ID: 1B93BFCB9DEDFAA0
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
patches/JXL_improved_support.patch
View file

@ -14,12 +14,12 @@ diff --git a/image/DecoderFactory.cpp b/image/DecoderFactory.cpp
index 5004b93eae09c..2f214a9c80a46 100644 index 5004b93eae09c..2f214a9c80a46 100644
--- a/image/DecoderFactory.cpp --- a/image/DecoderFactory.cpp
+++ b/image/DecoderFactory.cpp +++ b/image/DecoderFactory.cpp
@@ -217,7 +217,12 @@ nsresult DecoderFactory::CreateAnimationDecoder( @@ -234,7 +234,12 @@
} }
MOZ_ASSERT(aType == DecoderType::GIF || aType == DecoderType::PNG || MOZ_ASSERT(aType == DecoderType::GIF || aType == DecoderType::PNG ||
- aType == DecoderType::WEBP, - aType == DecoderType::WEBP || aType == DecoderType::AVIF,
+ aType == DecoderType::WEBP + aType == DecoderType::WEBP || aType == DecoderType::AVIF
+#ifdef MOZ_JXL +#ifdef MOZ_JXL
+ || aType == DecoderType::JXL, + || aType == DecoderType::JXL,
+#else +#else
@ -28,17 +28,18 @@ index 5004b93eae09c..2f214a9c80a46 100644
"Calling CreateAnimationDecoder for non-animating DecoderType"); "Calling CreateAnimationDecoder for non-animating DecoderType");
// Create an anonymous decoder. Interaction with the SurfaceCache and the // Create an anonymous decoder. Interaction with the SurfaceCache and the
@@ -272,7 +277,12 @@ already_AddRefed<Decoder> DecoderFactory::CloneAnimationDecoder( @@ -289,7 +294,13 @@
// rediscover it is animated). // rediscover it is animated).
DecoderType type = aDecoder->GetType(); DecoderType type = aDecoder->GetType();
MOZ_ASSERT(type == DecoderType::GIF || type == DecoderType::PNG || MOZ_ASSERT(type == DecoderType::GIF || type == DecoderType::PNG ||
- type == DecoderType::WEBP, - type == DecoderType::WEBP || type == DecoderType::AVIF,
+ type == DecoderType::WEBP + type == DecoderType::WEBP || type == DecoderType::AVIF
+#ifdef MOZ_JXL +#ifdef MOZ_JXL
+ || type == DecoderType::JXL, + || aType == DecoderType::JXL,
+#else +#else
+ , + ,
+#endif +#endif
+
"Calling CloneAnimationDecoder for non-animating DecoderType"); "Calling CloneAnimationDecoder for non-animating DecoderType");
RefPtr<Decoder> decoder = GetDecoder(type, nullptr, /* aIsRedecode = */ true); RefPtr<Decoder> decoder = GetDecoder(type, nullptr, /* aIsRedecode = */ true);