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

add legacy pathop enums; fix uninitialized warning

Browse Source 
R=reed@google.com
BUG=skia:3588
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/1034073004
This commit is contained in:
caryclark 2015-03-26 09:05:12 -07:00 committed by Commit bot
parent 54359294a7
commit d8bc16b306
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/pathops/SkPathOps.h
View File

@ -14,6 +14,12 @@
class SkPath;
struct SkRect;
// FIXME: remove this once the define in src/skia/SkUserConfig.h lands
#ifndef SK_SUPPORT_LEGACY_PATHOP_ENUMS
#define SK_SUPPORT_LEGACY_PATHOP_ENUMS
#endif
// FIXME: move everything below into the SkPath class
/**
* The logical operations that can be performed when combining two paths.
@ -24,6 +30,14 @@ enum SkPathOp {
kUnion_SkPathOp, //!< union (inclusive-or) the two paths
kXOR_SkPathOp, //!< exclusive-or the two paths
kReverseDifference_SkPathOp, //!< subtract the first path from the op path
#ifdef SK_SUPPORT_LEGACY_PATHOP_ENUMS
kDifference_PathOp = 0, //!< subtract the op path from the first path
kIntersect_PathOp, //!< intersect the two paths
kUnion_PathOp, //!< union (inclusive-or) the two paths
kXOR_PathOp, //!< exclusive-or the two paths
kReverseDifference_PathOp, //!< subtract the first path from the op path
#endif
};
/** Set this path to the result of applying the Op to this path and the

2
src/pathops/SkPathOpsTSect.h
View File

@ -1022,7 +1022,7 @@ SkTSpan<TCurve>* SkTSect<TCurve>::extractCoincident(SkTSect* sect2, SkTSpan<TCur
}
// march outwards to find limit of coincidence from here to previous and next spans
double startT = first->fStartT;
double oppStartT;
double oppStartT SK_INIT_TO_AVOID_WARNING;
double oppEndT SK_INIT_TO_AVOID_WARNING;
SkTSpan<TCurve>* prev = first->fPrev;
SkASSERT(first->fCoinStart.isCoincident());