diff options
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_hardware_camera2_DngCreator.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_text_StaticLayout.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp index 5548476..2229071 100644 --- a/core/jni/android_hardware_camera2_DngCreator.cpp +++ b/core/jni/android_hardware_camera2_DngCreator.cpp @@ -1358,7 +1358,7 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt uint32_t dimensionLimit = 128; // Smallest image dimension crop margin from. if (imageWidth >= dimensionLimit && imageHeight >= dimensionLimit) { uint32_t defaultCropOrigin[] = {margin, margin}; - uint32_t defaultCropSize[] = {imageWidth - margin, imageHeight - margin}; + uint32_t defaultCropSize[] = {imageWidth - 2 * margin, imageHeight - 2 * margin}; BAIL_IF_INVALID(writer->addEntry(TAG_DEFAULTCROPORIGIN, 2, defaultCropOrigin, TIFF_IFD_0), env, TAG_DEFAULTCROPORIGIN, writer); BAIL_IF_INVALID(writer->addEntry(TAG_DEFAULTCROPSIZE, 2, defaultCropSize, diff --git a/core/jni/android_text_StaticLayout.cpp b/core/jni/android_text_StaticLayout.cpp index 5e73ef2..90e4bb6 100644 --- a/core/jni/android_text_StaticLayout.cpp +++ b/core/jni/android_text_StaticLayout.cpp @@ -48,10 +48,11 @@ struct JLineBreaksID { static jclass gLineBreaks_class; static JLineBreaksID gLineBreaks_fieldID; -// set text and set a number of parameters for creating a layout (width, tabstops, strategy) +// set text and set a number of parameters for creating a layout (width, tabstops, strategy, +// hyphenFrequency) static void nSetupParagraph(JNIEnv* env, jclass, jlong nativePtr, jcharArray text, jint length, jfloat firstWidth, jint firstWidthLineLimit, jfloat restWidth, - jintArray variableTabStops, jint defaultTabStop, jint strategy) { + jintArray variableTabStops, jint defaultTabStop, jint strategy, jint hyphenFrequency) { LineBreaker* b = reinterpret_cast<LineBreaker*>(nativePtr); b->resize(length); env->GetCharArrayRegion(text, 0, length, b->buffer()); @@ -64,6 +65,7 @@ static void nSetupParagraph(JNIEnv* env, jclass, jlong nativePtr, jcharArray tex b->setTabStops(stops.get(), stops.size(), defaultTabStop); } b->setStrategy(static_cast<BreakStrategy>(strategy)); + b->setHyphenationFrequency(static_cast<HyphenationFrequency>(hyphenFrequency)); } static void recycleCopy(JNIEnv* env, jobject recycle, jintArray recycleBreaks, @@ -177,7 +179,7 @@ static JNINativeMethod gMethods[] = { {"nFinishBuilder", "(J)V", (void*) nFinishBuilder}, {"nLoadHyphenator", "(Ljava/lang/String;)J", (void*) nLoadHyphenator}, {"nSetLocale", "(JLjava/lang/String;J)V", (void*) nSetLocale}, - {"nSetupParagraph", "(J[CIFIF[III)V", (void*) nSetupParagraph}, + {"nSetupParagraph", "(J[CIFIF[IIII)V", (void*) nSetupParagraph}, {"nSetIndents", "(J[I)V", (void*) nSetIndents}, {"nAddStyleRun", "(JJJIIZ)F", (void*) nAddStyleRun}, {"nAddMeasuredRun", "(JII[F)V", (void*) nAddMeasuredRun}, |