aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-06-28 12:02:58 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-06-28 12:02:58 +0000
commit13649ce32f41774a49760e50083c13c349cb0b5c (patch)
tree6c86e9771930cb7e6afb02a1f2c9d3de4fae8671 /src/core
parent33114e0e59ef1bb9c37297a147d98aa325cabaf9 (diff)
fix sign/unsigned warnings
git-svn-id: http://skia.googlecode.com/svn/trunk@1733 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkFlattenable.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkFlattenable.cpp b/src/core/SkFlattenable.cpp
index 9222759ce3..cb0eaab41f 100644
--- a/src/core/SkFlattenable.cpp
+++ b/src/core/SkFlattenable.cpp
@@ -112,7 +112,7 @@ SkFlattenable* SkFlattenableReadBuffer::readFlattenable() {
}
index = -index; // we stored the negative of the index
index -= 1; // we stored the index-base-1
- SkASSERT(index < (unsigned)fFactoryCount);
+ SkASSERT(index < fFactoryCount);
factory = fFactoryArray[index];
} else if (fFactoryTDArray) {
const int32_t* peek = (const int32_t*)this->peek();
@@ -274,7 +274,7 @@ void SkFlattenableWriteBuffer::writeFlattenable(SkFlattenable* flattenable) {
} else {
// we write the negative of the index, to distinguish it from
// the length of a string
- this->write32(-fFactorySet->add(factory));
+ this->write32(-(int)fFactorySet->add(factory));
}
} else {
this->writeFunctionPtr((void*)factory);