0.5.10

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@993 6a642e6f-84f6-412e-ac94-c4a38d5a04b0

VERSION

@@ -1 +1 @@
-0.5.9
+0.5.10

data/formats/fb2/FBReaderVersion.ent

@@ -1 +1 @@
-<!ENTITY FBReaderVersion   "0.5.9">
+<!ENTITY FBReaderVersion   "0.5.10">

native/sources/DeflatingDecompressor/DeflatingDecompressor.cpp

@@ -63,7 +63,7 @@ jint Java_org_amse_ys_zip_NativeDeflatingDecompressor_inflate(JNIEnv *env, jobje
 	stream->avail_out = outLength;
 	const int code = inflate(stream, Z_SYNC_FLUSH);
 	env->ReleaseByteArrayElements(in, inStart, 0);
-	env->ReleaseByteArrayElements(out, outStart, 0);
+	env->ReleaseByteArrayElements(out, outStart, outLength - stream->avail_out);
 	if ((code == Z_OK) || (code == Z_STREAM_END)) {
 		return ((inLength - stream->avail_in) << 16) + outLength - stream->avail_out;
 	}

package_tool.sh

@@ -13,7 +13,10 @@ if [ $# -ne 1 -a $# -ne 2 ]; then
 fi
 
 updateVersion() {
-	intversion=`echo $version | sed "s/\\./0/g" | sed -E "s/^0+//"`
+	major=`echo $version | cut -d . -f 1`
+	minor=`echo $version | cut -d . -f 2`
+	micro=`echo $version | cut -d . -f 3`
+	let intversion=10000*$major+100*$minor+$micro
 	echo "<!ENTITY FBReaderVersion   \"$version\">" > data/formats/fb2/FBReaderVersion.ent
 	sed "s/@INTVERSION@/$intversion/" platform/android/AndroidManifest.xml.pattern | sed "s/@VERSION@/$version/" > platform/android/AndroidManifest.xml
 }

platform/android/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="509" android:versionName="0.5.9">
-	<uses-sdk android:minSdkVersion="3"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="510" android:versionName="0.5.10">
+	<uses-sdk android:minSdkVersion="1"/>
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader">

platform/android/AndroidManifest.xml.pattern

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="@INTVERSION@" android:versionName="@VERSION@">
-	<uses-sdk android:minSdkVersion="3"/>
+	<uses-sdk android:minSdkVersion="1"/>
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader">

src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagImageAction.java

@@ -35,15 +35,16 @@ class XHTMLTagImageAction extends XHTMLTagAction {
 	protected void doAtStart(XHTMLReader reader, ZLStringMap xmlattributes) {
 		String fileName = xmlattributes.getValue(myNameAttribute);
 		if (fileName != null) {
+			if (fileName.startsWith("./")) {
+				fileName = fileName.substring(2);
+			}
+			final ZLFile imageFile = ZLFile.createFileByPath(reader.getPathPrefix() + fileName);
+			if (imageFile != null) {
 				final BookReader modelReader = reader.getModelReader();
 				boolean flag = modelReader.paragraphIsOpen();
 				if (flag) {
 					modelReader.endParagraph();
 				}
-			if (fileName.startsWith("./")) {
-				fileName = fileName.substring(2);
-			}
-			final ZLFile imageFile = ZLFile.createFileByPath(reader.getPathPrefix() + fileName);
 				final String imageName = imageFile.getName(false);
 				modelReader.addImageReference(imageName, (short)0);
 				modelReader.addImage(imageName, new ZLFileImage("image/auto", imageFile));
@@ -52,6 +53,7 @@ class XHTMLTagImageAction extends XHTMLTagAction {
 				}
 			}
 		}
+	}
 
 	protected void doAtEnd(XHTMLReader reader) {
 	}