[Libreoffice-commits] core.git: sal/android touch/source

[Tor Lillqvist]

 sal/android/lo-bootstrap.c       |   87 ---------------------------------------
 touch/source/android/android.cxx |   20 --------
 2 files changed, 107 deletions(-)

New commits:
commit eda423d7bd792ef502efeb253048b25f356bc7d9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Dec 17 11:59:55 2014 +0200

    Bin code that became dead after 8ecf956d79878c9b24f5ddc51d6b723a76d334f5
    
    Change-Id: I310abed7e86f8b7153817be5ae03cc3c8fec3c50

diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index f7a381e..2d2f01a 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1082,93 +1082,6 @@ Java_org_libreoffice_android_Bootstrap_redirect_1stdio(JNIEnv* env,
 }
 
 __attribute__ ((visibility("default")))
-void
-Java_org_libreoffice_android_Bootstrap_twiddle_1BGR_1to_1RGBA(JNIEnv* env,
-                                                              jobject clazz,
-                                                              jbyteArray source,
-                                                              jint offset,
-                                                              jint width,
-                                                              jint height,
-                                                              jobject destination)
-{
-    jbyte *dst = (jbyte*) (*env)->GetDirectBufferAddress(env, destination);
-    void *a = (*env)->GetPrimitiveArrayCritical(env, source, NULL);
-    jbyte *src = ((jbyte *) a) + offset;
-
-    jbyte *srcp;
-    jbyte *dstp = dst;
-    int step = ((((width * 3) - 1) / 4) + 1) * 4;
-
-    int i, j;
-
-    (void) clazz;
-
-    if (height > 0) {
-        srcp = src + step * (height - 1);
-        step = -step;
-    } else {
-        srcp = src;
-    }
-
-    LOGI("twiddle: src=%p, srcp=%p, dstp=%p, step=%d", src, srcp, dstp, step);
-
-    for (i = 0; i < height; i++) {
-        for (j = 0; j < width; j++) {
-            *dstp++ = srcp[j*3+2];
-            *dstp++ = srcp[j*3+1];
-            *dstp++ = srcp[j*3+0];
-            *dstp++ = 0xFF;
-        }
-        srcp += step;
-    }
-
-    (*env)->ReleasePrimitiveArrayCritical(env, source, a, 0);
-}
-
-__attribute__ ((visibility("default")))
-void
-Java_org_libreoffice_android_Bootstrap_force_1full_1alpha_1array(JNIEnv* env,
-                                                                 jobject clazz,
-                                                                 jbyteArray array,
-                                                                 jint offset,
-                                                                 jint length)
-{
-    void *a = (*env)->GetPrimitiveArrayCritical(env, array, NULL);
-    jbyte *p = ((jbyte *) a) + offset;
-
-    int i;
-
-    (void) clazz;
-
-    for (i = 0; i < length; i += 4) {
-        p[3] = 0xFF;
-        p += 4;
-    }
-
-    (*env)->ReleasePrimitiveArrayCritical(env, array, a, 0);
-}
-
-__attribute__ ((visibility("default")))
-void
-Java_org_libreoffice_android_Bootstrap_force_1full_1alpha_1bb(JNIEnv* env,
-                                                              jobject clazz,
-                                                              jobject buffer,
-                                                              jint offset,
-                                                              jint length)
-{
-    jbyte *p = (*env)->GetDirectBufferAddress(env, buffer) + offset;
-
-    int i;
-
-    (void) clazz;
-
-    for (i = 0; i < length; i += 4) {
-        p[3] = 0xFF;
-        p += 4;
-    }
-}
-
-__attribute__ ((visibility("default")))
 jlong
 Java_org_libreoffice_android_Bootstrap_address_1of_1direct_1byte_1buffer(JNIEnv *env,
                                                                          jobject bbuffer)
diff --git a/touch/source/android/android.cxx b/touch/source/android/android.cxx
index f9c8542..bb86f0b 100644
--- a/touch/source/android/android.cxx
+++ b/touch/source/android/android.cxx
@@ -47,24 +47,4 @@ void ByteBufferWrapper::operator()(sal_uInt8 * /* p */)
     get_env()->DeleteGlobalRef(object);
 }
 
-extern "C"
-__attribute__ ((visibility("default")))
-jlong
-Java_org_libreoffice_android_Bootstrap_new_1byte_1buffer_1wrapper(JNIEnv *env,
-                                                                  jobject /* clazz */,
-                                                                  jobject bytebuffer)
-{
-  return (jlong) (intptr_t) new ByteBufferWrapper(env, bytebuffer);
-}
-
-extern "C"
-__attribute__ ((visibility("default")))
-void
-Java_org_libreoffice_android_Bootstrap_delete_1byte_1buffer_1wrapper(JNIEnv * /* env */,
-                                                                     jobject /* clazz */,
-                                                                     jlong bbw)
-{
-  delete (ByteBufferWrapper*) (intptr_t) bbw;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */