Merged with KOReader fork of crengine

.gitignore

@@ -1,4 +1,6 @@
 *.*~
+.DS_*
+._*
 qtbuild
 v3build
 v5build
@@ -8,3 +10,14 @@ qt-build
 qtcreator-build
 CMakeLists.txt.user
 *~
+*.a
+*.so
+cr3gui/data/desktop/
+cr3gui/data/devices/
+cr3gui/data/manual/
+cr3gui/data/cr3.css
+cr3gui/data/cr3.ini
+cr3gui/data/dict/
+cr3gui/data/dict_ext
+cr3gui/data/tessdata/
+

CMakeLists.txt

@@ -148,6 +148,14 @@ else()
   SET(USE_UNRAR 0)
 endif(DEFINED USE_UNRAR)
 
+find_path(NANOSVG_INCLUDE_DIR nanosvg.h)
+if (NOT NANOSVG_FOUND)
+SET(NANOSVG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/nanosvg/src)
+endif(NOT NANOSVG_FOUND)
+
+ADD_DEFINITIONS(-DUSE_NANOSVG=1)
+INCLUDE_DIRECTORIES(${NANOSVG_INCLUDE_DIR})
+
 if (MAC)
   message("will use zlib, libpng, libjpeg, freetype from Qt static library")
   SET(ZLIB_INCLUDE_DIR ${QT_3RDPARTY_DIR}/zlib)
@@ -213,6 +221,8 @@ FIND_PACKAGE(Freetype)
 FIND_PACKAGE(HarfBuzz)
 endif (NOT MSVC AND NOT CR3_FREETYPE)
 
+ADD_SUBDIRECTORY(thirdparty/qimagescale)
+
 if (NOT FREETYPE_FOUND)
   message("System FREETYPE not found, will build local one\n")
   if (NOT HarfBuzz_FOUND)
@@ -229,7 +239,7 @@ if (NOT HarfBuzz_FOUND)
   SET(HB_HAVE_FREETYPE ON CACHE BOOL "Enable freetype interop helpers" FORCE)
   SET(HB_BUILD_TESTS OFF CACHE BOOL "Build harfbuzz tests" FORCE)
   ADD_SUBDIRECTORY(thirdparty/harfbuzz)
-  SET(HARFBUZZ_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/harfbuzz/src)
+  SET(HARFBUZZ_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/harfbuzz/src)
   SET(HARFBUZZ_LIBRARY harfbuzz)
 endif (NOT HarfBuzz_FOUND)
 
@@ -272,7 +282,7 @@ INCLUDE_DIRECTORIES(
   ${JPEG_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
   ${FREETYPE_INCLUDE_DIRS}
-  ${HARFBUZZ_INCLUDE_DIR}
+  ${HARFBUZZ_INCLUDE_DIRS}
   ${ANTIWORD_INCLUDE_DIR}
   ${CHM_INCLUDE_DIR}
 )
@@ -291,6 +301,7 @@ SET(STD_LIBS
   ${CHM_LIBRARIES}
   ${ZLIB_LIBRARIES}
   ${ANTIWORD_LIBRARIES}
+  qimagescale
 )
 if (FONTCONFIG_FOUND)
 	set(STD_LIBS ${STD_LIBS} ${FONTCONFIG_LIBRARIES})

android/app/CMakeLists.txt

@@ -18,6 +18,7 @@ include_directories(${CR3_ROOT}/thirdparty/harfbuzz/src)
 include_directories(${CR3_ROOT}/thirdparty/libjpeg)
 include_directories(${CR3_ROOT}/thirdparty/antiword)
 include_directories(${CR3_ROOT}/thirdparty/chmlib/src)
+include_directories(${CR3_ROOT}/thirdparty/nanosvg/src)
 
 add_definitions(-DLINUX=1 -D_LINUX=1 -DFOR_ANDROID=1 -DCR3_PATCH)
 add_definitions(-DFT_CONFIG_MODULES_H=<builds/android/include/config/ftmodule.h> -DFT_CONFIG_OPTIONS_H=<builds/android/include/config/ftoption.h>)
@@ -26,6 +27,7 @@ add_definitions(-DENABLE_CACHE_FILE_CONTENTS_VALIDATION=1)
 add_definitions(-DLDOM_USE_OWN_MEM_MAN=0)
 add_definitions(-DCR3_ANTIWORD_PATCH=1 -DENABLE_ANTIWORD=1)
 add_definitions(-DMAX_IMAGE_SCALE_MUL=2)
+add_definitions(-DUSE_NANOSVG=1)
 
 #set(LOCAL_CFLAGS "-Wno-psabi -Wno-unused-variable -Wno-sign-compare -Wno-write-strings -Wno-main -Wno-unused-but-set-variable -Wno-unused-function -Wall")
 # Option '-Wl,--no-merge-exidx-entries' removed as incompatible with clang.
@@ -84,6 +86,7 @@ set(CRENGINE_SRC_FILES
     ${CR3_ROOT}/crengine/src/wolutil.cpp
     ${CR3_ROOT}/crengine/src/crconcurrent.cpp
     ${CR3_ROOT}/crengine/src/hist.cpp
+    ${CR3_ROOT}/crengine/src/xxhash.c
     ${CR3_ROOT}/crengine/src/private/lvfontglyphcache.cpp
     ${CR3_ROOT}/crengine/src/private/lvfontboldtransform.cpp
     ${CR3_ROOT}/crengine/src/private/lvfontcache.cpp

android/app/thirdparty_libs/freetype/Android.mk

@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
     $(FREETYPE_SRC_DIR)/src/base/ftglyph.c \
     $(FREETYPE_SRC_DIR)/src/base/ftbitmap.c \
     $(FREETYPE_SRC_DIR)/src/base/ftlcdfil.c \
+    $(FREETYPE_SRC_DIR)/src/base/ftsynth.c \
     $(FREETYPE_SRC_DIR)/src/bdf/bdf.c \
     $(FREETYPE_SRC_DIR)/src/cache/ftcache.c \
     $(FREETYPE_SRC_DIR)/src/cff/cff.c \

android/app/thirdparty_libs/freetype/CMakeLists.txt

@@ -16,6 +16,7 @@ set(FREETYPE_SRC_FILES
     ${FREETYPE_SRC_DIR}/src/base/ftglyph.c
     ${FREETYPE_SRC_DIR}/src/base/ftbitmap.c
     ${FREETYPE_SRC_DIR}/src/base/ftlcdfil.c
+    ${FREETYPE_SRC_DIR}/src/base/ftsynth.c
     ${FREETYPE_SRC_DIR}/src/bdf/bdf.c
     ${FREETYPE_SRC_DIR}/src/cache/ftcache.c
     ${FREETYPE_SRC_DIR}/src/cff/cff.c

android/app/thirdparty_libs/harfbuzz/Android.mk

@@ -13,7 +13,6 @@ HARFBUZZ_CONFIG_DIR_P := $(LOCAL_PATH)
 LOCAL_C_INCLUDES := \
 	$(HARFBUZZ_CONFIG_DIR_P) \
 	$(HARFBUZZ_SRC_DIR_P) \
-	$(HARFBUZZ_SRC_DIR_P)/src/hb-ucdn \
 	$(FREETYPE_SRC_DIR_P) \
 	$(FREETYPE_SRC_DIR_P)/include
 
@@ -24,51 +23,49 @@ LOCAL_SRC_FILES := \
     $(HARFBUZZ_SRC_DIR)/src/hb-aat-layout.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-aat-map.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-blob.cc \
-    $(HARFBUZZ_SRC_DIR)/src/hb-buffer.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-buffer-serialize.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-buffer.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-common.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-face.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-fallback-shape.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-font.cc \
-    $(HARFBUZZ_SRC_DIR)/src/hb-ft.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-map.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-number.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ot-cff1-table.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ot-cff2-table.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-color.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-face.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-font.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-layout.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-map.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-math.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ot-meta.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ot-metrics.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-name.cc \
-    $(HARFBUZZ_SRC_DIR)/src/hb-ot-name-language.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-arabic.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-default.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-hangul.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-hebrew.cc \
-    $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-indic.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-indic-table.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-indic.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-khmer.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-myanmar.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-thai.cc \
-    $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-use.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-use-table.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-use.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-vowel-constraints.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-fallback.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-normalize.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-tag.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-ot-var.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-set.cc \
-    $(HARFBUZZ_SRC_DIR)/src/hb-shape.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-shape-plan.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-shape.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-shaper.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-static.cc \
-    $(HARFBUZZ_SRC_DIR)/src/hb-ucdn.cc \
+    $(HARFBUZZ_SRC_DIR)/src/hb-ucd.cc \
     $(HARFBUZZ_SRC_DIR)/src/hb-unicode.cc \
-    $(HARFBUZZ_SRC_DIR)/src/hb-warning.cc \
-    $(HARFBUZZ_SRC_DIR)/src/hb-ucdn/ucdn.c
-#    $(HARFBUZZ_SRC_DIR)/src/hb-subset-glyf.cc
-#    $(HARFBUZZ_SRC_DIR)/src/hb-subset-input.cc
-#    $(HARFBUZZ_SRC_DIR)/src/hb-subset.cc
-#    $(HARFBUZZ_SRC_DIR)/src/hb-subset-plan.cc
+    $(HARFBUZZ_SRC_DIR)/src/hb-ft.cc
 
 include $(BUILD_STATIC_LIBRARY)

android/app/thirdparty_libs/harfbuzz/CMakeLists.txt

@@ -6,57 +6,57 @@ set(HARFBUZZ_CONFIG_DIR ${PROJECT_SOURCE_DIR})
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${HARFBUZZ_CONFIG_DIR})
-include_directories(${HARFBUZZ_SRC_DIR}/src/hb-ucdn)
 
 add_definitions(-DHAVE_CONFIG_H=1)
 
 set(HARFBUZZ_SRC_FILES
     ${HARFBUZZ_SRC_DIR}/src/hb-aat-layout.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-aat-map.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-blob.cc
-    ${HARFBUZZ_SRC_DIR}/src/hb-buffer.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-buffer-serialize.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-buffer.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-common.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-face.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-fallback-shape.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-font.cc
-    ${HARFBUZZ_SRC_DIR}/src/hb-ft.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-map.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-number.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ot-cff1-table.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ot-cff2-table.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-color.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-face.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-font.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-layout.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-map.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-math.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ot-meta.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ot-metrics.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-name.cc
-    ${HARFBUZZ_SRC_DIR}/src/hb-ot-name-language.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-arabic.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-default.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-hangul.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-hebrew.cc
-    ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-indic.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-indic-table.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-indic.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-khmer.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-myanmar.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-thai.cc
-    ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-use.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-use-table.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-use.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-complex-vowel-constraints.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-fallback.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-normalize.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-tag.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-ot-var.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-set.cc
-    ${HARFBUZZ_SRC_DIR}/src/hb-shape.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-shape-plan.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-shape.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-shaper.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-static.cc
-    ${HARFBUZZ_SRC_DIR}/src/hb-ucdn.cc
+    ${HARFBUZZ_SRC_DIR}/src/hb-ucd.cc
     ${HARFBUZZ_SRC_DIR}/src/hb-unicode.cc
-    ${HARFBUZZ_SRC_DIR}/src/hb-warning.cc
-
-    ${HARFBUZZ_SRC_DIR}/src/hb-ucdn/ucdn.c
+    ${HARFBUZZ_SRC_DIR}/src/hb-ft.cc
 )
 #    ${HARFBUZZ_SRC_DIR}/src/hb-subset-glyf.cc
 #    ${HARFBUZZ_SRC_DIR}/src/hb-subset-input.cc

android/app/thirdparty_libs/harfbuzz/config.h

@@ -16,9 +16,8 @@
 /* Have Core Text backend */
 /* #undef HAVE_CORETEXT */
 
-/* Define to 1 if you have the declaration of `round', and to 0 if you don't.
-   */
-/* #undef HAVE_DECL_ROUND */
+/* define if the compiler supports basic C++11 syntax */
+#define HAVE_CXX11 1
 
 /* Have DirectWrite library */
 /* #undef HAVE_DIRECTWRITE */
@@ -29,9 +28,6 @@
 /* Define to 1 if you have the <dwrite.h> header file. */
 /* #undef HAVE_DWRITE_H */
 
-/* Have simple TrueType Layout backend */
-#define HAVE_FALLBACK 1
-
 /* Have fontconfig library */
 /* #undef HAVE_FONTCONFIG */
 
@@ -47,6 +43,9 @@
 /* Define to 1 if you have the `FT_Set_Var_Blend_Coordinates' function. */
 /* #undef HAVE_FT_SET_VAR_BLEND_COORDINATES */
 
+/* Have GDI library */
+/* #undef HAVE_GDI */
+
 /* Define to 1 if you have the `getpagesize' function. */
 /* #undef HAVE_GETPAGESIZE */
 
@@ -86,17 +85,14 @@
 /* Define to 1 if you have the `newlocale' function. */
 /* #undef HAVE_NEWLOCALE */
 
-/* Define to 1 if you have the `posix_memalign' function. */
-/* #undef HAVE_POSIX_MEMALIGN */
-
 /* Have POSIX threads */
 #define HAVE_PTHREAD 1
 
 /* Have PTHREAD_PRIO_INHERIT. */
 #define HAVE_PTHREAD_PRIO_INHERIT 1
 
-/* Define to 1 if you have the `round' function. */
-#define HAVE_ROUND 1
+/* Define to 1 if you have the `roundf' function. */
+/* #undef HAVE_ROUNDF */
 
 /* Define to 1 if you have the <sched.h> header file. */
 /* #undef HAVE_SCHED_H */
@@ -137,9 +133,6 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Have UCDN Unicode functions */
-#define HAVE_UCDN 1
-
 /* Have Uniscribe library */
 /* #undef HAVE_UNISCRIBE */
 
@@ -165,7 +158,7 @@
 #define PACKAGE_NAME "HarfBuzz"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "HarfBuzz 2.2.0"
+#define PACKAGE_STRING "HarfBuzz 2.6.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "harfbuzz"
@@ -174,7 +167,7 @@
 #define PACKAGE_URL "http://harfbuzz.org/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.2.0"
+#define PACKAGE_VERSION "2.6.4"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -183,28 +176,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE
 # define _DARWIN_USE_64_BIT_INODE 1
@@ -215,13 +186,3 @@
 
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */