## Context Static images decoded by GPUI ignored their EXIF `Orientation` tag, so JPEGs that rely on it (photos from phones and cameras) rendered rotated or flipped in image preview, Markdown preview, and other `ImageSource` consumers. The `image` crate only exposes orientation through `ImageDecoder::orientation()`, which must be read before the decoder is consumed; `DynamicImage::from_decoder` does not apply it. The old path went straight through `image::load_from_memory_with_format`, so the metadata was never read. Closes #60844. Video of manual test below : [Screencast from 2026-07-15 02-14-41.webm](https://github.com/user-attachments/assets/002b0324-44f8-4ddb-acbd-8c3e070d5248) ## How to Review **Cargo.toml** Raises the workspace `image` dependency minimum from `0.25.1` to `0.25.4`, the first release exposing `orientation()` and `apply_orientation()`. The lockfile already resolves to `0.25.10`, so no lock change is required. **crates/gpui/src/platform.rs** Adds two crate-private helpers. `decode_static_image_from_decoder` reads `orientation()`, decodes to a `DynamicImage`, applies the orientation, then converts RGBA to GPUI's BGRA. `decode_static_image` builds a format decoder from bytes and delegates to it. `Image::to_image_data` now routes its static formats through these helpers instead of `image::load_from_memory_with_format`. Adds `test_image_to_image_data_applies_exif_orientation`, which decodes a 16x32 fixture stored upside down with EXIF Orientation 3 and asserts the corner pixels were flipped upright; the test fails if orientation is dropped. **crates/gpui/src/elements/img.rs** Routes `ImageAssetLoader` (Markdown paths, URLs, embedded resources) through the same helpers, including the static WebP branch. GIF and animated-WebP frame handling are left unchanged, since animated orientation is out of scope. ## Self-Review Checklist - [x] I've reviewed my own diff for quality, security, and reliability - [ ] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the UI/UX checklist - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed static images ignoring their EXIF orientation, which caused some JPEGs to render rotated or flipped in image and Markdown preview.
228 lines
7.3 KiB
Rust
228 lines
7.3 KiB
Rust
#![cfg_attr(target_family = "wasm", no_main)]
|
|
|
|
use std::fs;
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
|
|
use anyhow::Result;
|
|
use gpui::{
|
|
App, AppContext, AssetSource, Bounds, Context, ImageSource, KeyBinding, Menu, MenuItem, Point,
|
|
SharedString, SharedUri, TitlebarOptions, Window, WindowBounds, WindowOptions, actions, div,
|
|
img, prelude::*, px, rgb, size,
|
|
};
|
|
#[cfg(not(target_family = "wasm"))]
|
|
use reqwest_client::ReqwestClient;
|
|
|
|
struct Assets {
|
|
base: PathBuf,
|
|
}
|
|
|
|
impl AssetSource for Assets {
|
|
fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
|
|
fs::read(self.base.join(path))
|
|
.map(|data| Some(std::borrow::Cow::Owned(data)))
|
|
.map_err(|e| e.into())
|
|
}
|
|
|
|
fn list(&self, path: &str) -> Result<Vec<SharedString>> {
|
|
fs::read_dir(self.base.join(path))
|
|
.map(|entries| {
|
|
entries
|
|
.filter_map(|entry| {
|
|
entry
|
|
.ok()
|
|
.and_then(|entry| entry.file_name().into_string().ok())
|
|
.map(SharedString::from)
|
|
})
|
|
.collect()
|
|
})
|
|
.map_err(|e| e.into())
|
|
}
|
|
}
|
|
|
|
#[derive(IntoElement)]
|
|
struct ImageContainer {
|
|
text: SharedString,
|
|
src: ImageSource,
|
|
}
|
|
|
|
impl ImageContainer {
|
|
pub fn new(text: impl Into<SharedString>, src: impl Into<ImageSource>) -> Self {
|
|
Self {
|
|
text: text.into(),
|
|
src: src.into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl RenderOnce for ImageContainer {
|
|
fn render(self, _window: &mut Window, _: &mut App) -> impl IntoElement {
|
|
div().child(
|
|
div()
|
|
.flex_row()
|
|
.size_full()
|
|
.gap_4()
|
|
.child(self.text)
|
|
.child(img(self.src).size(px(256.0))),
|
|
)
|
|
}
|
|
}
|
|
|
|
struct ImageShowcase {
|
|
local_resource: Arc<std::path::Path>,
|
|
remote_resource: SharedUri,
|
|
asset_resource: SharedString,
|
|
}
|
|
|
|
impl Render for ImageShowcase {
|
|
fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
|
|
div()
|
|
.id("main")
|
|
.bg(gpui::white())
|
|
.overflow_y_scroll()
|
|
.p_5()
|
|
.size_full()
|
|
.child(
|
|
div()
|
|
.flex()
|
|
.flex_col()
|
|
.justify_center()
|
|
.items_center()
|
|
.gap_8()
|
|
.child(img(
|
|
"https://github.com/zed-industries/zed/actions/workflows/ci.yml/badge.svg",
|
|
))
|
|
.child(
|
|
div()
|
|
.flex()
|
|
.flex_row()
|
|
.justify_center()
|
|
.items_center()
|
|
.gap_8()
|
|
.child(ImageContainer::new(
|
|
"Image loaded from a local file with EXIF orientation",
|
|
self.local_resource.clone(),
|
|
))
|
|
.child(ImageContainer::new(
|
|
"Image loaded from a remote resource",
|
|
self.remote_resource.clone(),
|
|
))
|
|
.child(ImageContainer::new(
|
|
"Image loaded from an asset",
|
|
self.asset_resource.clone(),
|
|
)),
|
|
)
|
|
.child(
|
|
div()
|
|
.flex()
|
|
.flex_row()
|
|
.gap_8()
|
|
.child(
|
|
div()
|
|
.flex_col()
|
|
.child("Auto Width")
|
|
.child(img("https://picsum.photos/800/400").h(px(180.))),
|
|
)
|
|
.child(
|
|
div()
|
|
.flex_col()
|
|
.child("Auto Height")
|
|
.child(img("https://picsum.photos/800/400").w(px(180.))),
|
|
),
|
|
)
|
|
.child(
|
|
div()
|
|
.flex()
|
|
.flex_col()
|
|
.justify_center()
|
|
.items_center()
|
|
.w_full()
|
|
.border_1()
|
|
.border_color(rgb(0xC0C0C0))
|
|
.child("image with max width 100%")
|
|
.child(img("https://picsum.photos/800/400").max_w_full()),
|
|
),
|
|
)
|
|
}
|
|
}
|
|
|
|
actions!(image, [Quit]);
|
|
|
|
fn run_example() {
|
|
let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
|
|
|
|
#[cfg(not(target_family = "wasm"))]
|
|
let app = gpui_platform::application();
|
|
#[cfg(target_family = "wasm")]
|
|
let app = gpui_platform::application();
|
|
app.with_assets(Assets {
|
|
base: manifest_dir.join("examples"),
|
|
})
|
|
.run(move |cx: &mut App| {
|
|
#[cfg(not(target_family = "wasm"))]
|
|
{
|
|
let http_client = ReqwestClient::user_agent("gpui example").unwrap();
|
|
cx.set_http_client(Arc::new(http_client));
|
|
}
|
|
#[cfg(target_family = "wasm")]
|
|
{
|
|
// Safety: the web examples run single-threaded; the client is
|
|
// created and used exclusively on the main thread.
|
|
let http_client = unsafe {
|
|
gpui_web::FetchHttpClient::with_user_agent("gpui example")
|
|
.expect("failed to create FetchHttpClient")
|
|
};
|
|
cx.set_http_client(Arc::new(http_client));
|
|
}
|
|
|
|
cx.activate(true);
|
|
cx.on_action(|_: &Quit, cx| cx.quit());
|
|
cx.bind_keys([KeyBinding::new("cmd-q", Quit, None)]);
|
|
cx.set_menus(vec![Menu {
|
|
name: "Image".into(),
|
|
items: vec![MenuItem::action("Quit", Quit)],
|
|
disabled: false,
|
|
}]);
|
|
|
|
let window_options = WindowOptions {
|
|
titlebar: Some(TitlebarOptions {
|
|
title: Some(SharedString::from("Image Example")),
|
|
appears_transparent: false,
|
|
..Default::default()
|
|
}),
|
|
|
|
window_bounds: Some(WindowBounds::Windowed(Bounds {
|
|
size: size(px(1100.), px(600.)),
|
|
origin: Point::new(px(200.), px(200.)),
|
|
})),
|
|
|
|
..Default::default()
|
|
};
|
|
|
|
cx.open_window(window_options, |_, cx| {
|
|
cx.new(|_| ImageShowcase {
|
|
// Relative path to your root project path
|
|
local_resource: manifest_dir
|
|
.join("examples/image/exif-orientation-rotate-180.jpg")
|
|
.into(),
|
|
remote_resource: "https://picsum.photos/800/400".into(),
|
|
asset_resource: "image/color.svg".into(),
|
|
})
|
|
})
|
|
.unwrap();
|
|
});
|
|
}
|
|
|
|
#[cfg(not(target_family = "wasm"))]
|
|
fn main() {
|
|
env_logger::init();
|
|
run_example();
|
|
}
|
|
|
|
#[cfg(target_family = "wasm")]
|
|
#[wasm_bindgen::prelude::wasm_bindgen(start)]
|
|
pub fn start() {
|
|
gpui_platform::web_init();
|
|
run_example();
|
|
}
|