diff options
| author |  Eric Boren <borenet@google.com> | 2017-06-21 13:39:32 -0400 |
|---|---|---|
| committer | Eric Boren <borenet@google.com> | 2017-06-28 12:38:28 +0000 |
| commit | 746e2632c645fa616e6989787b27a1e6274243e3 (patch) | |
| tree | 383d38ee803a8b92011a6a485334c6b72dfebeb6 /src | |
| parent | 111f8a9eea6980a70a300e3a8bfd758257310fe2 (diff) | |
Move all Linux GCE bots to Debian
NOTREECHECKS:true
Bug: skia:
Change-Id: I612989c6ce2f309d2f70f896500f73e4baa971a7
Reviewed-on: https://skia-review.googlesource.com/19811
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pathops/SkOpEdgeBuilder.cpp | 3 | ||||
| -rw-r--r-- | src/sksl/SkSLParser.cpp | 5 | ||||
| -rw-r--r-- | src/sksl/disable_flex_warnings.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/pathops/SkOpEdgeBuilder.cpp b/src/pathops/SkOpEdgeBuilder.cpp index 120a503227..c1224c3603 100644 --- a/src/pathops/SkOpEdgeBuilder.cpp +++ b/src/pathops/SkOpEdgeBuilder.cpp @@ -306,7 +306,8 @@ bool SkOpEdgeBuilder::walk() { split->fT[0] = splits[prior].fT[0]; } int next = index; - while (next < breaks && !splits[next + 1].fCanAdd) { + int breakLimit = SkTMin(breaks, (int) SK_ARRAY_COUNT(splits) - 1); + while (next < breakLimit && !splits[next + 1].fCanAdd) { ++next; } if (next > index) { diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp index 5e8ec6398b..1c7f5df555 100644 --- a/src/sksl/SkSLParser.cpp +++ b/src/sksl/SkSLParser.cpp @@ -100,11 +100,6 @@ Parser::Parser(String text, SymbolTable& types, ErrorReporter& errors) layoutlex_init(&fLayoutScanner); fBuffer = sksl_scan_string(text.c_str(), fScanner); skslset_lineno(1, fScanner); - - if (false) { - // avoid unused warning - yyunput(0, nullptr, fScanner); - } } Parser::~Parser() { diff --git a/src/sksl/disable_flex_warnings.h b/src/sksl/disable_flex_warnings.h index fa11eda24c..ad73b63583 100644 --- a/src/sksl/disable_flex_warnings.h +++ b/src/sksl/disable_flex_warnings.h @@ -24,3 +24,5 @@ #pragma warning(push) #pragma warning(disable:4018) #endif + +#define YY_NO_UNPUT |