yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 09:49:19 +02:00
Code Issues Releases Wiki Activity

ZLFileImage constructor signature changed

Browse source
This commit is contained in:
Nikolay Pultsin 2014-07-13 13:42:27 +01:00
parent f59c9139ed
commit 848cb4d963
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
jni/NativeFormats/util/AndroidUtil.cpp
View file

@ -183,7 +183,7 @@ bool AndroidUtil::init(JavaVM* jvm) {
Constructor_FileInfo = new Constructor(Class_FileInfo, "(Ljava/lang/String;Lorg/geometerplus/zlibrary/core/drm/FileEncryptionInfo;)V"); Constructor_FileInfo = new Constructor(Class_FileInfo, "(Ljava/lang/String;Lorg/geometerplus/zlibrary/core/drm/FileEncryptionInfo;)V");
Constructor_FileEncryptionInfo = new Constructor(Class_FileEncryptionInfo, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); Constructor_FileEncryptionInfo = new Constructor(Class_FileEncryptionInfo, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
Constructor_ZLFileImage = new Constructor(Class_ZLFileImage, "(Ljava/lang/String;Lorg/geometerplus/zlibrary/core/filesystem/ZLFile;Ljava/lang/String;[I[ILorg/geometerplus/zlibrary/core/drm/FileEncryptionInfo;)V"); Constructor_ZLFileImage = new Constructor(Class_ZLFileImage, "(Lorg/geometerplus/zlibrary/core/filesystem/ZLFile;Ljava/lang/String;[I[ILorg/geometerplus/zlibrary/core/drm/FileEncryptionInfo;)V");
StaticMethod_Paths_tempDirectory = new StaticObjectMethod(Class_Paths, "tempDirectory", Class_java_lang_String, "()"); StaticMethod_Paths_tempDirectory = new StaticObjectMethod(Class_Paths, "tempDirectory", Class_java_lang_String, "()");
@ -234,7 +234,6 @@ jobject AndroidUtil::createJavaEncryptionInfo(JNIEnv *env, shared_ptr<FileEncryp
} }
jobject AndroidUtil::createJavaImage(JNIEnv *env, const ZLFileImage &image) { jobject AndroidUtil::createJavaImage(JNIEnv *env, const ZLFileImage &image) {
JString javaMimeType(env, image.mimeType());
jobject javaFile = createJavaFile(env, image.file().path()); jobject javaFile = createJavaFile(env, image.file().path());
JString javaEncoding(env, image.encoding()); JString javaEncoding(env, image.encoding());
@ -250,7 +249,7 @@ jobject AndroidUtil::createJavaImage(JNIEnv *env, const ZLFileImage &image) {
jobject javaEncryptionInfo = createJavaEncryptionInfo(env, image.encryptionInfo()); jobject javaEncryptionInfo = createJavaEncryptionInfo(env, image.encryptionInfo());
jobject javaImage = Constructor_ZLFileImage->call( jobject javaImage = Constructor_ZLFileImage->call(
javaMimeType.j(), javaFile, javaEncoding.j(), javaFile, javaEncoding.j(),
javaOffsets, javaSizes, javaEncryptionInfo javaOffsets, javaSizes, javaEncryptionInfo
); );