Skip to content

Commit 12486d0

Browse files
authored
Merge pull request #2586 from fintelia/remove-pcx
Remove PCX code
2 parents 1e95a90 + 40fe808 commit 12486d0

File tree

9 files changed

+2
-176
lines changed

9 files changed

+2
-176
lines changed

src/codecs/pcx.rs

Lines changed: 0 additions & 157 deletions
This file was deleted.

src/io/image_reader_type.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,6 @@ impl<'a, R: 'a + BufRead + Seek> ImageReader<R> {
207207
ImageFormat::Farbfeld => Box::new(farbfeld::FarbfeldDecoder::new(reader)?),
208208
#[cfg(feature = "qoi")]
209209
ImageFormat::Qoi => Box::new(qoi::QoiDecoder::new(reader)?),
210-
#[cfg(feature = "pcx")]
211-
ImageFormat::Pcx => Box::new(pcx::PCXDecoder::new(reader)?),
212210
format => {
213211
return Err(ImageError::Unsupported(
214212
ImageFormatHint::Exact(format).into(),

src/lib.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,6 @@
118118
#![deny(missing_copy_implementations)]
119119
#![cfg_attr(all(test, feature = "benchmarks"), feature(test))]
120120
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
121-
// We've temporarily disabled PCX support for 0.25.5 release
122-
// by removing the corresponding feature.
123-
// We want to ship bug fixes without committing to PCX support.
124-
//
125-
// Cargo shows warnings about code depending on a nonexistent feature
126-
// even to people using the crate as a dependency,
127-
// so we have to suppress those warnings.
128-
#![allow(unexpected_cfgs)]
129121

130122
#[cfg(all(test, feature = "benchmarks"))]
131123
extern crate test;
@@ -266,8 +258,6 @@ pub mod codecs {
266258
pub mod jpeg;
267259
#[cfg(feature = "exr")]
268260
pub mod openexr;
269-
#[cfg(feature = "pcx")]
270-
pub mod pcx;
271261
#[cfg(feature = "png")]
272262
pub mod png;
273263
#[cfg(feature = "pnm")]

tests/images/pcx/images/24bit.pcx

-167 KB
Binary file not shown.
-41.8 KB
Binary file not shown.
-78.8 KB
Binary file not shown.
Binary file not shown.

tests/reference_images.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ where
1818
{
1919
let base: PathBuf = BASE_PATH.iter().collect();
2020
let decoders = &[
21-
"tga", "tiff", "png", "gif", "bmp", "ico", "hdr", "pbm", "webp", "pcx",
21+
"tga", "tiff", "png", "gif", "bmp", "ico", "hdr", "pbm", "webp",
2222
];
2323
for decoder in decoders {
2424
let mut path = base.clone();

tests/truncate_images.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ where
1616
{
1717
let base: PathBuf = BASE_PATH.iter().collect();
1818
let decoders = &[
19-
"tga", "tiff", "png", "gif", "bmp", "ico", "jpg", "hdr", "farbfeld", "exr", "pcx",
19+
"tga", "tiff", "png", "gif", "bmp", "ico", "jpg", "hdr", "farbfeld", "exr",
2020
];
2121
for decoder in decoders {
2222
let mut path = base.clone();
@@ -100,8 +100,3 @@ fn truncate_farbfeld() {
100100
fn truncate_exr() {
101101
truncate_images("exr");
102102
}
103-
104-
#[test]
105-
fn truncate_pcx() {
106-
truncate_images("pcx");
107-
}

0 commit comments

Comments
 (0)