Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@5972 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index dbb8988..402661e 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -703,7 +703,7 @@
int start() const {
return fStart;
}
-
+
bool unsortable() const {
return fUnsortable;
}
@@ -1660,7 +1660,7 @@
}
Segment* findNextOp(SkTDArray<Span*>& chase, bool active,
- int& nextStart, int& nextEnd, int& winding, int& spanWinding,
+ int& nextStart, int& nextEnd, int& winding, int& spanWinding,
bool& unsortable, ShapeOp op,
const int aXorMask, const int bXorMask) {
const int startIndex = nextStart;
@@ -2326,7 +2326,7 @@
}
// start here;
- // either:
+ // either:
// a) mark spans with either end unsortable as done, or
// b) rewrite findTop / findTopSegment / findTopContour to iterate further
// when encountering an unsortable span
@@ -4617,7 +4617,7 @@
// construct closed contours
if (builder.xorMask() == kWinding_Mask
? !bridgeWinding(contourList, simple)
- : !bridgeXor(contourList, simple))
+ : !bridgeXor(contourList, simple))
{ // if some edges could not be resolved, assemble remaining fragments
assemble(simple);
}
diff --git a/experimental/pixman/Pixman-version.h b/experimental/pixman/Pixman-version.h
index d4ea7c7..1e3543a 100644
--- a/experimental/pixman/Pixman-version.h
+++ b/experimental/pixman/Pixman-version.h
@@ -37,14 +37,14 @@
#define PIXMAN_VERSION_STRING "@PIXMAN_VERSION_MAJOR@.@PIXMAN_VERSION_MINOR@.@PIXMAN_VERSION_MICRO@"
-#define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \
- ((major) * 10000) \
- + ((minor) * 100) \
- + ((micro) * 1))
+#define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \
+ ((major) * 10000) \
+ + ((minor) * 100) \
+ + ((micro) * 1))
-#define PIXMAN_VERSION PIXMAN_VERSION_ENCODE( \
- PIXMAN_VERSION_MAJOR, \
- PIXMAN_VERSION_MINOR, \
- PIXMAN_VERSION_MICRO)
+#define PIXMAN_VERSION PIXMAN_VERSION_ENCODE( \
+ PIXMAN_VERSION_MAJOR, \
+ PIXMAN_VERSION_MINOR, \
+ PIXMAN_VERSION_MICRO)
#endif /* PIXMAN_VERSION_H__ */
diff --git a/experimental/pixman/junk.cpp b/experimental/pixman/junk.cpp
index 6a93bbd..f85a442 100644
--- a/experimental/pixman/junk.cpp
+++ b/experimental/pixman/junk.cpp
@@ -22,9 +22,9 @@
void*
pixbuf_from_argb32 (uint32_t *bits,
- int width,
- int height,
- int stride)
+ int width,
+ int height,
+ int stride)
{
SkBitmap* bitmap = new SkBitmap;
bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
@@ -36,10 +36,10 @@
for (i = 0; i < height; ++i)
{
- uint32_t *src_row = &bits[i * (stride / 4)];
- uint32_t *dst_row = p_bits + i * (p_stride / 4);
+ uint32_t *src_row = &bits[i * (stride / 4)];
+ uint32_t *dst_row = p_bits + i * (p_stride / 4);
- a8r8g8b8_to_rgba_np (dst_row, src_row, width);
+ a8r8g8b8_to_rgba_np (dst_row, src_row, width);
}
return (void*) bitmap;
}
@@ -49,7 +49,7 @@
int width, height;
pixman_format_code_t format;
pixman_image_t *copy;
-
+
width = pixman_image_get_width (image);
height = pixman_image_get_height (image);
@@ -72,22 +72,22 @@
{
case PIXMAN_a8r8g8b8_sRGB:
case PIXMAN_a8r8g8b8:
- copy = pixman_image_ref (image);
- break;
+ copy = pixman_image_ref (image);
+ break;
default:
- copy = pixman_image_create_bits (PIXMAN_a8r8g8b8,
- width, height, NULL, -1);
- pixman_image_composite32 (PIXMAN_OP_SRC,
- image, NULL, copy,
- 0, 0, 0, 0, 0, 0,
- width, height);
- break;
+ copy = pixman_image_create_bits (PIXMAN_a8r8g8b8,
+ width, height, NULL, -1);
+ pixman_image_composite32 (PIXMAN_OP_SRC,
+ image, NULL, copy,
+ 0, 0, 0, 0, 0, 0,
+ width, height);
+ break;
}
SkBitmap* bitmap = (SkBitmap*) pixbuf_from_argb32 (pixman_image_get_data (copy),
- width, height,
- pixman_image_get_stride (copy));
+ width, height,
+ pixman_image_get_stride (copy));
canvas->drawBitmap(*bitmap, 0, 0);
delete bitmap;
}
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
index 85c0c0c..9ade6e1 100644
--- a/src/core/SkBitmapProcState.cpp
+++ b/src/core/SkBitmapProcState.cpp
@@ -244,7 +244,7 @@
SkASSERT(s.fInvKy == 0);
SkASSERT(count > 0 && colors != NULL);
SkASSERT(!s.fDoFilter);
-
+
const int maxX = s.fBitmap->width() - 1;
const int maxY = s.fBitmap->height() - 1;
int ix = s.fFilterOneX + x;
@@ -256,13 +256,13 @@
SkIntToScalar(y) + SK_ScalarHalf, &pt);
int iy2 = SkClampMax(SkScalarFloorToInt(pt.fY), maxY);
int ix2 = SkScalarFloorToInt(pt.fX);
-
+
SkASSERT(iy == iy2);
SkASSERT(ix == ix2);
}
#endif
const SkPMColor* row = s.fBitmap->getAddr32(0, iy);
-
+
// clamp to the left
if (ix < 0) {
int n = SkMin32(-ix, count);
@@ -310,7 +310,7 @@
SkASSERT(s.fInvKy == 0);
SkASSERT(count > 0 && colors != NULL);
SkASSERT(!s.fDoFilter);
-
+
const int stopX = s.fBitmap->width();
const int stopY = s.fBitmap->height();
int ix = s.fFilterOneX + x;
@@ -322,7 +322,7 @@
SkIntToScalar(y) + SK_ScalarHalf, &pt);
int iy2 = sk_int_mod(SkScalarFloorToInt(pt.fY), stopY);
int ix2 = SkScalarFloorToInt(pt.fX);
-
+
SkASSERT(iy == iy2);
SkASSERT(ix == ix2);
}
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index fff2180..29af42b 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -574,7 +574,7 @@
} else {
sampler->setCustomStage(stage, fPtsToUnit);
}
-
+
return true;
}
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index 9fb5176..e731f84 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -479,7 +479,7 @@
} else {
sampler->setCustomStage(stage, fPtsToUnit);
}
-
+
return true;
}
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index 2715511..3476c39 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -661,7 +661,7 @@
} else {
matrix.reset();
}
-
+
matrix.preConcat(fPtsToUnit);
SkMatrix localM;