From 4b48ca9e29573c2914c90d2a633059f7ca7917ef Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Fri, 3 Jul 2009 18:08:10 +0000 Subject: [PATCH] 0.5.10 git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@993 6a642e6f-84f6-412e-ac94-c4a38d5a04b0 --- VERSION | 2 +- data/formats/fb2/FBReaderVersion.ent | 2 +- .../DeflatingDecompressor.cpp | 2 +- package_tool.sh | 5 +++- platform/android/AndroidManifest.xml | 4 ++-- platform/android/AndroidManifest.xml.pattern | 2 +- platform/android/icons/menu/ic_menu_night.png | Bin 2274 -> 2461 bytes platform/android/icons/tree/ic_list_buy.png | Bin 817 -> 880 bytes platform/android/icons/tree/ic_list_flag.png | Bin 756 -> 716 bytes .../formats/xhtml/XHTMLTagImageAction.java | 22 ++++++++++-------- 10 files changed, 22 insertions(+), 17 deletions(-) diff --git a/VERSION b/VERSION index 416bfb0a2..50c76ef87 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.9 +0.5.10 diff --git a/data/formats/fb2/FBReaderVersion.ent b/data/formats/fb2/FBReaderVersion.ent index a9ba8a8d0..7288a47ba 100644 --- a/data/formats/fb2/FBReaderVersion.ent +++ b/data/formats/fb2/FBReaderVersion.ent @@ -1 +1 @@ - + diff --git a/native/sources/DeflatingDecompressor/DeflatingDecompressor.cpp b/native/sources/DeflatingDecompressor/DeflatingDecompressor.cpp index 9e8ccaf3a..cac0632cd 100644 --- a/native/sources/DeflatingDecompressor/DeflatingDecompressor.cpp +++ b/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; } diff --git a/package_tool.sh b/package_tool.sh index b8028c831..a7509e039 100755 --- a/package_tool.sh +++ b/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 "" > data/formats/fb2/FBReaderVersion.ent sed "s/@INTVERSION@/$intversion/" platform/android/AndroidManifest.xml.pattern | sed "s/@VERSION@/$version/" > platform/android/AndroidManifest.xml } diff --git a/platform/android/AndroidManifest.xml b/platform/android/AndroidManifest.xml index e4616793a..0f5b07084 100644 --- a/platform/android/AndroidManifest.xml +++ b/platform/android/AndroidManifest.xml @@ -1,6 +1,6 @@ - - + + diff --git a/platform/android/AndroidManifest.xml.pattern b/platform/android/AndroidManifest.xml.pattern index aa33999b6..c1bb4dd02 100644 --- a/platform/android/AndroidManifest.xml.pattern +++ b/platform/android/AndroidManifest.xml.pattern @@ -1,6 +1,6 @@ - + diff --git a/platform/android/icons/menu/ic_menu_night.png b/platform/android/icons/menu/ic_menu_night.png index 1bbe767defd8636105886c4e29a5ff0e8de5df33..8fd2048d0896765cefefce5e94d5b06dcc410732 100644 GIT binary patch delta 2414 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 delta 695 zcmV;o0!aPL1@r}wNq?3}L_t(|+SFD}YZFlvJ#RA8$+Rh0KNf;m#GtfRcUBbXE_5da z(S=0{f*ThBMJRMtH=^LG3&DkZ7p`0=X#PN4h^^7Ieq|#FVxu&v>AabD$2XtpbcWO> zD0ty9Z<06XymRio^M*N&gTEaL{z0hWWVW!oSgSg>SyLJ46@S#p(fXkgHh1?$eZjqF zpCai76Sg3}uh5LSuk%DDLU85h$Z0piiGc zuU>Z~G34_n^ek2_RY};z;CRE9%Jl0+=vS}cSMdh43+JJpJrjY5@=I*oxd(dxAqLL+ z`;n3B?B^wkdIe6u5gkf)bPHig@u$Vuma3ML^Ngt7}c{m|nDhX$y zDqn$c1c>O5Nkk?Cz8y(hiNAX%YwS#kmy1p$a`!ygw0{Vc*iwmmHLF#$mX;vub?Es# za)m;=5)VT}cnK2sPac$=O+HDhR>SJl6k3%^49q3kKR1WLiHUZXTNZwnN)ZW9t1d1C z%)lBETpP>FXe=%!c5JS!U~OgwyCx^GZ+aR`=HlzZ0vhFVyV7VIB_dGb);izh?bi7A z?5Q`>B7c>{0}Sm7a$?DxbRy{#7Nzxx1hj~4=@W`o$&N_Un$eZV84K+4o6z>`qOM4I z8j0=o35!ZGw5?ku>8};nF0k0U%k2~Q_g?La4z2q+-5JpPK%Dn}ruX$>-Q>8|G+9iE zad1fVXZL2-YVu%`jny@QrXe>x4BGfE5_Sz