diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-04 01:26:19 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-04 01:26:19 +0000 |
| commit | 92f93264e760b74cc706d01b2d0fcfaa3d857f51 (patch) | |
| tree | 9c2510262763e22793e653c83918424e841c1c33 | |
| parent | f8a8ae1322e55d37b3b4b0e25d56f72ab2ee5c09 (diff) | |
fix size_t/int warnings
TBR=caryclark@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/265163003
git-svn-id: http://skia.googlecode.com/svn/trunk@14560 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/animator/SkAnimateSet.cpp | 2 | ||||
| -rw-r--r-- | src/animator/SkScript2.h | 5 | ||||
| -rw-r--r-- | src/animator/SkScriptTokenizer.cpp | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/animator/SkAnimateSet.cpp b/src/animator/SkAnimateSet.cpp index f153b16bbd..d146118e89 100644 --- a/src/animator/SkAnimateSet.cpp +++ b/src/animator/SkAnimateSet.cpp @@ -62,7 +62,7 @@ void SkSet::onEndElement(SkAnimateMaker& maker) { fReset = dur != 1; SkDisplayTypes outType = fFieldInfo->getType(); int comps = outType == SkType_String || outType == SkType_DynamicString ? 1 : - fFieldInfo->getSize((const SkDisplayable*) fTarget) / sizeof(int); + (int)fFieldInfo->getSize((const SkDisplayable*) fTarget) / sizeof(int); if (fValues.getType() == SkType_Unknown) { fValues.setType(outType); fValues.setCount(comps); diff --git a/src/animator/SkScript2.h b/src/animator/SkScript2.h index 33e2af7fee..d182e8c7c5 100644 --- a/src/animator/SkScript2.h +++ b/src/animator/SkScript2.h @@ -188,8 +188,9 @@ protected: Branch() { } - Branch(Op op, int depth, unsigned offset) : fOffset(offset), fOpStackDepth(depth), fOperator(op), - fPrimed(kIsNotPrimed), fDone(kIsNotDone) { + Branch(Op op, int depth, size_t offset) + : fOffset(SkToU16(offset)), fOpStackDepth(depth), fOperator(op) + , fPrimed(kIsNotPrimed), fDone(kIsNotDone) { } enum Primed { diff --git a/src/animator/SkScriptTokenizer.cpp b/src/animator/SkScriptTokenizer.cpp index 8fc5d802cb..03ffaa4a72 100644 --- a/src/animator/SkScriptTokenizer.cpp +++ b/src/animator/SkScriptTokenizer.cpp @@ -170,7 +170,7 @@ void SkScriptEngine2::addTokenScalar(SkScalar scalar) { } void SkScriptEngine2::addTokenString(const SkString& string) { - int size = string.size(); + int size = SkToInt(string.size()); addTokenInt(size); fActiveStream->write(string.c_str(), size); } @@ -1023,7 +1023,7 @@ void SkScriptEngine2::processLogicalOp(Op op) { branch.fOperator = op; branch.fDone = Branch::kIsNotDone; SkASSERT(branch.fOpStackDepth == fOpStack.count()); - branch.fOffset = newOffset; + branch.fOffset = SkToU16(newOffset); fAccumulatorType = SkOperand2::kNoType; } break; case kLogicalAnd: |