Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: ui/gfx/geometry/matrix3_f.cc

Issue 649203003: Type conversion fixes, ui/gfx/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/geometry/matrix3_f.cc
diff --git a/ui/gfx/geometry/matrix3_f.cc b/ui/gfx/geometry/matrix3_f.cc
index 5836ae677b9319d197f6ab785f32046679bf5946..d727ef0927e58e3c93c499a39a9f790f0cf9cf8b 100644
--- a/ui/gfx/geometry/matrix3_f.cc
+++ b/ui/gfx/geometry/matrix3_f.cc
@@ -105,15 +105,24 @@ Matrix3F Matrix3F::Inverse() const {
return inverse; // Singular matrix. Return Zeros().
inverse.set(
- (data_[M11] * data_[M22] - data_[M12] * data_[M21]) / determinant,
- (data_[M02] * data_[M21] - data_[M01] * data_[M22]) / determinant,
- (data_[M01] * data_[M12] - data_[M02] * data_[M11]) / determinant,
- (data_[M12] * data_[M20] - data_[M10] * data_[M22]) / determinant,
- (data_[M00] * data_[M22] - data_[M02] * data_[M20]) / determinant,
- (data_[M02] * data_[M10] - data_[M00] * data_[M12]) / determinant,
- (data_[M10] * data_[M21] - data_[M11] * data_[M20]) / determinant,
- (data_[M01] * data_[M20] - data_[M00] * data_[M21]) / determinant,
- (data_[M00] * data_[M11] - data_[M01] * data_[M10]) / determinant);
+ static_cast<float>((data_[M11] * data_[M22] - data_[M12] * data_[M21]) /
+ determinant),
+ static_cast<float>((data_[M02] * data_[M21] - data_[M01] * data_[M22]) /
+ determinant),
+ static_cast<float>((data_[M01] * data_[M12] - data_[M02] * data_[M11]) /
+ determinant),
+ static_cast<float>((data_[M12] * data_[M20] - data_[M10] * data_[M22]) /
+ determinant),
+ static_cast<float>((data_[M00] * data_[M22] - data_[M02] * data_[M20]) /
+ determinant),
+ static_cast<float>((data_[M02] * data_[M10] - data_[M00] * data_[M12]) /
+ determinant),
+ static_cast<float>((data_[M10] * data_[M21] - data_[M11] * data_[M20]) /
+ determinant),
+ static_cast<float>((data_[M01] * data_[M20] - data_[M00] * data_[M21]) /
+ determinant),
+ static_cast<float>((data_[M00] * data_[M11] - data_[M01] * data_[M10]) /
+ determinant));
return inverse;
}

Powered by Google App Engine
This is Rietveld 408576698