diff options
author | 2012-10-17 02:01:13 +0000 | |
---|---|---|
committer | 2012-10-17 02:01:13 +0000 | |
commit | 20c301bd1aa4578c6d0abb23ac2c72b5fbb436db (patch) | |
tree | b16702129fc40596d18dd55ce31e4a069c32c66b /experimental | |
parent | a8d99307717c5fe02043969db0566c236a08c313 (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@5972 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental')
-rw-r--r-- | experimental/Intersection/Simplify.cpp | 8 | ||||
-rw-r--r-- | experimental/pixman/Pixman-version.h | 16 | ||||
-rw-r--r-- | experimental/pixman/junk.cpp | 36 |
3 files changed, 30 insertions, 30 deletions
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp index dbb8988965..402661e7f8 100644 --- a/experimental/Intersection/Simplify.cpp +++ b/experimental/Intersection/Simplify.cpp @@ -703,7 +703,7 @@ public: int start() const { return fStart; } - + bool unsortable() const { return fUnsortable; } @@ -1660,7 +1660,7 @@ public: } 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 @@ public: } // 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 @@ void simplifyx(const SkPath& path, SkPath& simple) { // 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 d4ea7c7f57..1e3543afa3 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 6a93bbd16c..f85a442e9a 100644 --- a/experimental/pixman/junk.cpp +++ b/experimental/pixman/junk.cpp @@ -22,9 +22,9 @@ extern "C" { 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 @@ pixbuf_from_argb32 (uint32_t *bits, 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 @@ void show_image (pixman_image_t *image) { 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 @@ void show_image (pixman_image_t *image) { { 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; } |