Merge remote-tracking branch 'upstream/master'

Author: plotn

android/AndroidManifest.xml

@@ -4,7 +4,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.coolreader"
       android:installLocation="auto"
-      android:versionName="3.2.6-1" android:versionCode="2061">
+      android:versionName="3.2.7-1" android:versionCode="2071">
     <supports-screens
         android:xlargeScreens="true"
         android:largeScreens="true"

android/app/build.gradle

@@ -8,8 +8,8 @@ android {
         targetSdkVersion 26
         // When new version released, version code must be incremented at least by 8
         // for compatibility with ABI versioning of split apk (see below).
-        versionCode 2061
-        versionName "3.2.6-1"
+        versionCode 2071
+        versionName "3.2.7-1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -68,6 +68,15 @@ android {
                     arguments "-DCMAKE_BUILD_TYPE=Debug"
                 }
             }
+            packagingOptions{
+                doNotStrip "*/armeabi/*.so"
+                doNotStrip "*/armeabi-v7a/*.so"
+                doNotStrip "*/arm64-v8a/*.so"
+                doNotStrip "*/x86/*.so"
+                doNotStrip "*/x86_64/*.so"
+                doNotStrip "*/mips/*.so"
+                doNotStrip "*/mips64/*.so"
+            }
         }
     }
     gradle.projectsEvaluated {

android/src/org/coolreader/crengine/BaseActivity.java

@@ -191,7 +191,7 @@ protected void onCreate(Bundle savedInstanceState)
 		setScreenBacklightDuration(props.getInt(ReaderView.PROP_APP_SCREEN_BACKLIGHT_LOCK, 3));
 
 		setFullscreen( props.getBool(ReaderView.PROP_APP_FULLSCREEN, DeviceInfo.EINK_SCREEN));
-		int orientation = props.getInt(ReaderView.PROP_APP_SCREEN_ORIENTATION, 5); //(DeviceInfo.EINK_SCREEN?0:4)
+		int orientation = props.getInt(ReaderView.PROP_APP_SCREEN_ORIENTATION, 0); //(DeviceInfo.EINK_SCREEN?0:4)
 		if (orientation < 0 || orientation > 5)
 			orientation = 5;
 		setScreenOrientation(orientation);
@@ -1725,7 +1725,7 @@ public Properties loadSettings(BaseActivity activity, File file) {
 			props.applyDefault(ReaderView.PROP_APP_GESTURE_PAGE_FLIPPING, "1");
 			props.applyDefault(ReaderView.PROP_APP_SHOW_COVERPAGES, "1");
 			props.applyDefault(ReaderView.PROP_APP_COVERPAGE_SIZE, "1");
-			props.applyDefault(ReaderView.PROP_APP_SCREEN_ORIENTATION, DeviceInfo.EINK_SCREEN ? "0" : "4"); // "0"
+			props.applyDefault(ReaderView.PROP_APP_SCREEN_ORIENTATION, "0"); // "0"
 			props.applyDefault(ReaderView.PROP_CONTROLS_ENABLE_VOLUME_KEYS, "1");
 			props.applyDefault(ReaderView.PROP_APP_TAP_ZONE_HILIGHT, "0");
 			props.applyDefault(ReaderView.PROP_APP_BOOK_SORT_ORDER, FileInfo.DEF_SORT_ORDER.name());

crengine/include/crsetup.h

@@ -64,7 +64,12 @@
 #ifndef LDOM_USE_OWN_MEM_MAN
 #define LDOM_USE_OWN_MEM_MAN                 1
 #endif
+#ifdef ANDROID
+#define CR_USE_THREADS                       1
+#define USE_ATOMIC_REFCOUNT
+#else
 #define CR_USE_THREADS                       0
+#endif // ANDROID
 #define USE_LIBJPEG                          1
 #define USE_LIBPNG                           1
 #define USE_GIF                              1

crengine/include/lvstring.h

@@ -26,6 +26,9 @@
 #define UNICODE_HYPHEN   0x2010
 #define UNICODE_NB_HYPHEN   0x2011
 
+#ifdef USE_ATOMIC_REFCOUNT
+#include <atomic>
+#endif
 
 
 /// strlen for lChar16
@@ -111,13 +114,20 @@ struct lstring8_chunk_t {
     friend class lString16;
     friend struct lstring_chunk_slice_t;
 public:
-    lstring8_chunk_t(lChar8 * _buf8) : buf8(_buf8), size(1), len(0), nref(1) {}
+    lstring8_chunk_t(lChar8 * _buf8) : buf8(_buf8), size(1), len(0)
+    {
+        refCount = 1;
+    }
     const lChar8 * data8() const { return buf8; }
 private:
     lChar8  * buf8; // z-string
     lInt32 size;   // 0 for free chunk
     lInt32 len;    // count of chars in string
-    int nref;      // reference counter
+#ifdef USE_ATOMIC_REFCOUNT
+    std::atomic_int refCount; // atomic reference counter
+#else
+    int refCount;      // reference counter
+#endif
 
     lstring8_chunk_t() {}
 
@@ -132,13 +142,20 @@ struct lstring16_chunk_t {
     friend class lString16;
     friend struct lstring_chunk_slice_t;
 public:
-    lstring16_chunk_t(lChar16 * _buf16) : buf16(_buf16), size(1), len(0), nref(1) {}
+    lstring16_chunk_t(lChar16 * _buf16) : buf16(_buf16), size(1), len(0)
+    {
+        refCount = 1;
+    }
     const lChar16 * data16() const { return buf16; }
 private:
     lChar16 * buf16; // z-string
     lInt32 size;   // 0 for free chunk
     lInt32 len;    // count of chars in string
-    int nref;      // reference counter
+#ifdef USE_ATOMIC_REFCOUNT
+    std::atomic_int refCount; // atomic reference counter
+#else
+    int refCount;      // reference counter
+#endif
 
     lstring16_chunk_t() {}
 
@@ -164,6 +181,7 @@ namespace fmt {
     };
 }
 
+
 /**
     \brief lChar8 string
 
@@ -206,8 +224,24 @@ class lString8
     static lstring_chunk_t * EMPTY_STR_8;
     void alloc(size_type sz);
     void free();
-    inline void addref() const { ++pchunk->nref; }
-    inline void release() { if (--pchunk->nref==0) free(); }
+    inline void addref() const {
+#ifdef USE_ATOMIC_REFCOUNT
+        pchunk->refCount.fetch_add(1);
+#else
+        ++pchunk->refCount;
+#endif
+    }
+    inline void release() { 
+#ifdef USE_ATOMIC_REFCOUNT
+        if (pchunk->refCount.fetch_sub(1) <= 1)
+            free();
+#else
+        if (--pchunk->refCount==0) free();
+#endif
+    }
+    inline int refCount() {
+        return pchunk->refCount;
+    }
     explicit lString8(lstring_chunk_t * chunk) : pchunk(chunk) { addref(); }
 public:
     /// default constrictor
@@ -350,7 +384,7 @@ class lString8
     /// ensures that reference count is 1
     void  lock( size_type newsize );
     /// returns pointer to modifable string buffer
-    value_type * modify() { if (pchunk->nref>1) lock(pchunk->len); return pchunk->buf8; }
+    value_type * modify() { if (refCount()>1) lock(pchunk->len); return pchunk->buf8; }
     /// clear string
     void  clear() { release(); pchunk = EMPTY_STR_8; addref(); }
     /// clear string, set buffer size
@@ -441,8 +475,24 @@ class lString16
     static lstring_chunk_t * EMPTY_STR_16;
     void alloc(size_type sz);
     void free();
-    inline void addref() const { ++pchunk->nref; }
-    inline void release() { if (--pchunk->nref==0) free(); }
+    inline void addref() const {
+#ifdef USE_ATOMIC_REFCOUNT
+        pchunk->refCount.fetch_add(1);
+#else
+        ++pchunk->refCount;
+#endif
+    }
+    inline void release() { 
+#ifdef USE_ATOMIC_REFCOUNT
+        if (pchunk->refCount.fetch_sub(1) <= 1)
+            free();
+#else
+        if (--pchunk->refCount==0) free();
+#endif
+    }
+    inline int refCount() {
+        return pchunk->refCount;
+    }
 public:
     explicit lString16(lstring_chunk_t * chunk) : pchunk(chunk) { addref(); }
     /// empty string constructor
@@ -606,7 +656,7 @@ class lString16
     /// resizes string, copies if several references exist
     void  lock( size_type newsize );
     /// returns writable pointer to string buffer
-    value_type * modify() { if (pchunk->nref>1) lock(pchunk->len); return pchunk->buf16; }
+    value_type * modify() { if (refCount()>1) lock(pchunk->len); return pchunk->buf16; }
     /// clears string contents
     void  clear() { release(); pchunk = EMPTY_STR_16; addref(); }
     /// resets string, allocates space for specified amount of characters

crengine/src/lvdocview.cpp

@@ -1613,13 +1613,13 @@ int LVDocView::getPosEndPagePercent() {
         else
             return 0;
     } else {
-        int fh = m_pages.length();
-        if (fh > 0) {
+        int pc = m_pages.length();
+        if (pc > 0) {
             int p = getCurPage() + 1;// + 1;
             if (getVisiblePageCount() > 1)
                 p++;
-            if (p > fh - 1)
-                p = fh - 1;
+            if (p > pc - 1)
+                p = pc - 1;
             if (p < 0)
                 p = 0;
             p = m_pages[p]->start - 10;
@@ -2581,16 +2581,18 @@ LVRef<ldomXRange> LVDocView::getPageDocumentRange(int pageIndex) {
 		// PAGES mode
 		if (pageIndex < 0 || pageIndex >= m_pages.length())
 			pageIndex = getCurPage();
-		LVRendPageInfo * page = m_pages[pageIndex];
-		if (page->type != PAGE_TYPE_NORMAL)
-			return res;
-		ldomXPointer start = m_doc->createXPointer(lvPoint(0, page->start));
-		//ldomXPointer end = m_doc->createXPointer( lvPoint( m_dx+m_dy, page->start + page->height - 1 ) );
-		ldomXPointer end = m_doc->createXPointer(lvPoint(0, page->start
-                                + page->height), 1);
-		if (start.isNull() || end.isNull())
-			return res;
-		res = LVRef<ldomXRange> (new ldomXRange(start, end));
+		if (pageIndex >= 0 && pageIndex < m_pages.length()) {
+			LVRendPageInfo *page = m_pages[pageIndex];
+			if (page->type != PAGE_TYPE_NORMAL)
+				return res;
+			ldomXPointer start = m_doc->createXPointer(lvPoint(0, page->start));
+			//ldomXPointer end = m_doc->createXPointer( lvPoint( m_dx+m_dy, page->start + page->height - 1 ) );
+			ldomXPointer end = m_doc->createXPointer(lvPoint(0, page->start
+															+ page->height), 1);
+			if (start.isNull() || end.isNull())
+				return res;
+			res = LVRef<ldomXRange>(new ldomXRange(start, end));
+		}
 	}
 	return res;
 }
@@ -2630,7 +2632,8 @@ int LVDocView::getCurrentPageImageCount()
 
     };
     ImageCounter cnt;
-    range->forEach(&cnt);
+    if (!range.isNull())
+        range->forEach(&cnt);
     return cnt.get();
 }
 
@@ -2640,7 +2643,8 @@ lString16 LVDocView::getPageText(bool, int pageIndex) {
     CHECK_RENDER("getPageText()")
 	lString16 txt;
 	LVRef < ldomXRange > range = getPageDocumentRange(pageIndex);
-	txt = range->getRangeText();
+	if (!range.isNull())
+		txt = range->getRangeText();
 	return txt;
 }
 
@@ -4642,10 +4646,11 @@ ldomXPointer LVDocView::getCurrentPageMiddleParagraph() {
 		int pageIndex = getCurPage();
 		if (pageIndex < 0 || pageIndex >= m_pages.length())
 			pageIndex = getCurPage();
-		LVRendPageInfo * page = m_pages[pageIndex];
-		if (page->type == PAGE_TYPE_NORMAL)
-			ptr = m_doc->createXPointer(lvPoint(0, page->start + page->height
-					/ 2));
+		if (pageIndex >= 0 && pageIndex < m_pages.length()) {
+			LVRendPageInfo *page = m_pages[pageIndex];
+			if (page->type == PAGE_TYPE_NORMAL)
+				ptr = m_doc->createXPointer(lvPoint(0, page->start + page->height / 2));
+		}
 	}
 	if (ptr.isNull())
 		return ptr;
@@ -5568,6 +5573,10 @@ int LVDocView::onSelectionCommand( int cmd, int param )
 {
     CHECK_RENDER("onSelectionCommand()")
     LVRef<ldomXRange> pageRange = getPageDocumentRange();
+    if (pageRange.isNull()) {
+        clearSelection();
+        return 0;
+    }
     ldomXPointerEx pos( getBookmark() );
     ldomXRangeList & sel = getDocument()->getSelections();
     ldomXRange currSel;