Auto merge of #7017 - glennw:stb-update, r=pcwalton

Update stb-image to get JPEG progressive support.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7017)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-06 19:46:19 -06:00
commit 78792cced2
10 changed files with 40 additions and 6 deletions

View file

@ -1332,7 +1332,7 @@ dependencies = [
[[package]] [[package]]
name = "stb_image" name = "stb_image"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/rust-stb-image#e3f7246caa694e863975ead98f4940d046108fd7" source = "git+https://github.com/servo/rust-stb-image#ad05c642b64a9059dd31c37b1a1ac78722821008"
dependencies = [ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
ports/cef/Cargo.lock generated
View file

@ -1334,7 +1334,7 @@ dependencies = [
[[package]] [[package]]
name = "stb_image" name = "stb_image"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/rust-stb-image#e3f7246caa694e863975ead98f4940d046108fd7" source = "git+https://github.com/servo/rust-stb-image#ad05c642b64a9059dd31c37b1a1ac78722821008"
dependencies = [ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
ports/gonk/Cargo.lock generated
View file

@ -1226,7 +1226,7 @@ dependencies = [
[[package]] [[package]]
name = "stb_image" name = "stb_image"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/rust-stb-image#e3f7246caa694e863975ead98f4940d046108fd7" source = "git+https://github.com/servo/rust-stb-image#ad05c642b64a9059dd31c37b1a1ac78722821008"
dependencies = [ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

View file

@ -173,6 +173,8 @@ experimental == iframe/size_attributes_vertical_writing_mode.html iframe/size_at
== inset.html inset_ref.html == inset.html inset_ref.html
!= inset_blackborder.html blackborder_ref.html != inset_blackborder.html blackborder_ref.html
== issue-1324.html issue-1324-ref.html == issue-1324.html issue-1324-ref.html
== jpeg_normal.html jpeg_ref.html
== jpeg_progressive.html jpeg_ref.html
== jumpiness_a.html jumpiness_ref.html == jumpiness_a.html jumpiness_ref.html
== last_child_pseudo_a.html last_child_pseudo_b.html == last_child_pseudo_a.html last_child_pseudo_b.html
== last_of_type_pseudo_a.html last_of_type_pseudo_b.html == last_of_type_pseudo_a.html last_of_type_pseudo_b.html

View file

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
</style>
</head>
<body>
<img src="jpeg_normal.jpg">
</body>
</html>

BIN
tests/ref/jpeg_normal.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

View file

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
</style>
</head>
<body>
<img src="jpeg_progressive.jpg">
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 570 B

15
tests/ref/jpeg_ref.html Normal file
View file

@ -0,0 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
div {
background-color: rgb(75, 255, 0);
width: 64px;
height: 64px;
}
</style>
</head>
<body>
<div></div>
</body>
</html>

View file

@ -6,9 +6,6 @@
[img src empty] [img src empty]
expected: FAIL expected: FAIL
[async src complete test]
expected: FAIL
[IDL attribute complete returns true when image resource has been fetched but not run yet & image is not in broken state] [IDL attribute complete returns true when image resource has been fetched but not run yet & image is not in broken state]
expected: FAIL expected: FAIL