From a4a4eb7783ec3f068d8f0644701391654f7c934f Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 27 Oct 2022 18:16:42 -0600 Subject: [PATCH] Fix rgba ordering --- examples/editor-libcosmic/src/text_box.rs | 8 ++++---- src/swash.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/editor-libcosmic/src/text_box.rs b/examples/editor-libcosmic/src/text_box.rs index d2cddb4..d9ab2e1 100644 --- a/examples/editor-libcosmic/src/text_box.rs +++ b/examples/editor-libcosmic/src/text_box.rs @@ -281,9 +281,9 @@ where let offset = offset_y + x as usize * 4; let mut current = - pixels[offset + 2] as u32 | + pixels[offset] as u32 | (pixels[offset + 1] as u32) << 8 | - (pixels[offset] as u32) << 16 | + (pixels[offset + 2] as u32) << 16 | (pixels[offset + 3] as u32) << 24; if alpha >= 255 || current == 0 { @@ -298,9 +298,9 @@ where current = (rb & 0x00FF00FF) | (ag & 0xFF00FF00); } - pixels[offset + 2] = current as u8; + pixels[offset] = current as u8; pixels[offset + 1] = (current >> 8) as u8; - pixels[offset] = (current >> 16) as u8; + pixels[offset + 2] = (current >> 16) as u8; pixels[offset + 3] = (current >> 24) as u8; } } diff --git a/src/swash.rs b/src/swash.rs index 1b50dba..fc5c813 100644 --- a/src/swash.rs +++ b/src/swash.rs @@ -114,9 +114,9 @@ impl<'a> SwashCache<'a> { x + off_x, y + off_y, Color::rgba( - image.data[i + 2], - image.data[i + 1], image.data[i], + image.data[i + 1], + image.data[i + 2], image.data[i + 3] ) );