summaryrefslogtreecommitdiffstats
path: root/core/jni/android_graphics_Canvas.cpp
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-12 08:03:48 -0800
committerAndreas Gampe <agampe@google.com>2014-11-13 15:20:37 -0800
commit0f0b4919667f418b249c497f5ad3e83fdf4437e5 (patch)
tree3a583c918c72b7d8d48b784505502f7b3fdf05e9 /core/jni/android_graphics_Canvas.cpp
parent537888be7d5cfa6bfa9ddd459a622ea208339735 (diff)
downloadframeworks_base-0f0b4919667f418b249c497f5ad3e83fdf4437e5.zip
frameworks_base-0f0b4919667f418b249c497f5ad3e83fdf4437e5.tar.gz
frameworks_base-0f0b4919667f418b249c497f5ad3e83fdf4437e5.tar.bz2
Frameworks/base: Wall Werror in core/jni
Turn on -Wall -Werror in core/jni. Fix warnings. Clang TODO: For GCC we need to turn off Wunused-but-set-variable in the GL bindings. However, Clang doesn't have that warning and thus complains about an unknown pragma. It is necessary to make the pragma #ifdef-ed on the compiler being GCC. Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
Diffstat (limited to 'core/jni/android_graphics_Canvas.cpp')
-rw-r--r--core/jni/android_graphics_Canvas.cpp36
1 files changed, 0 insertions, 36 deletions
diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp
index 96607d2..507c165 100644
--- a/core/jni/android_graphics_Canvas.cpp
+++ b/core/jni/android_graphics_Canvas.cpp
@@ -556,42 +556,6 @@ static void drawTextRunString(JNIEnv* env, jobject obj, jlong canvasHandle, jstr
env->ReleaseStringChars(text, jchars);
}
-static void drawPosTextChars(JNIEnv* env, jobject, jlong canvasHandle, jcharArray text,
- jint index, jint count, jfloatArray pos, jlong paintHandle) {
- Paint* paint = reinterpret_cast<Paint*>(paintHandle);
- jchar* jchars = text ? env->GetCharArrayElements(text, NULL) : NULL;
- float* posArray = pos ? env->GetFloatArrayElements(pos, NULL) : NULL;
- int posCount = pos ? env->GetArrayLength(pos) >> 1: 0;
-
- get_canvas(canvasHandle)->drawPosText(jchars + index, posArray, count << 1, posCount, *paint);
-
- if (text) {
- env->ReleaseCharArrayElements(text, jchars, 0);
- }
- if (pos) {
- env->ReleaseFloatArrayElements(pos, posArray, 0);
- }
-}
-
-
-static void drawPosTextString(JNIEnv* env, jobject, jlong canvasHandle, jstring text,
- jfloatArray pos, jlong paintHandle) {
- Paint* paint = reinterpret_cast<Paint*>(paintHandle);
- const jchar* jchars = text ? env->GetStringChars(text, NULL) : NULL;
- int byteLength = text ? env->GetStringLength(text) : 0;
- float* posArray = pos ? env->GetFloatArrayElements(pos, NULL) : NULL;
- int posCount = pos ? env->GetArrayLength(pos) >> 1: 0;
-
- get_canvas(canvasHandle)->drawPosText(jchars , posArray, byteLength << 1, posCount, *paint);
-
- if (text) {
- env->ReleaseStringChars(text, jchars);
- }
- if (pos) {
- env->ReleaseFloatArrayElements(pos, posArray, 0);
- }
-}
-
class DrawTextOnPathFunctor {
public:
DrawTextOnPathFunctor(const Layout& layout, Canvas* canvas, float hOffset,