Title: [139727] trunk/Tools
- Revision
- 139727
- Author
- [email protected]
- Date
- 2013-01-15 01:33:54 -0800 (Tue, 15 Jan 2013)
Log Message
[Qt] Fix ImageDiff's image format conversion
https://bugs.webkit.org/show_bug.cgi?id=106880
Reviewed by Csaba Osztrogonác.
Besides actually doing the conversion this also silences the suspicious warning:
"ignoring return value of function declared with warn_unused_result attribute".
* ImageDiff/qt/ImageDiff.cpp:
(main): QImage::convertToFormat, contrary to the assumed behaviour, returns a
copy of the image in the given format and does not alter the image itself.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139726 => 139727)
--- trunk/Tools/ChangeLog 2013-01-15 09:06:01 UTC (rev 139726)
+++ trunk/Tools/ChangeLog 2013-01-15 09:33:54 UTC (rev 139727)
@@ -1,3 +1,17 @@
+2013-01-15 Andras Becsi <[email protected]>
+
+ [Qt] Fix ImageDiff's image format conversion
+ https://bugs.webkit.org/show_bug.cgi?id=106880
+
+ Reviewed by Csaba Osztrogonác.
+
+ Besides actually doing the conversion this also silences the suspicious warning:
+ "ignoring return value of function declared with warn_unused_result attribute".
+
+ * ImageDiff/qt/ImageDiff.cpp:
+ (main): QImage::convertToFormat, contrary to the assumed behaviour, returns a
+ copy of the image in the given format and does not alter the image itself.
+
2013-01-15 Jochen Eisinger <[email protected]>
[chromium] move remaining methods that just set a boolean flag to TestRunner library
Modified: trunk/Tools/ImageDiff/qt/ImageDiff.cpp (139726 => 139727)
--- trunk/Tools/ImageDiff/qt/ImageDiff.cpp 2013-01-15 09:06:01 UTC (rev 139726)
+++ trunk/Tools/ImageDiff/qt/ImageDiff.cpp 2013-01-15 09:33:54 UTC (rev 139727)
@@ -70,7 +70,7 @@
// Convert into QImage
QImage decodedImage;
decodedImage.loadFromData(data.data(), "PNG");
- decodedImage.convertToFormat(QImage::Format_ARGB32);
+ decodedImage = decodedImage.convertToFormat(QImage::Format_ARGB32);
// Place it in the right place
if (actualImage.isNull())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
