Style bikeshed - remove extraneous whitespace
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842753002
Review URL: https://codereview.chromium.org/1842753002
diff --git a/src/utils/SkBase64.cpp b/src/utils/SkBase64.cpp
index b026892..cb3396c 100644
--- a/src/utils/SkBase64.cpp
+++ b/src/utils/SkBase64.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2006 The Android Open Source Project
*
diff --git a/src/utils/SkBitSet.cpp b/src/utils/SkBitSet.cpp
index 985bb6e..7d03dfc 100755
--- a/src/utils/SkBitSet.cpp
+++ b/src/utils/SkBitSet.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/SkBitSet.h b/src/utils/SkBitSet.h
index 266fd87..802b9e1 100644
--- a/src/utils/SkBitSet.h
+++ b/src/utils/SkBitSet.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/SkBoundaryPatch.cpp b/src/utils/SkBoundaryPatch.cpp
index 7ef11ee..0cfb09c 100644
--- a/src/utils/SkBoundaryPatch.cpp
+++ b/src/utils/SkBoundaryPatch.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/SkCanvasStack.cpp b/src/utils/SkCanvasStack.cpp
index 87e8f65..a5a483d 100644
--- a/src/utils/SkCanvasStack.cpp
+++ b/src/utils/SkCanvasStack.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/src/utils/SkCanvasStack.h b/src/utils/SkCanvasStack.h
index 6602110..300bcd3 100644
--- a/src/utils/SkCanvasStack.h
+++ b/src/utils/SkCanvasStack.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp
index 75fa836..9530f86 100644
--- a/src/utils/SkDumpCanvas.cpp
+++ b/src/utils/SkDumpCanvas.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
@@ -393,7 +392,7 @@
toString(*src, &ss);
rs.prependf("%s ", ss.c_str());
}
-
+
this->dump(kDrawBitmap_Verb, paint, "drawImageRectToRect(%s %s)",
bs.c_str(), rs.c_str());
}
diff --git a/src/utils/SkInterpolator.cpp b/src/utils/SkInterpolator.cpp
index 197d977..c867587 100644
--- a/src/utils/SkInterpolator.cpp
+++ b/src/utils/SkInterpolator.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2008 The Android Open Source Project
*
diff --git a/src/utils/SkLayer.cpp b/src/utils/SkLayer.cpp
index 39032b6..d0de1ba 100644
--- a/src/utils/SkLayer.cpp
+++ b/src/utils/SkLayer.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/SkMeshUtils.cpp b/src/utils/SkMeshUtils.cpp
index 5d3eefc..27eccc2 100644
--- a/src/utils/SkMeshUtils.cpp
+++ b/src/utils/SkMeshUtils.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp
index fd5fa82..4397814 100644
--- a/src/utils/SkNWayCanvas.cpp
+++ b/src/utils/SkNWayCanvas.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/SkNinePatch.cpp b/src/utils/SkNinePatch.cpp
index aeb65b1..f4d2300 100644
--- a/src/utils/SkNinePatch.cpp
+++ b/src/utils/SkNinePatch.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2006 The Android Open Source Project
*
diff --git a/src/utils/SkParse.cpp b/src/utils/SkParse.cpp
index b5a108e..90c9fff 100644
--- a/src/utils/SkParse.cpp
+++ b/src/utils/SkParse.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2006 The Android Open Source Project
*
diff --git a/src/utils/SkParseColor.cpp b/src/utils/SkParseColor.cpp
index 329b304..eafdc4c 100644
--- a/src/utils/SkParseColor.cpp
+++ b/src/utils/SkParseColor.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2006 The Android Open Source Project
*
diff --git a/src/utils/SkParsePath.cpp b/src/utils/SkParsePath.cpp
index 8baa661..8f571f9 100644
--- a/src/utils/SkParsePath.cpp
+++ b/src/utils/SkParsePath.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/SkPatchGrid.cpp b/src/utils/SkPatchGrid.cpp
index b7aaa82..3b7c06e 100644
--- a/src/utils/SkPatchGrid.cpp
+++ b/src/utils/SkPatchGrid.cpp
@@ -36,28 +36,28 @@
if (x < 0 || y < 0 || x > fCols - 1 || y > fRows - 1 || nullptr == cubics) {
return false;
}
-
+
// setup corners and colors
int cornerPos = y * (fCols + 1) + x;
fCornerPts[cornerPos] = cubics[SkPatchUtils::kTopP0_CubicCtrlPts];
fCornerPts[cornerPos + 1] = cubics[SkPatchUtils::kTopP3_CubicCtrlPts];
fCornerPts[cornerPos + (fCols + 1)] = cubics[SkPatchUtils::kBottomP0_CubicCtrlPts];
fCornerPts[cornerPos + (fCols + 1) + 1] = cubics[SkPatchUtils::kBottomP3_CubicCtrlPts];
-
+
// set horizontal control points
int hrzPos = y * (fCols * 2) + (x * 2);
fHrzCtrlPts[hrzPos] = cubics[SkPatchUtils::kTopP1_CubicCtrlPts];
fHrzCtrlPts[hrzPos + 1] = cubics[SkPatchUtils::kTopP2_CubicCtrlPts];
fHrzCtrlPts[hrzPos + (fCols * 2)] = cubics[SkPatchUtils::kBottomP1_CubicCtrlPts];
fHrzCtrlPts[hrzPos + (fCols * 2) + 1] = cubics[SkPatchUtils::kBottomP2_CubicCtrlPts];
-
+
// set vertical control points
int vrtPos = (y*2) * (fCols + 1) + x;
fVrtCtrlPts[vrtPos] = cubics[SkPatchUtils::kLeftP1_CubicCtrlPts];
fVrtCtrlPts[vrtPos + 1] = cubics[SkPatchUtils::kRightP1_CubicCtrlPts];
fVrtCtrlPts[vrtPos + (fCols + 1)] = cubics[SkPatchUtils::kLeftP2_CubicCtrlPts];
fVrtCtrlPts[vrtPos + (fCols + 1) + 1] = cubics[SkPatchUtils::kRightP2_CubicCtrlPts];
-
+
// set optional values (colors and texture coordinates)
if ((fModeFlags & kColors_VertexType) && colors) {
fCornerColors[cornerPos] = colors[0];
@@ -65,57 +65,57 @@
fCornerColors[cornerPos + (fCols + 1)] = colors[3];
fCornerColors[cornerPos + (fCols + 1) + 1] = colors[2];
}
-
+
if ((fModeFlags & kTexs_VertexType) && texCoords) {
fTexCoords[cornerPos] = texCoords[0];
fTexCoords[cornerPos + 1] = texCoords[1];
fTexCoords[cornerPos + (fCols + 1)] = texCoords[3];
fTexCoords[cornerPos + (fCols + 1) + 1] = texCoords[2];
}
-
+
return true;
}
bool SkPatchGrid::getPatch(int x, int y, SkPoint cubics[12], SkColor colors[4],
SkPoint texCoords[4]) const {
-
+
if (x < 0 || y < 0 || x > fCols - 1 || y > fRows - 1 || nullptr == cubics) {
return false;
}
-
+
// set the patch by building the array of points and colors with the corresponding values.
int cornerPos = y * (fCols + 1) + x;
cubics[SkPatchUtils::kTopP0_CubicCtrlPts] = fCornerPts[cornerPos];
cubics[SkPatchUtils::kTopP3_CubicCtrlPts] = fCornerPts[cornerPos + 1];
cubics[SkPatchUtils::kBottomP0_CubicCtrlPts] = fCornerPts[cornerPos + (fCols + 1)];
cubics[SkPatchUtils::kBottomP3_CubicCtrlPts] = fCornerPts[cornerPos + (fCols + 1) + 1];
-
+
int hrzPos = y * (fCols * 2) + (x * 2);
cubics[SkPatchUtils::kTopP1_CubicCtrlPts] = fHrzCtrlPts[hrzPos];
cubics[SkPatchUtils::kTopP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + 1];
cubics[SkPatchUtils::kBottomP1_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2)];
cubics[SkPatchUtils::kBottomP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2) + 1];
-
+
int vrtPos = (y*2) * (fCols + 1) + x;
cubics[SkPatchUtils::kLeftP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos];
cubics[SkPatchUtils::kRightP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos + 1];
cubics[SkPatchUtils::kLeftP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1)];
cubics[SkPatchUtils::kRightP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1) + 1];
-
+
if ((fModeFlags & kColors_VertexType) && colors) {
colors[0] = fCornerColors[cornerPos];
colors[1] = fCornerColors[cornerPos + 1];
colors[3] = fCornerColors[cornerPos + (fCols + 1)];
colors[2] = fCornerColors[cornerPos + (fCols + 1) + 1];
}
-
+
if ((fModeFlags & kTexs_VertexType) && texCoords) {
texCoords[0] = fTexCoords[cornerPos];
texCoords[1] = fTexCoords[cornerPos + 1];
texCoords[3] = fTexCoords[cornerPos + (fCols + 1)];
texCoords[2] = fTexCoords[cornerPos + (fCols + 1) + 1];
}
-
+
return true;
}
@@ -137,12 +137,12 @@
memset(fCornerPts, 0, (fRows + 1) * (fCols + 1) * sizeof(SkPoint));
memset(fHrzCtrlPts, 0, (fRows + 1) * fCols * 2 * sizeof(SkPoint));
memset(fVrtCtrlPts, 0, fRows * 2 * (fCols + 1) * sizeof(SkPoint));
-
+
if (fModeFlags & kColors_VertexType) {
fCornerColors = new SkColor[(fRows + 1) * (fCols + 1)];
memset(fCornerColors, 0, (fRows + 1) * (fCols + 1) * sizeof(SkColor));
}
-
+
if (fModeFlags & kTexs_VertexType) {
fTexCoords = new SkPoint[(fRows + 1) * (fCols + 1)];
memset(fTexCoords, 0, (fRows + 1) * (fCols + 1) * sizeof(SkPoint));
@@ -154,7 +154,7 @@
int* maxRows = new int[fRows];
memset(maxCols, 0, fCols * sizeof(int));
memset(maxRows, 0, fRows * sizeof(int));
-
+
// Get the maximum level of detail per axis for each row and column
for (int y = 0; y < fRows; y++) {
for (int x = 0; x < fCols; x++) {
diff --git a/src/utils/SkPatchGrid.h b/src/utils/SkPatchGrid.h
index 5bc2e65..ca2a35b 100644
--- a/src/utils/SkPatchGrid.h
+++ b/src/utils/SkPatchGrid.h
@@ -13,12 +13,12 @@
#include "SkXfermode.h"
/**
- * Class that represents a grid of patches. Adjacent patches share their corners and a color is
+ * Class that represents a grid of patches. Adjacent patches share their corners and a color is
* specified at each one of them. The colors are bilinearly interpolated across the patch.
*
- * This implementation defines a bidimensional array of patches. There are 3 arrays to store the
+ * This implementation defines a bidimensional array of patches. There are 3 arrays to store the
* control points of the patches to avoid storing repeated data since there are several points
- * shared between adjacent patches.
+ * shared between adjacent patches.
*
* The array fCornerPts stores the corner control points of the patches.
* The array fHrzPts holds the intermidiate control points of the top and bottom curves of a patch.
@@ -54,11 +54,11 @@
* \ / \ /
* H8 H9 H10 H11
*
- * When trying to get a patch at a certain position it justs builds it with the corresponding
+ * When trying to get a patch at a certain position it justs builds it with the corresponding
* points.
* When adding a patch it tries to add the points at their corresponding position trying to comply
* with the adjacent points or overwriting them.
- *
+ *
* Based the idea on the SVG2 spec for mesh gradients in which a grid of patches is build as in the
* the following example:
* <meshGradient x="100" y="100">
@@ -77,58 +77,58 @@
* </meshGradient>
*/
class SkPatchGrid {
-
+
public:
-
+
enum VertexType {
kNone_VertexType = 0X00,
kColors_VertexType = 0x01,
kTexs_VertexType = 0x02,
kColorsAndTexs_VertexType = 0x03
};
-
+
SkPatchGrid(int rows = 0, int cols = 0, VertexType flags = kNone_VertexType,
SkXfermode* xfer = nullptr);
-
+
~SkPatchGrid();
-
+
/**
- * Add a patch at location (x,y) overwriting the previous patch and shared points so they
+ * Add a patch at location (x,y) overwriting the previous patch and shared points so they
* mantain C0 connectivity.
* The control points must be passed in a clockwise order starting at the top left corner.
- * The colors and texCoords are the values at the corners of the patch which will be bilerp
+ * The colors and texCoords are the values at the corners of the patch which will be bilerp
* across it, they must also be in counterclockwise order starting at the top left corner.
*/
bool setPatch(int x, int y, const SkPoint cubics[12], const SkColor colors[4],
const SkPoint texCoords[4]);
-
+
/**
* Get patch at location (x,y). If cubics, colors or texCoords is not nullptr it sets patch's
* array with its corresponding values.
- * The function returns false if the cubics parameter is nullptr or if the (x,y) coordinates are
+ * The function returns false if the cubics parameter is nullptr or if the (x,y) coordinates are
* not within the range of the grid.
*/
bool getPatch(int x, int y, SkPoint cubics[12], SkColor colors[4], SkPoint texCoords[4]) const;
-
+
/**
* Resets the grid of patches to contain rows and cols of patches.
*/
void reset(int rows, int cols, VertexType flags, SkXfermode* xMode);
-
+
/**
- * Draws the grid of patches. The patches are drawn starting at patch (0,0) drawing columns, so
- * for a 2x2 grid the order would be (0,0)->(0,1)->(1,0)->(1,1). The order follows the order
+ * Draws the grid of patches. The patches are drawn starting at patch (0,0) drawing columns, so
+ * for a 2x2 grid the order would be (0,0)->(0,1)->(1,0)->(1,1). The order follows the order
* of the parametric coordinates of the coons patch.
*/
void draw(SkCanvas* canvas, SkPaint& paint);
-
+
/**
* Get the dimensions of the grid of patches.
*/
SkISize getDimensions() const {
return SkISize::Make(fCols, fRows);
}
-
+
private:
int fRows, fCols;
VertexType fModeFlags;
diff --git a/src/utils/SkPatchUtils.cpp b/src/utils/SkPatchUtils.cpp
index 9d095ae..cbaae39 100644
--- a/src/utils/SkPatchUtils.cpp
+++ b/src/utils/SkPatchUtils.cpp
@@ -28,20 +28,20 @@
*/
class FwDCubicEvaluator {
-
+
public:
-
+
/**
* Receives the 4 control points of the cubic bezier.
*/
-
+
explicit FwDCubicEvaluator(const SkPoint points[4])
: fCoefs(points) {
memcpy(fPoints, points, 4 * sizeof(SkPoint));
-
+
this->restart(1);
}
-
+
/**
* Restarts the forward differences evaluator to the first value of t = 0.
*/
@@ -58,14 +58,14 @@
fFwDiff[1] = to_point(fCoefs.fA * h3 + fCoefs.fB * h2 + fCoefs.fC * h);
fFwDiff[0] = to_point(fCoefs.fD);
}
-
+
/**
* Check if the evaluator is still within the range of 0<=t<=1
*/
bool done() const {
return fCurrent > fMax;
}
-
+
/**
* Call next to obtain the SkPoint sampled and move to the next one.
*/
@@ -77,11 +77,11 @@
fCurrent++;
return point;
}
-
+
const SkPoint* getCtrlPoints() const {
return fPoints;
}
-
+
private:
SkCubicCoeff fCoefs;
int fMax, fCurrent, fDivisions;
@@ -115,29 +115,29 @@
}
SkISize SkPatchUtils::GetLevelOfDetail(const SkPoint cubics[12], const SkMatrix* matrix) {
-
+
// Approximate length of each cubic.
SkPoint pts[kNumPtsCubic];
SkPatchUtils::getTopCubic(cubics, pts);
matrix->mapPoints(pts, kNumPtsCubic);
SkScalar topLength = approx_arc_length(pts, kNumPtsCubic);
-
+
SkPatchUtils::getBottomCubic(cubics, pts);
matrix->mapPoints(pts, kNumPtsCubic);
SkScalar bottomLength = approx_arc_length(pts, kNumPtsCubic);
-
+
SkPatchUtils::getLeftCubic(cubics, pts);
matrix->mapPoints(pts, kNumPtsCubic);
SkScalar leftLength = approx_arc_length(pts, kNumPtsCubic);
-
+
SkPatchUtils::getRightCubic(cubics, pts);
matrix->mapPoints(pts, kNumPtsCubic);
SkScalar rightLength = approx_arc_length(pts, kNumPtsCubic);
-
+
// Level of detail per axis, based on the larger side between top and bottom or left and right
int lodX = static_cast<int>(SkMaxScalar(topLength, bottomLength) / kPartitionSize);
int lodY = static_cast<int>(SkMaxScalar(leftLength, rightLength) / kPartitionSize);
-
+
return SkISize::Make(SkMax32(8, lodX), SkMax32(8, lodY));
}
@@ -210,12 +210,12 @@
}
data->fColors = new uint32_t[data->fVertexCount];
}
-
+
// if texture coordinates are not null then create array for them
if (texCoords) {
data->fTexCoords = new SkPoint[data->fVertexCount];
}
-
+
SkPoint pts[kNumPtsCubic];
SkPatchUtils::getBottomCubic(cubics, pts);
FwDCubicEvaluator fBottom(pts);
@@ -225,10 +225,10 @@
FwDCubicEvaluator fLeft(pts);
SkPatchUtils::getRightCubic(cubics, pts);
FwDCubicEvaluator fRight(pts);
-
+
fBottom.restart(lodX);
fTop.restart(lodX);
-
+
SkScalar u = 0.0f;
int stride = lodY + 1;
for (int x = 0; x <= lodX; x++) {
@@ -238,9 +238,9 @@
SkScalar v = 0.f;
for (int y = 0; y <= lodY; y++) {
int dataIndex = x * (lodY + 1) + y;
-
+
SkPoint left = fLeft.next(), right = fRight.next();
-
+
SkPoint s0 = SkPoint::Make((1.0f - v) * top.x() + v * bottom.x(),
(1.0f - v) * top.y() + v * bottom.y());
SkPoint s1 = SkPoint::Make((1.0f - u) * left.x() + u * right.x(),
@@ -255,7 +255,7 @@
+ v * ((1.0f - u) * fBottom.getCtrlPoints()[0].y()
+ u * fBottom.getCtrlPoints()[3].y()));
data->fPoints[dataIndex] = s0 + s1 - s2;
-
+
if (colors) {
uint8_t a = uint8_t(bilerp(u, v,
SkScalar(SkColorGetA(colorsPM[kTopLeft_Corner])),
@@ -279,7 +279,7 @@
SkScalar(SkColorGetB(colorsPM[kBottomRight_Corner]))));
data->fColors[dataIndex] = SkPackARGB32(a,r,g,b);
}
-
+
if (texCoords) {
data->fTexCoords[dataIndex] = SkPoint::Make(
bilerp(u, v, texCoords[kTopLeft_Corner].x(),
@@ -290,9 +290,9 @@
texCoords[kTopRight_Corner].y(),
texCoords[kBottomLeft_Corner].y(),
texCoords[kBottomRight_Corner].y()));
-
+
}
-
+
if(x < lodX && y < lodY) {
int i = 6 * (x * lodY + y);
data->fIndices[i] = x * stride + y;
diff --git a/src/utils/SkPatchUtils.h b/src/utils/SkPatchUtils.h
index 7c231f1..67ab621 100644
--- a/src/utils/SkPatchUtils.h
+++ b/src/utils/SkPatchUtils.h
@@ -12,7 +12,7 @@
#include "SkMatrix.h"
class SK_API SkPatchUtils {
-
+
public:
/**
* Structure that holds the vertex data related to the tessellation of a patch. It is passed
@@ -25,7 +25,7 @@
SkPoint* fTexCoords;
uint32_t* fColors;
uint16_t* fIndices;
-
+
VertexData()
: fVertexCount(0)
, fIndexCount(0)
@@ -33,7 +33,7 @@
, fTexCoords(nullptr)
, fColors(nullptr)
, fIndices(nullptr) { }
-
+
~VertexData() {
delete[] fPoints;
delete[] fTexCoords;
@@ -41,30 +41,30 @@
delete[] fIndices;
}
};
-
+
// Enums for control points based on the order specified in the constructor (clockwise).
enum CubicCtrlPts {
kTopP0_CubicCtrlPts = 0,
kTopP1_CubicCtrlPts = 1,
kTopP2_CubicCtrlPts = 2,
kTopP3_CubicCtrlPts = 3,
-
+
kRightP0_CubicCtrlPts = 3,
kRightP1_CubicCtrlPts = 4,
kRightP2_CubicCtrlPts = 5,
kRightP3_CubicCtrlPts = 6,
-
+
kBottomP0_CubicCtrlPts = 9,
kBottomP1_CubicCtrlPts = 8,
kBottomP2_CubicCtrlPts = 7,
kBottomP3_CubicCtrlPts = 6,
-
+
kLeftP0_CubicCtrlPts = 0,
kLeftP1_CubicCtrlPts = 11,
kLeftP2_CubicCtrlPts = 10,
kLeftP3_CubicCtrlPts = 9,
};
-
+
// Enum for corner also clockwise.
enum Corner {
kTopLeft_Corner = 0,
@@ -72,45 +72,45 @@
kBottomRight_Corner,
kBottomLeft_Corner
};
-
+
enum {
kNumCtrlPts = 12,
kNumCorners = 4,
kNumPtsCubic = 4
};
-
+
/**
- * Method that calculates a level of detail (number of subdivisions) for a patch in both axis.
+ * Method that calculates a level of detail (number of subdivisions) for a patch in both axis.
*/
static SkISize GetLevelOfDetail(const SkPoint cubics[12], const SkMatrix* matrix);
-
+
/**
* Get the points corresponding to the top cubic of cubics.
*/
static void getTopCubic(const SkPoint cubics[12], SkPoint points[4]);
-
+
/**
* Get the points corresponding to the bottom cubic of cubics.
*/
static void getBottomCubic(const SkPoint cubics[12], SkPoint points[4]);
-
+
/**
* Get the points corresponding to the left cubic of cubics.
*/
static void getLeftCubic(const SkPoint cubics[12], SkPoint points[4]);
-
+
/**
* Get the points corresponding to the right cubic of cubics.
*/
static void getRightCubic(const SkPoint cubics[12], SkPoint points[4]);
-
+
/**
* Function that evaluates the coons patch interpolation.
* data refers to the pointer of the PatchData struct in which the tessellation data is set.
* cubics refers to the points of the cubics.
* lod refers the level of detail for each axis.
* colors refers to the corner colors that will be bilerp across the patch (optional parameter)
- * texCoords refers to the corner texture coordinates that will be bilerp across the patch
+ * texCoords refers to the corner texture coordinates that will be bilerp across the patch
(optional parameter)
*/
static bool getVertexData(SkPatchUtils::VertexData* data, const SkPoint cubics[12],
diff --git a/src/utils/SkTextBox.cpp b/src/utils/SkTextBox.cpp
index ba6ef53..d237f45 100644
--- a/src/utils/SkTextBox.cpp
+++ b/src/utils/SkTextBox.cpp
@@ -300,4 +300,3 @@
}
return (SkTextBlob*)visitor.fBuilder.build();
}
-
diff --git a/src/utils/SkTextureCompressor_ASTC.cpp b/src/utils/SkTextureCompressor_ASTC.cpp
index a6e91d6..02f4f17 100644
--- a/src/utils/SkTextureCompressor_ASTC.cpp
+++ b/src/utils/SkTextureCompressor_ASTC.cpp
@@ -217,7 +217,7 @@
// - Single plane
// - Low-precision index values
// - Index range 0-7 (three bits per index)
- // 2. Partitions: 0b00
+ // 2. Partitions: 0b00
// - One partition
// 3. Color Endpoint Mode: 0b0000
// - Direct luminance -- e0=(v0,v0,v0,0xFF); e1=(v1,v1,v1,0xFF);
@@ -270,7 +270,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-// Enable this to assert whenever a decoded block has invalid ASTC values. Otherwise,
+// Enable this to assert whenever a decoded block has invalid ASTC values. Otherwise,
// each invalid block will result in a disgusting magenta color.
#define ASSERT_ASTC_DECODE_ERROR 0
@@ -369,7 +369,7 @@
SkASSERT(nBits > (64 - from));
const int nLow = 64 - from;
const int nHigh = nBits - nLow;
- result =
+ result =
((block.fLow >> from) & ((1ULL << nLow) - 1)) |
((block.fHigh & ((1ULL << nHigh) - 1)) << nLow);
}
@@ -452,7 +452,7 @@
v4 = v[4];
v5 = v[5];
}
-
+
endpoints[0] = SkColorSetARGB(v4,
(v[0]*v[3]) >> 8,
(v[1]*v[3]) >> 8,
@@ -1256,7 +1256,7 @@
case kLDR_LuminanceAlpha_Direct_ColorEndpointMode: {
const int* v = colorValues;
-
+
endpoints[i][0] = SkColorSetARGB(v[2], v[0], v[0], v[0]);
endpoints[i][1] = SkColorSetARGB(v[3], v[1], v[1], v[1]);
@@ -1272,7 +1272,7 @@
bit_transfer_signed(&v1, &v0);
bit_transfer_signed(&v3, &v2);
-
+
endpoints[i][0] = SkColorSetARGB(v2, v0, v0, v0);
endpoints[i][1] = SkColorSetARGB(
clamp_byte(v3+v2),
@@ -1669,7 +1669,7 @@
this->decodeDualPlane(dualPlaneBitLoc);
return;
- }
+ }
// If we have more than one partition, then we need to make
// room for the partition index.
@@ -1691,7 +1691,7 @@
this->decodeDualPlane(dualPlaneBitLoc);
return;
- }
+ }
// Move the dual plane selector bits down based on how many
// partitions the block contains.
@@ -1756,7 +1756,7 @@
// Decodes the block mode. This function determines whether or not we use
// dual plane encoding, the size of the texel weight grid, and the number of
- // bits, trits and quints that are used to encode it. For more information,
+ // bits, trits and quints that are used to encode it. For more information,
// see section C.2.10 of the ASTC spec.
//
// For 2D blocks, the Block Mode field is laid out as follows:
diff --git a/src/utils/SkTextureCompressor_Blitter.h b/src/utils/SkTextureCompressor_Blitter.h
index 0c259d6..f488707 100644
--- a/src/utils/SkTextureCompressor_Blitter.h
+++ b/src/utils/SkTextureCompressor_Blitter.h
@@ -55,7 +55,7 @@
// // most likely be implementation dependent. The mask variable will have
// // 0xFF in positions where the block should be updated and 0 in positions
// // where it shouldn't. src contains an uncompressed buffer of pixels.
-// static void UpdateBlock(uint8_t* dst, const uint8_t* src, int srcRowBytes,
+// static void UpdateBlock(uint8_t* dst, const uint8_t* src, int srcRowBytes,
// const uint8_t* mask);
#endif
// };
@@ -65,7 +65,7 @@
SkTCompressedAlphaBlitter(int width, int height, void *compressedBuffer)
// 0x7FFE is one minus the largest positive 16-bit int. We use it for
// debugging to make sure that we're properly setting the nextX distance
- // in flushRuns().
+ // in flushRuns().
#ifdef SK_DEBUG
: fCalledOnceWithNonzeroY(false)
, fBlitMaskCalled(false),
@@ -139,7 +139,7 @@
this->flushRuns();
}
}
-
+
// Blit a vertical run of pixels with a constant alpha value.
void blitV(int x, int y, int height, SkAlpha alpha) override {
// This function is currently not implemented. It is not explicitly
@@ -171,7 +171,7 @@
// Make sure that we're only ever bracketing calls to blitAntiH.
SkASSERT((0 == y) || (!fCalledOnceWithNonzeroY && (fCalledOnceWithNonzeroY = true)));
-
+
#if !(PEDANTIC_BLIT_RECT)
for (int i = 0; i < height; ++i) {
const SkAlpha kFullAlpha = 0xFF;
@@ -194,7 +194,7 @@
const int yoff = y - startBlockY;
SkASSERT((yoff + height) <= BlockDim);
-
+
for (int j = 0; j < height; ++j) {
memset(mask + (j + yoff)*BlockDim + xoff, 0xFF, width);
}
@@ -493,7 +493,7 @@
// -----------------------------------------------------------------------
// ... | | | | | ----> fBufferedRuns[3]
// -----------------------------------------------------------------------
- //
+ //
// curX -- the macro X value that we've gotten to.
// c[BlockDim] -- the buffers that represent the columns of the current block
// that we're operating on
diff --git a/src/utils/SkTextureCompressor_LATC.cpp b/src/utils/SkTextureCompressor_LATC.cpp
index 3ee6b27..50aaf0b 100644
--- a/src/utils/SkTextureCompressor_LATC.cpp
+++ b/src/utils/SkTextureCompressor_LATC.cpp
@@ -81,7 +81,7 @@
// This function is used by both R11 EAC and LATC to compress 4x4 blocks
// of 8-bit alpha into 64-bit values that comprise the compressed data.
-// For both formats, we need to make sure that the dimensions of the
+// For both formats, we need to make sure that the dimensions of the
// src pixels are divisible by 4, and copy 4x4 blocks one at a time
// for compression.
static bool compress_4x4_a8_to_64bit(uint8_t* dst, const uint8_t* src,
@@ -284,7 +284,7 @@
if (nonExtremalPixels == nUniquePixels) {
// This is really just for correctness, in all of my tests we
// never take this step. We don't lose too much perf here because
- // most of the processing in this function is worth it for the
+ // most of the processing in this function is worth it for the
// 1 == nUniquePixels optimization.
return compress_latc_block_bb(pixels);
} else {
@@ -320,7 +320,7 @@
// Converts each 8-bit byte in the integer into an LATC index, and then packs
// the indices into the low 12 bits of the integer.
static inline uint32_t convert_index(uint32_t x) {
- // Since the palette is
+ // Since the palette is
// 255, 0, 219, 182, 146, 109, 73, 36
// we need to map the high three bits of each byte in the integer
// from
@@ -346,7 +346,7 @@
// Mask out high bits:
// 9 7 6 5 4 3 2 0 --> 1 7 6 5 4 3 2 0
x &= 0x07070707;
-
+
return pack_index(x);
}
diff --git a/src/utils/SkTextureCompressor_R11EAC.cpp b/src/utils/SkTextureCompressor_R11EAC.cpp
index 291820b..5c298dd 100644
--- a/src/utils/SkTextureCompressor_R11EAC.cpp
+++ b/src/utils/SkTextureCompressor_R11EAC.cpp
@@ -235,7 +235,7 @@
//
// this gives the following formula:
// clamp[0, 2047](0*8+4+(-3)*2*8) = 0
- //
+ //
// Furthermore, it is impervious to endianness:
// 0x0020000000002000ULL
// Will produce one pixel with index 2, which gives:
@@ -244,7 +244,7 @@
// Fully opaque? We know this encoding too...
case 255:
-
+
// -1 produces the following:
// basw_cw: 255
// mod: 15, palette: {-3, -5, -7, -9, 2, 4, 6, 8}
@@ -410,7 +410,7 @@
x = swap_shift<36>(x, 0xFC0ULL);
// x: 00 00 00 00 00 00 00 00 a e i m d h l p b f j n c g k o
-
+
x = (x & (0xFFFULL << 36)) | ((x & 0xFFFFFFULL) << 12) | ((x >> 24) & 0xFFFULL);
#endif
@@ -498,13 +498,13 @@
// the least significant 12 bits of the resulting integer.
static inline uint32_t pack_indices_vertical(uint32_t x) {
#if defined (SK_CPU_BENDIAN)
- return
+ return
(x & 7) |
((x >> 5) & (7 << 3)) |
((x >> 10) & (7 << 6)) |
((x >> 15) & (7 << 9));
#else
- return
+ return
((x >> 24) & 7) |
((x >> 13) & (7 << 3)) |
((x >> 2) & (7 << 6)) |
@@ -664,7 +664,7 @@
src += 8;
}
dst += 4 * dstRowBytes;
- }
+ }
}
} // namespace SkTextureCompressor
diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp
index 3fd9057..7f15ed7 100644
--- a/src/utils/mac/SkCreateCGImageRef.cpp
+++ b/src/utils/mac/SkCreateCGImageRef.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/win/SkAutoCoInitialize.cpp b/src/utils/win/SkAutoCoInitialize.cpp
index 83f23bd..3b7b42b 100644
--- a/src/utils/win/SkAutoCoInitialize.cpp
+++ b/src/utils/win/SkAutoCoInitialize.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/win/SkIStream.cpp b/src/utils/win/SkIStream.cpp
index fdb6ce6..ad9bf05 100644
--- a/src/utils/win/SkIStream.cpp
+++ b/src/utils/win/SkIStream.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/win/SkWGL.h b/src/utils/win/SkWGL.h
index d502eb0..5322d91 100644
--- a/src/utils/win/SkWGL.h
+++ b/src/utils/win/SkWGL.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/src/utils/win/SkWGL_win.cpp b/src/utils/win/SkWGL_win.cpp
index 5afcae9..65ffaf1 100644
--- a/src/utils/win/SkWGL_win.cpp
+++ b/src/utils/win/SkWGL_win.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*