From 0866359a100c34861e8306c2a1903ce43f9d3e6d Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sat, 3 Nov 2012 23:17:49 -0700 Subject: [PATCH] Update rust-stb-image --- src/rust-stb-image | 2 +- src/servo/image/base.rs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rust-stb-image b/src/rust-stb-image index d2c440d749d..2ed2c51aa04 160000 --- a/src/rust-stb-image +++ b/src/rust-stb-image @@ -1 +1 @@ -Subproject commit d2c440d749dcfae0e8388b0b57d71e5e3c071dc2 +Subproject commit 2ed2c51aa04b6ec13554fec6674aef5a1573d753 diff --git a/src/servo/image/base.rs b/src/servo/image/base.rs index c1148dd4d51..5c10331085d 100644 --- a/src/servo/image/base.rs +++ b/src/servo/image/base.rs @@ -22,7 +22,11 @@ fn test_image_bin() -> ~[u8] { } pub fn load_from_memory(buffer: &[u8]) -> Option { - do stb_image::load_from_memory(buffer).map |image| { + + // Can't remember why we do this. Maybe it's what cairo wants + const FORCE_DEPTH: uint = 4; + + do stb_image::load_from_memory_with_depth(buffer, FORCE_DEPTH).map |image| { assert image.depth == 4; // Do color space conversion :(