You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
3.0 KiB
68 lines
3.0 KiB
From be5633a760b751f00e434cbee41468930ac95dbd Mon Sep 17 00:00:00 2001
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
Date: Tue, 19 Sep 2023 15:00:17 +0200
|
|
Subject: [PATCH 1/4] Drop OpenEXR decoders since they are not enabled in the
|
|
image crate
|
|
|
|
---
|
|
loaders/glycin-image-rs/glycin-image-rs.conf | 4 ----
|
|
loaders/glycin-image-rs/src/bin/glycin-image-rs.rs | 6 ------
|
|
2 files changed, 10 deletions(-)
|
|
|
|
diff --git a/loaders/glycin-image-rs/glycin-image-rs.conf b/loaders/glycin-image-rs/glycin-image-rs.conf
|
|
index c96067f3..91508e60 100644
|
|
--- a/loaders/glycin-image-rs/glycin-image-rs.conf
|
|
+++ b/loaders/glycin-image-rs/glycin-image-rs.conf
|
|
@@ -36,10 +36,6 @@ Exec = @EXEC@
|
|
#[loader:image/vnd.radiance]
|
|
#Exec = @EXEC@
|
|
|
|
-# OpenEXR
|
|
-[loader:image/x-exr]
|
|
-Exec = @EXEC@
|
|
-
|
|
# PNM
|
|
[loader:image/x-portable-bitmap]
|
|
Exec = @EXEC@
|
|
diff --git a/loaders/glycin-image-rs/src/bin/glycin-image-rs.rs b/loaders/glycin-image-rs/src/bin/glycin-image-rs.rs
|
|
index d331d94e..699d50dc 100644
|
|
--- a/loaders/glycin-image-rs/src/bin/glycin-image-rs.rs
|
|
+++ b/loaders/glycin-image-rs/src/bin/glycin-image-rs.rs
|
|
@@ -141,7 +141,6 @@ pub enum ImageRsDecoder<T: std::io::Read + std::io::Seek> {
|
|
//Hdr(codecs::hdr::HdrDecoder<T>),
|
|
Ico(codecs::ico::IcoDecoder<T>),
|
|
Jpeg(codecs::jpeg::JpegDecoder<T>),
|
|
- OpenExr(codecs::openexr::OpenExrDecoder<T>),
|
|
Png(codecs::png::PngDecoder<T>),
|
|
Pnm(codecs::pnm::PnmDecoder<T>),
|
|
Qoi(codecs::qoi::QoiDecoder<T>),
|
|
@@ -164,9 +163,6 @@ impl ImageRsDecoder<Reader> {
|
|
Self::Ico(codecs::ico::IcoDecoder::new(data).context_failed()?)
|
|
}
|
|
"image/jpeg" => Self::Jpeg(codecs::jpeg::JpegDecoder::new(data).context_failed()?),
|
|
- "image/x-exr" => {
|
|
- Self::OpenExr(codecs::openexr::OpenExrDecoder::new(data).context_failed()?)
|
|
- }
|
|
"image/png" => Self::Png(codecs::png::PngDecoder::new(data).context_failed()?),
|
|
"image/x-portable-bitmap"
|
|
| "image/x-portable-graymap"
|
|
@@ -196,7 +192,6 @@ impl<'a, T: std::io::Read + std::io::Seek + 'a> ImageRsDecoder<T> {
|
|
//Self::Hdr(d) => ImageInfo::from_decoder(d, "Radiance HDR"),
|
|
Self::Ico(d) => ImageInfo::from_decoder(d, "ICO"),
|
|
Self::Jpeg(d) => ImageInfo::from_decoder(d, "JPEG"),
|
|
- Self::OpenExr(d) => ImageInfo::from_decoder(d, "OpenEXR"),
|
|
Self::Png(d) => ImageInfo::from_decoder(d, "PNG"),
|
|
Self::Pnm(d) => ImageInfo::from_decoder(d, "PNM"),
|
|
Self::Qoi(d) => ImageInfo::from_decoder(d, "QOI"),
|
|
@@ -215,7 +210,6 @@ impl<'a, T: std::io::Read + std::io::Seek + 'a> ImageRsDecoder<T> {
|
|
//Self::Hdr(d) => Frame::from_decoder(d),
|
|
Self::Ico(d) => Frame::from_decoder(d),
|
|
Self::Jpeg(d) => Frame::from_decoder(d),
|
|
- Self::OpenExr(d) => Frame::from_decoder(d),
|
|
Self::Png(d) => Frame::from_decoder(d),
|
|
Self::Pnm(d) => Frame::from_decoder(d),
|
|
Self::Qoi(d) => Frame::from_decoder(d),
|
|
--
|
|
2.41.0
|
|
|