Sanitizing source files in Skia_Periodic_House_Keeping

git-svn-id: http://skia.googlecode.com/svn/trunk@5594 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2012-09-19 02:01:47 +00:00
Родитель 79723f9826
Коммит c1ad022608
7 изменённых файлов: 29 добавлений и 29 удалений

Просмотреть файл

@ -92,7 +92,7 @@ bool intersect2(const Quadratic& q1, const Quadratic& q2, Intersections& i) {
int rootCount = findRoots(i2, q1, roots1); int rootCount = findRoots(i2, q1, roots1);
// OPTIMIZATION: could short circuit here if all roots are < 0 or > 1 // OPTIMIZATION: could short circuit here if all roots are < 0 or > 1
#ifndef NDEBUG #ifndef NDEBUG
int rootCount2 = int rootCount2 =
#endif #endif
findRoots(i1, q2, roots2); findRoots(i1, q2, roots2);
assert(rootCount == rootCount2); assert(rootCount == rootCount2);

Просмотреть файл

@ -150,7 +150,7 @@ static int cubicRootsX(double A, double B, double C, double D, double s[3]) {
if (approximately_zero(R)) {/* one triple solution */ if (approximately_zero(R)) {/* one triple solution */
*roots++ = -adiv3; *roots++ = -adiv3;
} else { /* one single and one double solution */ } else { /* one single and one double solution */
double u = cube_root(-R); double u = cube_root(-R);
*roots++ = 2 * u - adiv3; *roots++ = 2 * u - adiv3;
*roots++ = -u - adiv3; *roots++ = -u - adiv3;

Просмотреть файл

@ -564,7 +564,7 @@ public:
#else #else
SkASSERT(fVerb == SkPath::kQuad_Verb); // worry about cubics later SkASSERT(fVerb == SkPath::kQuad_Verb); // worry about cubics later
SkASSERT(rh.fVerb == SkPath::kQuad_Verb); SkASSERT(rh.fVerb == SkPath::kQuad_Verb);
// FIXME: until I can think of something better, project a ray from the // FIXME: until I can think of something better, project a ray from the
// end of the shorter tangent to midway between the end points // end of the shorter tangent to midway between the end points
// through both curves and use the resulting angle to sort // through both curves and use the resulting angle to sort
// FIXME: some of this setup can be moved to set() if it works, or cached if it's expensive // FIXME: some of this setup can be moved to set() if it works, or cached if it's expensive

Просмотреть файл

@ -663,7 +663,7 @@ public:
} }
this->drawBitmapRectToRect(bitmap, realSrcPtr, dst, paint); this->drawBitmapRectToRect(bitmap, realSrcPtr, dst, paint);
} }
virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m, virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
const SkPaint* paint = NULL); const SkPaint* paint = NULL);

Просмотреть файл

@ -30,7 +30,7 @@ public:
/** Construct a matrix convolution image filter. /** Construct a matrix convolution image filter.
@param kernelSize The kernel size in pixels, in each dimension (N by M). @param kernelSize The kernel size in pixels, in each dimension (N by M).
@param kernel The image processing kernel. Must contain N * M @param kernel The image processing kernel. Must contain N * M
elements, in row order. elements, in row order.
@param gain A scale factor applied to each pixel after @param gain A scale factor applied to each pixel after
convolution. This can be used to normalize the convolution. This can be used to normalize the

Просмотреть файл

@ -13,8 +13,8 @@
#include "GrTDArray.h" #include "GrTDArray.h"
// GrTDefaultFindFunctor implements the default find behavior for // GrTDefaultFindFunctor implements the default find behavior for
// GrTHashTable (i.e., return the first resource that matches the // GrTHashTable (i.e., return the first resource that matches the
// provided key) // provided key)
template <typename T> class GrTDefaultFindFunctor { template <typename T> class GrTDefaultFindFunctor {
public: public:
@ -133,7 +133,7 @@ T* GrTHashTable<T, Key, kHashBits>::find(const Key& key, const FindFuncType& fin
if (NULL != elem && Key::EQ(*elem, key) && findFunc(elem)) { if (NULL != elem && Key::EQ(*elem, key) && findFunc(elem)) {
return elem; return elem;
} }
// bsearch for the key in our sorted array // bsearch for the key in our sorted array
int index = this->searchArray(key); int index = this->searchArray(key);

Просмотреть файл

@ -20,7 +20,7 @@ struct HashElement {
class GrFindPositivesFunctor { class GrFindPositivesFunctor {
public: public:
// only return elements with positive values // only return elements with positive values
bool operator()(const HashElement* elem) const { bool operator()(const HashElement* elem) const {
return elem->fValue > 0; return elem->fValue > 0;
} }
}; };
@ -28,7 +28,7 @@ public:
class GrFindNegativesFunctor { class GrFindNegativesFunctor {
public: public:
// only return elements with negative values // only return elements with negative values
bool operator()(const HashElement* elem) const { bool operator()(const HashElement* elem) const {
return elem->fValue < 0; return elem->fValue < 0;
} }
}; };
@ -67,28 +67,28 @@ static void TestHashCache(skiatest::Reporter* reporter, GrContext* context) {
GrTHashTable<HashElement, HashKey, 4> cache; GrTHashTable<HashElement, HashKey, 4> cache;
HashElement negHashElements[10] = { HashElement negHashElements[10] = {
{ 0, 0 }, { 0, 0 },
{ 1, -1 }, { 1, -1 },
{ 2, -2 }, { 2, -2 },
{ 3, -3 }, { 3, -3 },
{ 4, -4 }, { 4, -4 },
{ 5, -5 }, { 5, -5 },
{ 6, -6 }, { 6, -6 },
{ 7, -7 }, { 7, -7 },
{ 8, -8 }, { 8, -8 },
{ 9, -9 } { 9, -9 }
}; };
HashElement posHashElements[10] = { HashElement posHashElements[10] = {
{ 0, 0 }, { 0, 0 },
{ 1, 1 }, { 1, 1 },
{ 2, 2 }, { 2, 2 },
{ 3, 3 }, { 3, 3 },
{ 4, 4 }, { 4, 4 },
{ 5, 5 }, { 5, 5 },
{ 6, 6 }, { 6, 6 },
{ 7, 7 }, { 7, 7 },
{ 8, 8 }, { 8, 8 },
{ 9, 9 } { 9, 9 }
}; };
@ -117,7 +117,7 @@ static void TestHashCache(skiatest::Reporter* reporter, GrContext* context) {
} }
REPORTER_ASSERT(reporter, 20 == cache.count()); REPORTER_ASSERT(reporter, 20 == cache.count());
// test out the find functor to find all the positive values // test out the find functor to find all the positive values
{ {
GrFindPositivesFunctor findPos; GrFindPositivesFunctor findPos;