RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:04:59 +00:00
Code Issues Activity Actions

image: Only create output file for known extensions

Browse source 
Previously `image -o foo.asdf foo.png` would create a 0-byte foo.asdf
before complaining that it doesn't know how to write .asdf images.

(Lifetimes of temporaries are extended to the end of the full
expresion, so this is fine.)
This commit is contained in:
Nico Weber 2024-02-01 07:30:23 -05:00 • committed by Andreas Kling
parent 1dfd68c798
commit 2298aac1d1
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/image.cpp
View file

@ -129,16 +129,18 @@ static ErrorOr<void> save_image(LoadedImage& image, StringView out_path, bool pp
return Error::from_string_view("Can't save CMYK bitmaps yet, convert to RGB first with --convert-to-color-profile"sv);
auto& frame = image.bitmap.get<RefPtr<Gfx::Bitmap>>();
auto output_stream = TRY(Core::File::open(out_path, Core::File::OpenMode::Write));
auto buffered_stream = TRY(Core::OutputBufferedFile::create(move(output_stream)));
auto stream = [out_path]() -> ErrorOr<NonnullOwnPtr<Core::OutputBufferedFile>> {
auto output_stream = TRY(Core::File::open(out_path, Core::File::OpenMode::Write));
return Core::OutputBufferedFile::create(move(output_stream));
};
if (out_path.ends_with(".jpg"sv, CaseSensitivity::CaseInsensitive) || out_path.ends_with(".jpeg"sv, CaseSensitivity::CaseInsensitive)) {
TRY(Gfx::JPEGWriter::encode(*buffered_stream, *frame, { .icc_data = image.icc_data, .quality = jpeg_quality }));
TRY(Gfx::JPEGWriter::encode(*TRY(stream()), *frame, { .icc_data = image.icc_data, .quality = jpeg_quality }));
return {};
}
if (out_path.ends_with(".ppm"sv, CaseSensitivity::CaseInsensitive)) {
auto const format = ppm_ascii ? Gfx::PortableFormatWriter::Options::Format::ASCII : Gfx::PortableFormatWriter::Options::Format::Raw;
TRY(Gfx::PortableFormatWriter::encode(*buffered_stream, *frame, { .format = format }));
TRY(Gfx::PortableFormatWriter::encode(*TRY(stream()), *frame, { .format = format }));
return {};
}
@ -152,7 +154,7 @@ static ErrorOr<void> save_image(LoadedImage& image, StringView out_path, bool pp
} else {
return Error::from_string_view("can only write .bmp, .jpg, .png, .ppm, and .qoi"sv);
}
TRY(buffered_stream->write_until_depleted(bytes));
TRY(TRY(stream())->write_until_depleted(bytes));
return {};
}