aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-17 19:41:06 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-17 19:41:06 +0000
commitd202528f488a87ccff28732e0bea54dfd73bc854 (patch)
tree618304c41675a3fdbe90719494450e2df48dc242 /platform_tools
parentcd66af0ae02d185ad75afd6e9b9c061d1d28d483 (diff)
SkiaSampleRenderer - handle case where compiler won't cast jint to void*.
R=djsollen@google.com, scroggo@google.com Author: halcanary@google.com Review URL: https://codereview.chromium.org/239703016 git-svn-id: http://skia.googlecode.com/svn/trunk@14244 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
-rw-r--r--platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp b/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp
index 7ce43cc158..812648eb4f 100644
--- a/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp
+++ b/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp
@@ -272,7 +272,7 @@ JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_handleClick(JNIEnv* env,
SkDebugf("motion event ignored\n");
return;
}
- gWindow->handleClick(x, y, state, (void*) owner);
+ gWindow->handleClick(x, y, state, reinterpret_cast<void*>(owner));
}
JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_nextSample(