aboutsummaryrefslogtreecommitdiffstats
path: root/src/animator/SkScript.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/animator/SkScript.cpp')
-rw-r--r--src/animator/SkScript.cpp26
1 files changed, 10 insertions, 16 deletions
diff --git a/src/animator/SkScript.cpp b/src/animator/SkScript.cpp
index 96b73cd..aa06169 100644
--- a/src/animator/SkScript.cpp
+++ b/src/animator/SkScript.cpp
@@ -1,19 +1,11 @@
-/* libs/graphics/animator/SkScript.cpp
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
+
+/*
+ * Copyright 2006 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
#include "SkScript.h"
#include "SkMath.h"
@@ -192,6 +184,7 @@ SkScriptEngine::SkScriptEngine(SkOpType returnType) :
noInitialSuppress.fOperator = kUnassigned;
noInitialSuppress.fOpStackDepth = 0;
noInitialSuppress.fSuppress = false;
+ noInitialSuppress.fElse = 0;
fSuppressStack.push(noInitialSuppress);
*fOpStack.push() = kParen;
fTrackArray.appendClear();
@@ -1226,6 +1219,7 @@ flipSuppress:
suppress.fSuppress = true;
suppress.fOperator = match;
suppress.fOpStackDepth = fOpStack.count();
+ suppress.fElse = false;
fSuppressStack.push(suppress);
} else {
fTypeStack.pop();