Skip to content

Commit

Permalink
More useful stb-image error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
kmcallister committed Nov 2, 2014
1 parent 035ff19 commit a4bf64c
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions components/net/image/base.rs
Expand Up @@ -75,8 +75,14 @@ pub fn load_from_memory(buffer: &[u8]) -> Option<Image> {
pixels: png::RGBA8(image.data)
})
}
stb_image::ImageF32(_image) => fail!("HDR images not implemented"),
stb_image::Error(_) => None
stb_image::ImageF32(_image) => {
error!("HDR images not implemented");
None
}
stb_image::Error(e) => {
error!("stb_image failed: {}", e);
None
}
}
}
}

5 comments on commit a4bf64c

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from jdm
at kmcallister@a4bf64c

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging kmcallister/servo/stb-error = a4bf64c into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kmcallister/servo/stb-error = a4bf64c merged ok, testing candidate = cef58cc

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = cef58cc

Please sign in to comment.