From 120c799b878cc5e1082c021537c1274170dbcc26 Mon Sep 17 00:00:00 2001
From: "Sergey \"Shnatsel\" Davidoff" <shnatsel@gmail.com>
Date: Mon, 4 Nov 2024 09:51:14 +0000
Subject: [PATCH 1/5] Fill in changelog for 0.25.5

---
 CHANGES.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index cc6139f80a..b9ee60a631 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,18 @@
 
 ## Changes
 
+### Version 0.25.5
+
+Features:
+ - Added support for decoding 10-bit AVIF
+ - Added support for decoding PCX, disabled by default due to WTFPL license on the decoder
+ - Initial, opt-in serde support for an enum. This may be extended to other types in the future.
+
+Bug fixes:
+ - [Multiple bug fixes in AVIF decoding](https://github.com/image-rs/image/pull/2373)
+ - The `rayon` feature now correctly toggles the use of `rayon` when encoding AVIF. (Previously it would be either always on or always off depending on the version of the `ravif` crate in your dependency tree.)
+ - "jfif" file extension for JPEG images is now recognized
+
 ### Version 0.25.4
 
 Features:

From 5a1d77a63eee56b21eb535f382defca456312dfc Mon Sep 17 00:00:00 2001
From: "Sergey \"Shnatsel\" Davidoff" <shnatsel@gmail.com>
Date: Mon, 4 Nov 2024 09:53:39 +0000
Subject: [PATCH 2/5] Update format support tables

---
 README.md  | 4 ++--
 src/lib.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4fff85b666..4bd4bf00a9 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,9 @@ image format encoders and decoders.
 
 | Format   | Decoding                                  | Encoding                                |
 | -------- | ----------------------------------------- | --------------------------------------- |
-| AVIF     | Yes (8-bit only) \*                       | Yes (lossy only)                        |
+| AVIF     | Yes \*                                    | Yes (lossy only)                        |
 | BMP      | Yes                                       | Yes                                     |
-| DDS      | Yes                                       | ---                                      |
+| DDS      | Yes                                       | ---                                     |
 | Farbfeld | Yes                                       | Yes                                     |
 | GIF      | Yes                                       | Yes                                     |
 | HDR      | Yes                                       | Yes                                     |
diff --git a/src/lib.rs b/src/lib.rs
index af7296af8b..39c5f3a698 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -205,7 +205,7 @@ pub mod flat;
 ///
 /// | Format   | Decoding                                  | Encoding                                |
 /// | -------- | ----------------------------------------- | --------------------------------------- |
-/// | AVIF     | Yes (8-bit only) \*                       | Yes (lossy only)                        |
+/// | AVIF     | Yes \*                                    | Yes (lossy only)                        |
 /// | BMP      | Yes                                       | Yes                                     |
 /// | DDS      | Yes                                       | ---                                     |
 /// | Farbfeld | Yes                                       | Yes                                     |

From 3b4a56c80fa6a8be41e49b74367f6745a3145397 Mon Sep 17 00:00:00 2001
From: "Sergey \"Shnatsel\" Davidoff" <shnatsel@gmail.com>
Date: Mon, 4 Nov 2024 09:54:40 +0000
Subject: [PATCH 3/5] Bump version to 0.25.5

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 90c01e7e5b..fc703765c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "image"
-version = "0.25.4"
+version = "0.25.5"
 edition = "2021"
 resolver = "2"
 

From e6fd913910045f24f4480b8ab7da5e077173d47f Mon Sep 17 00:00:00 2001
From: "Sergey \"Shnatsel\" Davidoff" <shnatsel@gmail.com>
Date: Mon, 4 Nov 2024 10:45:45 +0000
Subject: [PATCH 4/5] Update CHANGES.md

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index b9ee60a631..cc39db3ad6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,7 +9,7 @@
 ### Version 0.25.5
 
 Features:
- - Added support for decoding 10-bit AVIF
+ - Added support for decoding 10-bit and 12-bit AVIF
  - Added support for decoding PCX, disabled by default due to WTFPL license on the decoder
  - Initial, opt-in serde support for an enum. This may be extended to other types in the future.
 

From 6378e0b6f819d428799b8c016bde45a23cdd99bf Mon Sep 17 00:00:00 2001
From: "Sergey \"Shnatsel\" Davidoff" <shnatsel@gmail.com>
Date: Tue, 5 Nov 2024 06:27:51 +0000
Subject: [PATCH 5/5] Drop PCX from changelog for 0.25.5 release

---
 CHANGES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index cc39db3ad6..9b7ee07739 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,6 @@
 
 Features:
  - Added support for decoding 10-bit and 12-bit AVIF
- - Added support for decoding PCX, disabled by default due to WTFPL license on the decoder
  - Initial, opt-in serde support for an enum. This may be extended to other types in the future.
 
 Bug fixes: