Title: [107679] trunk/Source/WebCore
- Revision
- 107679
- Author
- [email protected]
- Date
- 2012-02-14 00:16:36 -0800 (Tue, 14 Feb 2012)
Log Message
Upstream Android's support for SK_B32_SHIFT to JPEGImageEncoder
https://bugs.webkit.org/show_bug.cgi?id=78540
Reviewed by Adam Barth.
* platform/image-encoders/skia/JPEGImageEncoder.cpp:
(WebCore::encodePixels):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107678 => 107679)
--- trunk/Source/WebCore/ChangeLog 2012-02-14 08:05:50 UTC (rev 107678)
+++ trunk/Source/WebCore/ChangeLog 2012-02-14 08:16:36 UTC (rev 107679)
@@ -1,3 +1,13 @@
+2012-02-14 Eric Seidel <[email protected]>
+
+ Upstream Android's support for SK_B32_SHIFT to JPEGImageEncoder
+ https://bugs.webkit.org/show_bug.cgi?id=78540
+
+ Reviewed by Adam Barth.
+
+ * platform/image-encoders/skia/JPEGImageEncoder.cpp:
+ (WebCore::encodePixels):
+
2012-02-13 Pavel Feldman <[email protected]>
[Qt] inspector/styles/undo-add-new-rule.html crashes
Modified: trunk/Source/WebCore/platform/image-encoders/skia/JPEGImageEncoder.cpp (107678 => 107679)
--- trunk/Source/WebCore/platform/image-encoders/skia/JPEGImageEncoder.cpp 2012-02-14 08:05:50 UTC (rev 107678)
+++ trunk/Source/WebCore/platform/image-encoders/skia/JPEGImageEncoder.cpp 2012-02-14 08:16:36 UTC (rev 107679)
@@ -136,7 +136,8 @@
#if defined(JCS_EXTENSIONS)
if (premultiplied) {
- cinfo.in_color_space = JCS_EXT_BGRX;
+ cinfo.in_color_space = SK_B32_SHIFT ? JCS_EXT_RGBX : JCS_EXT_BGRX;
+
cinfo.input_components = 4;
jpeg_set_defaults(&cinfo);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes