From 820e80ad6390e120d4991a5280d0452ec87beaeb Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Mon, 24 Oct 2011 21:09:40 +0000 Subject: Fix some warnings on VS2010 Review URL: http://codereview.appspot.com/5312051/ git-svn-id: http://skia.googlecode.com/svn/trunk@2520 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/MatrixBench.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'bench/MatrixBench.cpp') diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp index 3d8c22494e..06669719fe 100644 --- a/bench/MatrixBench.cpp +++ b/bench/MatrixBench.cpp @@ -222,15 +222,15 @@ class GetTypeMatrixBench : public MatrixBench { public: GetTypeMatrixBench(void* param) : INHERITED(param, "gettype") { - fArray[0] = fRnd.nextS(); - fArray[1] = fRnd.nextS(); - fArray[2] = fRnd.nextS(); - fArray[3] = fRnd.nextS(); - fArray[4] = fRnd.nextS(); - fArray[5] = fRnd.nextS(); - fArray[6] = fRnd.nextS(); - fArray[7] = fRnd.nextS(); - fArray[8] = fRnd.nextS(); + fArray[0] = (float) fRnd.nextS(); + fArray[1] = (float) fRnd.nextS(); + fArray[2] = (float) fRnd.nextS(); + fArray[3] = (float) fRnd.nextS(); + fArray[4] = (float) fRnd.nextS(); + fArray[5] = (float) fRnd.nextS(); + fArray[6] = (float) fRnd.nextS(); + fArray[7] = (float) fRnd.nextS(); + fArray[8] = (float) fRnd.nextS(); } protected: // Putting random generation of the matrix inside performTest() @@ -272,10 +272,10 @@ class ScaleTransMixedMatrixBench : public MatrixBench { fRandom.nextS(), fRandom.nextS(), fRandom.nextS()); int i; for (i = 0; i < fCount; i++) { - fSrc[i].fX = fRandom.nextS(); - fSrc[i].fY = fRandom.nextS(); - fDst[i].fX = fRandom.nextS(); - fDst[i].fY = fRandom.nextS(); + fSrc[i].fX = fRandom.nextSScalar1(); + fSrc[i].fY = fRandom.nextSScalar1(); + fDst[i].fX = fRandom.nextSScalar1(); + fDst[i].fY = fRandom.nextSScalar1(); } } protected: @@ -309,10 +309,10 @@ class ScaleTransDoubleMatrixBench : public MatrixBench { init9(fMatrix); int i; for (i = 0; i < fCount; i++) { - fSrc[i].fX = fRandom.nextS(); - fSrc[i].fY = fRandom.nextS(); - fDst[i].fX = fRandom.nextS(); - fDst[i].fY = fRandom.nextS(); + fSrc[i].fX = fRandom.nextSScalar1(); + fSrc[i].fY = fRandom.nextSScalar1(); + fDst[i].fX = fRandom.nextSScalar1(); + fDst[i].fY = fRandom.nextSScalar1(); } } protected: @@ -321,10 +321,10 @@ class ScaleTransDoubleMatrixBench : public MatrixBench { const SkPoint* src = fSrc; int count = fCount; // As doubles, on Z600 Linux systems this is 2.5x as expensive as mixed mode - float mx = fMatrix[SkMatrix::kMScaleX]; - float my = fMatrix[SkMatrix::kMScaleY]; - float tx = fMatrix[SkMatrix::kMTransX]; - float ty = fMatrix[SkMatrix::kMTransY]; + float mx = (float) fMatrix[SkMatrix::kMScaleX]; + float my = (float) fMatrix[SkMatrix::kMScaleY]; + float tx = (float) fMatrix[SkMatrix::kMTransX]; + float ty = (float) fMatrix[SkMatrix::kMTransY]; do { dst->fY = src->fY * my + ty; dst->fX = src->fX * mx + tx; -- cgit v1.2.3