AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@8568 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-04-09 07:01:27 +00:00
parent 8e029e6e59
commit 3284017a60
24 changed files with 298 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

482
experimental/Intersection/NearestPoint.cpp
View File

@ -1,13 +1,13 @@
/*
Solving the Nearest Point-on-Curve Problem
Solving the Nearest Point-on-Curve Problem
and
A Bezier Curve-Based Root-Finder
by Philip J. Schneider
from "Graphics Gems", Academic Press, 1990
*/
/* point_on_curve.c */
/* point_on_curve.c */
#include <stdio.h>
#include <malloc.h>
#include <math.h>
@ -19,64 +19,64 @@ from "Graphics Gems", Academic Press, 1990
* Forward declarations
*/
Point2 NearestPointOnCurve();
static int FindRoots();
static Point2 *ConvertToBezierForm();
static double ComputeXIntercept();
static int ControlPolygonFlatEnough();
static int CrossingCount();
static Point2 Bezier();
static Vector2 V2ScaleII();
static int FindRoots();
static Point2 *ConvertToBezierForm();
static double ComputeXIntercept();
static int ControlPolygonFlatEnough();
static int CrossingCount();
static Point2 Bezier();
static Vector2 V2ScaleII();
int MAXDEPTH = 64; /* Maximum depth for recursion */
int MAXDEPTH = 64; /* Maximum depth for recursion */
#define EPSILON (ldexp(1.0,-MAXDEPTH-1)) /*Flatness control value */
#define DEGREE 3 /* Cubic Bezier curve */
#define W_DEGREE 5 /* Degree of eqn to find roots of */
#define EPSILON (ldexp(1.0,-MAXDEPTH-1)) /*Flatness control value */
#define DEGREE 3 /* Cubic Bezier curve */
#define W_DEGREE 5 /* Degree of eqn to find roots of */
#ifdef TESTMODE
/*
* main :
* Given a cubic Bezier curve (i.e., its control points), and some
* arbitrary point in the plane, find the point on the curve
* closest to that arbitrary point.
* Given a cubic Bezier curve (i.e., its control points), and some
* arbitrary point in the plane, find the point on the curve
* closest to that arbitrary point.
*/
main()
{
static Point2 bezCurve[4] = { /* A cubic Bezier curve */
{ 0.0, 0.0 },
{ 1.0, 2.0 },
{ 3.0, 3.0 },
{ 4.0, 2.0 },
static Point2 bezCurve[4] = { /* A cubic Bezier curve */
{ 0.0, 0.0 },
{ 1.0, 2.0 },
{ 3.0, 3.0 },
{ 4.0, 2.0 },
};
static Point2 arbPoint = { 3.5, 2.0 }; /*Some arbitrary point*/
Point2 pointOnCurve; /* Nearest point on the curve */
Point2 pointOnCurve; /* Nearest point on the curve */
/* Find the closest point */
pointOnCurve = NearestPointOnCurve(arbPoint, bezCurve);
printf("pointOnCurve : (%4.4f, %4.4f)\n", pointOnCurve.x,
pointOnCurve.y);
pointOnCurve.y);
}
#endif /* TESTMODE */
/*
* NearestPointOnCurve :
* Compute the parameter value of the point on a Bezier
* curve segment closest to some arbtitrary, user-input point.
* Return the point on the curve at that parameter value.
* Compute the parameter value of the point on a Bezier
* curve segment closest to some arbtitrary, user-input point.
* Return the point on the curve at that parameter value.
*
*/
Point2 NearestPointOnCurve(P, V)
Point2 P; /* The user-supplied point */
Point2 *V; /* Control points of cubic Bezier */
Point2 P; /* The user-supplied point */
Point2 *V; /* Control points of cubic Bezier */
{
Point2 *w; /* Ctl pts for 5th-degree eqn */
double t_candidate[W_DEGREE]; /* Possible roots */
int n_solutions; /* Number of roots found */
double t; /* Parameter value of closest pt*/
Point2 *w; /* Ctl pts for 5th-degree eqn */
double t_candidate[W_DEGREE]; /* Possible roots */
int n_solutions; /* Number of roots found */
double t; /* Parameter value of closest pt*/
/* Convert problem to 5th-degree Bezier form */
/* Convert problem to 5th-degree Bezier form */
w = ConvertToBezierForm(P, V);
/* Find all possible roots of 5th-degree equation */
@ -85,32 +85,32 @@ Point2 NearestPointOnCurve(P, V)
/* Compare distances of P to all candidates, and to t=0, and t=1 */
{
double dist, new_dist;
Point2 p;
Vector2 v;
int i;
double dist, new_dist;
Point2 p;
Vector2 v;
int i;
/* Check distance to beginning of curve, where t = 0 */
dist = V2SquaredLength(V2Sub(&P, &V[0], &v));
t = 0.0;
/* Find distances for candidate points */
/* Check distance to beginning of curve, where t = 0 */
dist = V2SquaredLength(V2Sub(&P, &V[0], &v));
t = 0.0;
/* Find distances for candidate points */
for (i = 0; i < n_solutions; i++) {
p = Bezier(V, DEGREE, t_candidate[i],
(Point2 *)NULL, (Point2 *)NULL);
new_dist = V2SquaredLength(V2Sub(&P, &p, &v));
if (new_dist < dist) {
dist = new_dist;
t = t_candidate[i];
}
p = Bezier(V, DEGREE, t_candidate[i],
(Point2 *)NULL, (Point2 *)NULL);
new_dist = V2SquaredLength(V2Sub(&P, &p, &v));
if (new_dist < dist) {
dist = new_dist;
t = t_candidate[i];
}
}
/* Finally, look at distance to end point, where t = 1.0 */
new_dist = V2SquaredLength(V2Sub(&P, &V[DEGREE], &v));
if (new_dist < dist) {
dist = new_dist;
t = 1.0;
/* Finally, look at distance to end point, where t = 1.0 */
new_dist = V2SquaredLength(V2Sub(&P, &V[DEGREE], &v));
if (new_dist < dist) {
dist = new_dist;
t = 1.0;
}
}
@ -122,63 +122,63 @@ Point2 NearestPointOnCurve(P, V)
/*
* ConvertToBezierForm :
* Given a point and a Bezier curve, generate a 5th-degree
* Bezier-format equation whose solution finds the point on the
* Given a point and a Bezier curve, generate a 5th-degree
* Bezier-format equation whose solution finds the point on the
* curve nearest the user-defined point.
*/
static Point2 *ConvertToBezierForm(P, V)
Point2 P; /* The point to find t for */
Point2 *V; /* The control points */
Point2 P; /* The point to find t for */
Point2 *V; /* The control points */
{
int i, j, k, m, n, ub, lb;
int row, column; /* Table indices */
Vector2 c[DEGREE+1]; /* V(i)'s - P */
Vector2 d[DEGREE]; /* V(i+1) - V(i) */
Point2 *w; /* Ctl pts of 5th-degree curve */
double cdTable[3][4]; /* Dot product of c, d */
static double z[3][4] = { /* Precomputed "z" for cubics */
{1.0, 0.6, 0.3, 0.1},
{0.4, 0.6, 0.6, 0.4},
{0.1, 0.3, 0.6, 1.0},
int i, j, k, m, n, ub, lb;
int row, column; /* Table indices */
Vector2 c[DEGREE+1]; /* V(i)'s - P */
Vector2 d[DEGREE]; /* V(i+1) - V(i) */
Point2 *w; /* Ctl pts of 5th-degree curve */
double cdTable[3][4]; /* Dot product of c, d */
static double z[3][4] = { /* Precomputed "z" for cubics */
{1.0, 0.6, 0.3, 0.1},
{0.4, 0.6, 0.6, 0.4},
{0.1, 0.3, 0.6, 1.0},
};
/*Determine the c's -- these are vectors created by subtracting*/
/* point P from each of the control points */
/* point P from each of the control points */
for (i = 0; i <= DEGREE; i++) {
V2Sub(&V[i], &P, &c[i]);
V2Sub(&V[i], &P, &c[i]);
}
/* Determine the d's -- these are vectors created by subtracting*/
/* each control point from the next */
for (i = 0; i <= DEGREE - 1; i++) {
d[i] = V2ScaleII(V2Sub(&V[i+1], &V[i], &d[i]), 3.0);
/* each control point from the next */
for (i = 0; i <= DEGREE - 1; i++) {
d[i] = V2ScaleII(V2Sub(&V[i+1], &V[i], &d[i]), 3.0);
}
/* Create the c,d table -- this is a table of dot products of the */
/* c's and d's */
/* c's and d's */
for (row = 0; row <= DEGREE - 1; row++) {
for (column = 0; column <= DEGREE; column++) {
cdTable[row][column] = V2Dot(&d[row], &c[column]);
}
for (column = 0; column <= DEGREE; column++) {
cdTable[row][column] = V2Dot(&d[row], &c[column]);
}
}
/* Now, apply the z's to the dot products, on the skew diagonal*/
/* Also, set up the x-values, making these "points" */
/* Also, set up the x-values, making these "points" */
w = (Point2 *)malloc((unsigned)(W_DEGREE+1) * sizeof(Point2));
for (i = 0; i <= W_DEGREE; i++) {
w[i].y = 0.0;
w[i].x = (double)(i) / W_DEGREE;
w[i].y = 0.0;
w[i].x = (double)(i) / W_DEGREE;
}
n = DEGREE;
m = DEGREE-1;
for (k = 0; k <= n + m; k++) {
lb = MAX(0, k - m);
ub = MIN(k, n);
for (i = lb; i <= ub; i++) {
j = k - i;
w[i+j].y += cdTable[j][i] * z[j][i];
}
lb = MAX(0, k - m);
ub = MIN(k, n);
for (i = lb; i <= ub; i++) {
j = k - i;
w[i+j].y += cdTable[j][i] * z[j][i];
}
}
return (w);
@ -187,82 +187,82 @@ static Point2 *ConvertToBezierForm(P, V)
/*
* FindRoots :
* Given a 5th-degree equation in Bernstein-Bezier form, find
* all of the roots in the interval [0, 1]. Return the number
* of roots found.
* Given a 5th-degree equation in Bernstein-Bezier form, find
* all of the roots in the interval [0, 1]. Return the number
* of roots found.
*/
static int FindRoots(w, degree, t, depth)
Point2 *w; /* The control points */
int degree; /* The degree of the polynomial */
double *t; /* RETURN candidate t-values */
int depth; /* The depth of the recursion */
{
int i;
Point2 Left[W_DEGREE+1], /* New left and right */
Right[W_DEGREE+1]; /* control polygons */
int left_count, /* Solution count from */
right_count; /* children */
double left_t[W_DEGREE+1], /* Solutions from kids */
right_t[W_DEGREE+1];
Point2 *w; /* The control points */
int degree; /* The degree of the polynomial */
double *t; /* RETURN candidate t-values */
int depth; /* The depth of the recursion */
{
int i;
Point2 Left[W_DEGREE+1], /* New left and right */
Right[W_DEGREE+1]; /* control polygons */
int left_count, /* Solution count from */
right_count; /* children */
double left_t[W_DEGREE+1], /* Solutions from kids */
right_t[W_DEGREE+1];
switch (CrossingCount(w, degree)) {
case 0 : { /* No solutions here */
return 0;
}
case 1 : { /* Unique solution */
/* Stop recursion when the tree is deep enough */
/* if deep enough, return 1 solution at midpoint */
if (depth >= MAXDEPTH) {
t[0] = (w[0].x + w[W_DEGREE].x) / 2.0;
return 1;
}
if (ControlPolygonFlatEnough(w, degree)) {
t[0] = ComputeXIntercept(w, degree);
return 1;
}
break;
}
case 0 : { /* No solutions here */
return 0;
}
case 1 : { /* Unique solution */
/* Stop recursion when the tree is deep enough */
/* if deep enough, return 1 solution at midpoint */
if (depth >= MAXDEPTH) {
t[0] = (w[0].x + w[W_DEGREE].x) / 2.0;
return 1;
}
if (ControlPolygonFlatEnough(w, degree)) {
t[0] = ComputeXIntercept(w, degree);
return 1;
}
break;
}
}
/* Otherwise, solve recursively after */
/* subdividing control polygon */
/* Otherwise, solve recursively after */
/* subdividing control polygon */
Bezier(w, degree, 0.5, Left, Right);
left_count = FindRoots(Left, degree, left_t, depth+1);
right_count = FindRoots(Right, degree, right_t, depth+1);
/* Gather solutions together */
/* Gather solutions together */
for (i = 0; i < left_count; i++) {
t[i] = left_t[i];
}
for (i = 0; i < right_count; i++) {
t[i+left_count] = right_t[i];
t[i+left_count] = right_t[i];
}
/* Send back total number of solutions */
/* Send back total number of solutions */
return (left_count+right_count);
}
/*
* CrossingCount :
* Count the number of times a Bezier control polygon
* crosses the 0-axis. This number is >= the number of roots.
* Count the number of times a Bezier control polygon
* crosses the 0-axis. This number is >= the number of roots.
*
*/
static int CrossingCount(V, degree)
Point2 *V; /* Control pts of Bezier curve */
int degree; /* Degreee of Bezier curve */
Point2 *V; /* Control pts of Bezier curve */
int degree; /* Degreee of Bezier curve */
{
int i;
int n_crossings = 0; /* Number of zero-crossings */
int sign, old_sign; /* Sign of coefficients */
int i;
int n_crossings = 0; /* Number of zero-crossings */
int sign, old_sign; /* Sign of coefficients */
sign = old_sign = SGN(V[0].y);
for (i = 1; i <= degree; i++) {
sign = SGN(V[i].y);
if (sign != old_sign) n_crossings++;
old_sign = sign;
sign = SGN(V[i].y);
if (sign != old_sign) n_crossings++;
old_sign = sign;
}
return n_crossings;
}
@ -271,107 +271,107 @@ static int CrossingCount(V, degree)
/*
* ControlPolygonFlatEnough :
* Check if the control polygon of a Bezier curve is flat enough
* for recursive subdivision to bottom out.
* Check if the control polygon of a Bezier curve is flat enough
* for recursive subdivision to bottom out.
*
*/
static int ControlPolygonFlatEnough(V, degree)
Point2 *V; /* Control points */
int degree; /* Degree of polynomial */
Point2 *V; /* Control points */
int degree; /* Degree of polynomial */
{
int i; /* Index variable */
double *distance; /* Distances from pts to line */
double max_distance_above; /* maximum of these */
double max_distance_below;
double error; /* Precision of root */
double intercept_1,
intercept_2,
left_intercept,
right_intercept;
double a, b, c; /* Coefficients of implicit */
/* eqn for line from V[0]-V[deg]*/
int i; /* Index variable */
double *distance; /* Distances from pts to line */
double max_distance_above; /* maximum of these */
double max_distance_below;
double error; /* Precision of root */
double intercept_1,
intercept_2,
left_intercept,
right_intercept;
double a, b, c; /* Coefficients of implicit */
/* eqn for line from V[0]-V[deg]*/
/* Find the perpendicular distance */
/* from each interior control point to */
/* line connecting V[0] and V[degree] */
distance = (double *)malloc((unsigned)(degree + 1) * sizeof(double));
/* Find the perpendicular distance */
/* from each interior control point to */
/* line connecting V[0] and V[degree] */
distance = (double *)malloc((unsigned)(degree + 1) * sizeof(double));
{
double abSquared;
double abSquared;
/* Derive the implicit equation for line connecting first *'
/* Derive the implicit equation for line connecting first *'
/* and last control points */
a = V[0].y - V[degree].y;
b = V[degree].x - V[0].x;
c = V[0].x * V[degree].y - V[degree].x * V[0].y;
a = V[0].y - V[degree].y;
b = V[degree].x - V[0].x;
c = V[0].x * V[degree].y - V[degree].x * V[0].y;
abSquared = (a * a) + (b * b);
abSquared = (a * a) + (b * b);
for (i = 1; i < degree; i++) {
/* Compute distance from each of the points to that line */
distance[i] = a * V[i].x + b * V[i].y + c;
if (distance[i] > 0.0) {
distance[i] = (distance[i] * distance[i]) / abSquared;
}
if (distance[i] < 0.0) {
distance[i] = -((distance[i] * distance[i]) / abSquared);
}
}
/* Compute distance from each of the points to that line */
distance[i] = a * V[i].x + b * V[i].y + c;
if (distance[i] > 0.0) {
distance[i] = (distance[i] * distance[i]) / abSquared;
}
if (distance[i] < 0.0) {
distance[i] = -((distance[i] * distance[i]) / abSquared);
}
}
}
/* Find the largest distance */
/* Find the largest distance */
max_distance_above = 0.0;
max_distance_below = 0.0;
for (i = 1; i < degree; i++) {
if (distance[i] < 0.0) {
max_distance_below = MIN(max_distance_below, distance[i]);
};
if (distance[i] > 0.0) {
max_distance_above = MAX(max_distance_above, distance[i]);
}
if (distance[i] < 0.0) {
max_distance_below = MIN(max_distance_below, distance[i]);
};
if (distance[i] > 0.0) {
max_distance_above = MAX(max_distance_above, distance[i]);
}
}
free((char *)distance);
{
double det, dInv;
double a1, b1, c1, a2, b2, c2;
double det, dInv;
double a1, b1, c1, a2, b2, c2;
/* Implicit equation for zero line */
a1 = 0.0;
b1 = 1.0;
c1 = 0.0;
/* Implicit equation for zero line */
a1 = 0.0;
b1 = 1.0;
c1 = 0.0;
/* Implicit equation for "above" line */
a2 = a;
b2 = b;
c2 = c + max_distance_above;
/* Implicit equation for "above" line */
a2 = a;
b2 = b;
c2 = c + max_distance_above;
det = a1 * b2 - a2 * b1;
dInv = 1.0/det;
intercept_1 = (b1 * c2 - b2 * c1) * dInv;
det = a1 * b2 - a2 * b1;
dInv = 1.0/det;
/* Implicit equation for "below" line */
a2 = a;
b2 = b;
c2 = c + max_distance_below;
det = a1 * b2 - a2 * b1;
dInv = 1.0/det;
intercept_2 = (b1 * c2 - b2 * c1) * dInv;
intercept_1 = (b1 * c2 - b2 * c1) * dInv;
/* Implicit equation for "below" line */
a2 = a;
b2 = b;
c2 = c + max_distance_below;
det = a1 * b2 - a2 * b1;
dInv = 1.0/det;
intercept_2 = (b1 * c2 - b2 * c1) * dInv;
}
/* Compute intercepts of bounding box */
/* Compute intercepts of bounding box */
left_intercept = MIN(intercept_1, intercept_2);
right_intercept = MAX(intercept_1, intercept_2);
error = 0.5 * (right_intercept-left_intercept);
error = 0.5 * (right_intercept-left_intercept);
if (error < EPSILON) {
return 1;
return 1;
}
else {
return 0;
return 0;
}
}
@ -379,21 +379,21 @@ static int ControlPolygonFlatEnough(V, degree)
/*
* ComputeXIntercept :
* Compute intersection of chord from first control point to last
* with 0-axis.
*
* Compute intersection of chord from first control point to last
* with 0-axis.
*
*/
/* NOTE: "T" and "Y" do not have to be computed, and there are many useless
* operations in the following (e.g. "0.0 - 0.0").
*/
static double ComputeXIntercept(V, degree)
Point2 *V; /* Control points */
int degree; /* Degree of curve */
Point2 *V; /* Control points */
int degree; /* Degree of curve */
{
double XLK, YLK, XNM, YNM, XMK, YMK;
double det, detInv;
double S, T;
double X, Y;
double XLK, YLK, XNM, YNM, XMK, YMK;
double det, detInv;
double S, T;
double X, Y;
XLK = 1.0 - 0.0;
YLK = 0.0 - 0.0;
@ -416,55 +416,55 @@ static double ComputeXIntercept(V, degree)
/*
* Bezier :
* Evaluate a Bezier curve at a particular parameter value
* Bezier :
* Evaluate a Bezier curve at a particular parameter value
* Fill in control points for resulting sub-curves if "Left" and
* "Right" are non-null.
*
* "Right" are non-null.
*
*/
static Point2 Bezier(V, degree, t, Left, Right)
int degree; /* Degree of bezier curve */
Point2 *V; /* Control pts */
double t; /* Parameter value */
Point2 *Left; /* RETURN left half ctl pts */
Point2 *Right; /* RETURN right half ctl pts */
int degree; /* Degree of bezier curve */
Point2 *V; /* Control pts */
double t; /* Parameter value */
Point2 *Left; /* RETURN left half ctl pts */
Point2 *Right; /* RETURN right half ctl pts */
{
int i, j; /* Index variables */
Point2 Vtemp[W_DEGREE+1][W_DEGREE+1];
int i, j; /* Index variables */
Point2 Vtemp[W_DEGREE+1][W_DEGREE+1];
/* Copy control points */
/* Copy control points */
for (j =0; j <= degree; j++) {
Vtemp[0][j] = V[j];
Vtemp[0][j] = V[j];
}
/* Triangle computation */
for (i = 1; i <= degree; i++) {
for (j =0 ; j <= degree - i; j++) {
Vtemp[i][j].x =
(1.0 - t) * Vtemp[i-1][j].x + t * Vtemp[i-1][j+1].x;
Vtemp[i][j].y =
(1.0 - t) * Vtemp[i-1][j].y + t * Vtemp[i-1][j+1].y;
}
/* Triangle computation */
for (i = 1; i <= degree; i++) {
for (j =0 ; j <= degree - i; j++) {
Vtemp[i][j].x =
(1.0 - t) * Vtemp[i-1][j].x + t * Vtemp[i-1][j+1].x;
Vtemp[i][j].y =
(1.0 - t) * Vtemp[i-1][j].y + t * Vtemp[i-1][j+1].y;
}
}
if (Left != NULL) {
for (j = 0; j <= degree; j++) {
Left[j] = Vtemp[j][0];
}
for (j = 0; j <= degree; j++) {
Left[j] = Vtemp[j][0];
}
}
if (Right != NULL) {
for (j = 0; j <= degree; j++) {
Right[j] = Vtemp[degree-j][j];
}
for (j = 0; j <= degree; j++) {
Right[j] = Vtemp[degree-j][j];
}
}
return (Vtemp[degree][0]);
}
static Vector2 V2ScaleII(v, s)
Vector2 *v;
double s;
Vector2 *v;
double s;
{
Vector2 result;

44
include/core/SkError.h
View File

@ -4,7 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkError_DEFINED
#define SkError_DEFINED
@ -16,35 +16,35 @@ enum SkError {
/** All is well
*/
kNoError_SkError=0,
/** User argument passed to Skia function was invalid: NULL when that’s
* not allowed, out of numeric range, bad enum, or violating some
/** User argument passed to Skia function was invalid: NULL when that’s
* not allowed, out of numeric range, bad enum, or violating some
* other general precondition.
*/
kInvalidArgument_SkError,
/** User tried to perform some operation in a state when the operation
* was not legal, or the operands make no sense (e.g., asking for
* pixels from an SkPictureCanvas). Other examples might be
/** User tried to perform some operation in a state when the operation
* was not legal, or the operands make no sense (e.g., asking for
* pixels from an SkPictureCanvas). Other examples might be
* inset()’ing a rectangle to make it degenerate (negative width/height).
*/
kInvalidOperation_SkError,
/** Probably not needed right now, but in the future we could have opaque
* handles for SkPictures floating around, and it would be a good idea
/** Probably not needed right now, but in the future we could have opaque
* handles for SkPictures floating around, and it would be a good idea
* to anticipate this kind of issue.
*/
kInvalidHandle_SkError,
/** This is probably not possible because paint surely has defaults for
/** This is probably not possible because paint surely has defaults for
* everything, but perhaps a paint can get into a bad state somehow.
*/
kInvalidPaint_SkError,
/** Skia was unable to allocate memory to perform some task.
*/
kOutOfMemory_SkError,
/** Skia failed while trying to consume some external resource.
*/
kParseError_SkError
@ -52,7 +52,7 @@ enum SkError {
/** Return the current per-thread error code. Error codes are "sticky"; they
* are not not reset by subsequent successful operations.
*/
*/
SkError SkGetLastError();
/** Clear the current per-thread error code back to kNoError_SkError.
@ -60,25 +60,25 @@ SkError SkGetLastError();
void SkClearLastError();
/** Type for callback functions to be invoked whenever an error is registered.
* Callback functions take the error code being set, as well as a context
* Callback functions take the error code being set, as well as a context
* argument that is provided when the callback is registered.
*/
typedef void (*SkErrorCallbackFunction)(SkError, void *);
/** Set the current per-thread error callback.
*
*
* @param cb The callback function to be invoked. Passing NULL
* for cb will revert to the default error callback which
* does nothing on release builds, but on debug builds will
* print an informative error message to the screen.
* @param context An arbitrary pointer that will be passed to
* @param context An arbitrary pointer that will be passed to
* the provided callback function.
*/
void SkSetErrorCallback(SkErrorCallbackFunction cb, void *context);
/** Get a human-readable description of the last (per-thread) error that
* occurred. The returned error message will include not only a human
* readable version of the error code, but also information about the
/** Get a human-readable description of the last (per-thread) error that
* occurred. The returned error message will include not only a human
* readable version of the error code, but also information about the
* conditions that led to the error itself.
*/
const char *SkGetLastErrorString();

2
include/core/SkImageFilter.h
View File

@ -104,7 +104,7 @@ public:
virtual bool canFilterImageGPU() const;
/**
* Process this image filter on the GPU. This is most often used for
* Process this image filter on the GPU. This is most often used for
* multi-pass effects, where intermediate results must be rendered to
* textures. For single-pass effects, use asNewEffect(). src is the
* source image for processing, as a texture-backed bitmap. result is

14
src/core/SkError.cpp
View File

@ -34,7 +34,7 @@ namespace {
#define THREAD_ERROR_CALLBACK \
*(reinterpret_cast<SkErrorCallbackFunction *>(SkTLS::Get(CreateThreadErrorCallback, \
DeleteThreadErrorCallback)))
void *CreateThreadErrorContext() {
return SkNEW_ARGS(void **, (NULL));
}
@ -99,7 +99,7 @@ const char *SkErrorInternals::GetLastErrorString() {
void SkErrorInternals::SetError(SkError code, const char *fmt, ...) {
THREAD_ERROR = code;
va_list args;
char *str = THREAD_ERROR_STRING;
const char *error_name = NULL;
switch( code ) {
@ -107,10 +107,10 @@ void SkErrorInternals::SetError(SkError code, const char *fmt, ...) {
error_name = "No Error";
break;
case kInvalidArgument_SkError:
error_name = "Invalid Argument";
error_name = "Invalid Argument";
break;
case kInvalidOperation_SkError:
error_name = "Invalid Operation";
case kInvalidOperation_SkError:
error_name = "Invalid Operation";
break;
case kInvalidHandle_SkError:
error_name = "Invalid Handle";
@ -128,11 +128,11 @@ void SkErrorInternals::SetError(SkError code, const char *fmt, ...) {
error_name = "Unknown error";
break;
}
sprintf( str, "%s: ", error_name );
int string_left = ERROR_STRING_LENGTH - strlen( str );
str += strlen(str);
va_start( args, fmt );
vsnprintf( str, string_left, fmt, args );
va_end( args );

4
src/core/SkErrorInternals.h
View File

@ -12,7 +12,7 @@
#include "SkError.h"
class SkErrorInternals {
public:
static void ClearError();
static void SetError(SkError code, const char *fmt, ...);
@ -21,7 +21,7 @@ public:
static void SetErrorCallback(SkErrorCallbackFunction cb, void *context);
static void DefaultErrorCallback(SkError code, void *context);
};
#endif /* SkErrorInternals_DEFINED */

6
src/core/SkPath.cpp
View File

@ -1035,11 +1035,11 @@ bool SkPath::hasOnlyMoveTos() const {
void SkPath::addRoundRect(const SkRect& rect, SkScalar rx, SkScalar ry,
Direction dir) {
assert_known_direction(dir);
if (rx < 0 || ry < 0) {
SkErrorInternals::SetError( kInvalidArgument_SkError,
SkErrorInternals::SetError( kInvalidArgument_SkError,
"I got %f and %f as radii to SkPath::AddRoundRect, "
"but negative radii are not allowed.",
"but negative radii are not allowed.",
SkScalarToDouble(rx), SkScalarToDouble(ry) );
return;
}

1
src/pathops/SkAddIntersections.h
View File

@ -16,4 +16,3 @@ void AddSelfIntersectTs(SkOpContour* test);
void CoincidenceCheck(SkTDArray<SkOpContour*>* contourList, int total);
#endif

1
src/pathops/SkOpAngle.cpp
View File

@ -252,4 +252,3 @@ void SkOpAngle::setSpans() {
fUnsortable = true;
#endif
}

1
src/pathops/SkOpContour.cpp
View File

@ -262,4 +262,3 @@ void SkOpContour::setBounds() {
fBounds.add(fSegments[index].bounds());
}
}

8
src/pathops/SkOpContour.h
View File

@ -132,7 +132,7 @@ public:
}
SkOpSegment* nonVerticalSegment(int* start, int* end);
bool operand() const {
return fOperand;
}
@ -168,13 +168,13 @@ public:
}
void sortSegments();
const SkPoint& start() const {
return fSegments.front().pts()[0];
}
void toPath(SkPathWriter* path) const;
void toPartialBackward(SkPathWriter* path) const {
int segmentCount = fSegments.count();
for (int test = segmentCount - 1; test >= 0; --test) {

2
src/pathops/SkOpSegment.cpp
View File

@ -2490,7 +2490,7 @@ void SkOpSegment::zeroSpan(SkOpSpan* span) {
span->fDone = true;
++fDoneSpans;
}
#if DEBUG_SWAP_TOP
bool SkOpSegment::controlsContainedByEnds(int tStart, int tEnd) const {
if (fVerb != SkPath::kCubic_Verb) {

4
src/pathops/SkOpSegment.h
View File

@ -180,7 +180,7 @@ public:
void updatePts(const SkPoint pts[]) {
fPts = pts;
}
SkPath::Verb verb() const {
return fVerb;
}
@ -213,7 +213,7 @@ public:
const SkPoint& xyAtT(int index) const {
return xyAtT(&fTs[index]);
}
SkScalar yAtT(int index) const {
return yAtT(&fTs[index]);
}

2
src/pathops/SkPathOpsBounds.h
View File

@ -52,7 +52,7 @@ struct SkPathOpsBounds : public SkRect {
fLeft = fRight = pt.fX;
fTop = fBottom = pt.fY;
}
typedef SkRect INHERITED;
};

3
src/pathops/SkPathOpsCommon.cpp
View File

@ -324,7 +324,7 @@ SkOpSegment* FindSortableTop(const SkTDArray<SkOpContour*>& contourList, bool* f
// if only remaining candidates are vertical, then they can be marked done
SkASSERT(*indexPtr != *endIndexPtr && *indexPtr >= 0 && *endIndexPtr >= 0);
skipVertical(contourList, &current, indexPtr, endIndexPtr);
SkASSERT(*indexPtr != *endIndexPtr && *indexPtr >= 0 && *endIndexPtr >= 0);
tryAgain = false;
contourWinding = rightAngleWinding(contourList, &current, indexPtr, endIndexPtr, &tHit,
@ -575,4 +575,3 @@ void Assemble(const SkPathWriter& path, SkPathWriter* simple) {
}
#endif
}

4
src/pathops/SkPathOpsDebug.h
View File

@ -22,10 +22,10 @@
#ifdef SK_BUILD_FOR_WIN
#define SK_RAND(seed) rand()
#define SK_SNPRINTF _snprintf
#define SK_SNPRINTF _snprintf
#else
#define SK_RAND(seed) rand_r(&seed)
#define SK_SNPRINTF snprintf
#define SK_SNPRINTF snprintf
#endif
void mathematica_ize(char* str, size_t bufferSize);

2
src/pathops/SkPathOpsTriangle.h
View File

@ -12,7 +12,7 @@
struct SkDTriangle {
SkDPoint fPts[3];
bool contains(const SkDPoint& pt) const;
};

4
src/pathops/SkPathWriter.h
View File

@ -25,11 +25,11 @@ public:
void nudge();
void quadTo(const SkPoint& pt1, const SkPoint& pt2);
bool someAssemblyRequired() const;
private:
bool changedSlopes(const SkPoint& pt) const;
void moveTo();
SkPath* fPathPtr;
SkPoint fDefer[2];
SkPoint fFirstPt;

2
src/pathops/SkQuarticRoot.cpp
View File

@ -73,7 +73,7 @@ int SkReducedQuarticRoots(const double t4, const double t3, const double t2, con
if (oneHint) {
SkASSERT(approximately_zero(t4 + t3 + t2 + t1 + t0)); // 1 is one root
// note that -C == A + B + D + E
int num = SkDCubic::RootsReal(t4, t4 + t3, -(t1 + t0), -t0, roots);
int num = SkDCubic::RootsReal(t4, t4 + t3, -(t1 + t0), -t0, roots);
for (int i = 0; i < num; ++i) {
if (approximately_equal(roots[i], 1)) {
return num;

8
tests/ErrorTest.cpp
View File

@ -17,7 +17,7 @@
SkDebugf("Last error string: %s\n", SkGetLastErrorString()); \
SkClearLastError(); \
}
static void cb(SkError err, void *context) {
int *context_ptr = static_cast<int *>(context);
SkDebugf("CB (0x%x): %s\n", *context_ptr, SkGetLastErrorString());
@ -25,16 +25,16 @@ static void cb(SkError err, void *context) {
static void ErrorTest(skiatest::Reporter* reporter) {
SkError err;
CHECK(kNoError_SkError);
SkRect r = SkRect::MakeWH(50, 100);
CHECK(kNoError_SkError);
SkPath path;
path.addRect(r);
CHECK(kNoError_SkError);
path.addRoundRect(r, 10, 10);
CHECK(kNoError_SkError);

4
tests/PathOpsExtendedTest.cpp
View File

@ -162,7 +162,7 @@ static void showPath(const SkPath& path, const char* str, const SkMatrix& scale)
SkPath scaled;
SkMatrix inverse;
bool success = scale.invert(&inverse);
if (!success) {
if (!success) {
SkASSERT(0);
}
path.transform(inverse, &scaled);
@ -330,7 +330,7 @@ static void showPathOpPath(const SkPath& one, const SkPath& two, const SkPath& a
static int comparePaths(skiatest::Reporter* reporter, const SkPath& one, const SkPath& scaledOne,
const SkPath& two, const SkPath& scaledTwo, SkBitmap& bitmap,
const SkPath& a, const SkPath& b, const SkPathOp shapeOp,
const SkPath& a, const SkPath& b, const SkPathOp shapeOp,
const SkMatrix& scale) {
int errors2x2;
int errors = pathsDrawTheSame(bitmap, scaledOne, scaledTwo, errors2x2);

1
tests/PathOpsOpRectThreadedTest.cpp
View File

@ -99,4 +99,3 @@ finish:
#include "TestClassDef.h"
DEFINE_TESTCLASS("PathOpsRectsThreaded", OpRectsThreadedTestClass, \
TestPathOpsRectsThreaded)

1
tests/PathOpsQuadIntersectionTest.cpp
View File

@ -465,4 +465,3 @@ static void TestQuadIntersection(skiatest::Reporter* reporter) {
#include "TestClassDef.h"
DEFINE_TESTCLASS("PathOpsQuadIntersection", QuadIntersectionTestClass, TestQuadIntersection)

1
tests/PathOpsTestCommon.cpp
View File

@ -24,4 +24,3 @@ void CubicToQuads(const SkDCubic& cubic, double precision, SkTDArray<SkDQuad>& q
tStart = tEnd;
}
}

2
tools/filtermain.cpp
View File

@ -703,7 +703,7 @@ static int filter_picture(const SkString& inFile, const SkString& outFile) {
if (!someOptFired) {
SkDebugf("No opts fired\n");
} else {
SkDebugf("\t before: %d after: %d delta: %d\n",
SkDebugf("\t before: %d after: %d delta: %d\n",
numBefore, numAfter, numBefore-numAfter);
}