diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-11-21 16:48:11 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-11-21 17:16:23 +0000 |
| commit | 06fd5ad8a48b0339bb00ef531d84733fb05f19c6 (patch) | |
| tree | c469f480195141c7aa0cf0d4ddd27fc3e200c827 | |
| parent | ca19703811bd41bd2638d7d8678d1702aa56844f (diff) | |
| download | mupdf-06fd5ad8a48b0339bb00ef531d84733fb05f19c6.tar.xz | |
Android: Move draw_simple_scale.c back into Core.mk
By manually inserting a literal pool, we can avoid the need to
split draw_simple_scale.c out.
| -rw-r--r-- | android/jni/Core.mk | 1 | ||||
| -rw-r--r-- | android/jni/Core2.mk | 3 | ||||
| -rw-r--r-- | draw/draw_simple_scale.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/android/jni/Core.mk b/android/jni/Core.mk index a549640a..ac063f03 100644 --- a/android/jni/Core.mk +++ b/android/jni/Core.mk @@ -85,6 +85,7 @@ LOCAL_SRC_FILES := \ $(MY_ROOT)/draw/draw_mesh.c \ $(MY_ROOT)/draw/draw_paint.c \ $(MY_ROOT)/draw/draw_path.c \ + $(MY_ROOT)/draw/draw_simple_scale.c \ $(MY_ROOT)/draw/draw_unpack.c \ $(MY_ROOT)/pdf/pdf_annot.c \ $(MY_ROOT)/pdf/pdf_cmap.c \ diff --git a/android/jni/Core2.mk b/android/jni/Core2.mk index 96e01c29..2c91c6c0 100644 --- a/android/jni/Core2.mk +++ b/android/jni/Core2.mk @@ -35,8 +35,7 @@ endif LOCAL_MODULE := mupdfcore2 LOCAL_SRC_FILES := \ - $(MY_ROOT)/fitz/res_shade.c \ - $(MY_ROOT)/draw/draw_simple_scale.c + $(MY_ROOT)/fitz/res_shade.c LOCAL_LDLIBS := -lm -llog -ljnigraphics diff --git a/draw/draw_simple_scale.c b/draw/draw_simple_scale.c index 29050387..af995edc 100644 --- a/draw/draw_simple_scale.c +++ b/draw/draw_simple_scale.c @@ -850,6 +850,7 @@ scale_row_from_temp(unsigned char *dst, unsigned char *src, fz_weights *weights, "bgt 5b @ \n" "8: \n" "ldmfd r13!,{r4-r11,PC} @ pop, return to thumb \n" + ".ltorg \n" ENTER_THUMB ); } |