aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-11 20:33:45 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-11 20:33:45 +0000
commite3613cefe2bc8a947068bcd2a9907a00507ffb01 (patch)
tree44b3b0ac4739f73db0b91045ecc6a5425877bd26
parentadef4fefd3d445e72ff915602293f8260e15f84a (diff)
Fix sign/unsigned warnings in benchmain.cpp and gmmain.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@8079 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--bench/benchmain.cpp4
-rw-r--r--gm/gmmain.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 9c7b442c9b..f90d9639e7 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -363,7 +363,7 @@ int tool_main(int argc, char** argv) {
#if SK_SUPPORT_GPU
struct {
- size_t fBytes;
+ int fBytes;
int fCount;
} gpuCacheSize = { -1, -1 }; // -1s mean use the default
#endif
@@ -659,7 +659,7 @@ int tool_main(int argc, char** argv) {
int count;
context->getTextureCacheLimits(&count, &bytes);
if (-1 != gpuCacheSize.fBytes) {
- bytes = gpuCacheSize.fBytes;
+ bytes = static_cast<size_t>(gpuCacheSize.fBytes);
}
if (-1 != gpuCacheSize.fCount) {
count = gpuCacheSize.fCount;
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 160a983c34..0dbf04465d 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1181,7 +1181,7 @@ int tool_main(int argc, char** argv) {
#if SK_SUPPORT_GPU
struct {
- size_t fBytes;
+ int fBytes;
int fCount;
} gpuCacheSize = { -1, -1 }; // -1s mean use the default
#endif
@@ -1523,7 +1523,7 @@ int tool_main(int argc, char** argv) {
int count;
gr->getTextureCacheLimits(&count, &bytes);
if (-1 != gpuCacheSize.fBytes) {
- bytes = gpuCacheSize.fBytes;
+ bytes = static_cast<size_t>(gpuCacheSize.fBytes);
}
if (-1 != gpuCacheSize.fCount) {
count = gpuCacheSize.fCount;