Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielweck
danielweck committed May 3, 2017
2 parents cea1ca9 + 85a0456 commit 76d754c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion readium-sdk
Submodule readium-sdk updated 84 files
+24 −3 Platform/Android/epub3/Application.mk
+233 −205 Platform/Android/epub3/Experimental.mk
+53 −29 Platform/Android/epub3/Stable.mk
+61 −14 Platform/Android/epub3/build.gradle
+173 −60 Platform/Android/epub3/build_experimental.gradle
+84 −84 Platform/Android/epub3/src/main/jni/android/backup_atomics.cpp
+185 −185 Platform/Android/epub3/src/main/jni/android/backup_atomics.h
+729 −729 Platform/Android/epub3/src/main/jni/android/gnucxx-clang/bits/atomic_base.h
+28 −28 Platform/Android/epub3/src/main/jni/android/gnucxx-clang/bits/atomic_lockfree_defines.h
+269 −163 Platform/Android/epub3/src/main/jni/epub3.cpp
+11 −1 Platform/Android/epub3/src/main/jni/epub3.h
+1 −1 Platform/Android/epub3/src/main/jni/jni/jni_ptr.cpp
+7 −1 Platform/Android/epub3/src/main/jni/packagejni.cpp
+3 −2 Platform/Android/gradle/wrapper/gradle-wrapper.properties
+6 −6 Platform/Android/lib/src/main/java/org/readium/sdk/android/Container.java
+7 −3 Platform/Android/lib/src/main/java/org/readium/sdk/android/EPub3.java
+24 −24 Platform/Android/lib/src/main/java/org/readium/sdk/android/Library.java
+11 −0 Platform/Android/lib/src/main/java/org/readium/sdk/android/Package.java
+8 −7 Platform/Apple/RDServices/Main/RDContainer.h
+34 −12 Platform/Apple/RDServices/Main/RDContainer.mm
+5 −2 Platform/Apple/RDServices/Main/RDPackage.h
+25 −0 Platform/Apple/RDServices/Main/RDPackage.mm
+1 −0 Platform/Apple/RDServices/Main/RDPackageResourceConnection.h
+10 −1 Platform/Apple/RDServices/Main/RDPackageResourceConnection.m
+1 −0 Platform/Apple/RDServices/Main/RDPackageResourceServer.h
+17 −0 Platform/Apple/RDServices/Main/RDPackageResourceServer.m
+4 −0 Platform/Apple/ePub3.xcodeproj/project.pbxproj
+3 −3 ePub3/ThirdParty/sha1/sha1.h
+6 −0 ePub3/_config.h
+4 −0 ePub3/_platform.h
+22 −2 ePub3/base.h
+2 −2 ePub3/ePub/PassThroughFilter.cpp
+10 −2 ePub3/ePub/archive.h
+63 −10 ePub3/ePub/archive_xml.cpp
+29 −10 ePub3/ePub/archive_xml.h
+116 −50 ePub3/ePub/container.cpp
+2 −2 ePub3/ePub/container.h
+21 −9 ePub3/ePub/content_module.h
+100 −0 ePub3/ePub/content_module_exception.h
+85 −55 ePub3/ePub/content_module_manager.cpp
+23 −12 ePub3/ePub/content_module_manager.h
+4 −0 ePub3/ePub/credential_request.cpp
+4 −0 ePub3/ePub/credential_request.h
+4 −3 ePub3/ePub/epub_collection.cpp
+7 −4 ePub3/ePub/filter_chain.h
+7 −4 ePub3/ePub/filter_chain_byte_stream.h
+7 −4 ePub3/ePub/filter_chain_byte_stream_range.h
+1 −1 ePub3/ePub/filter_manager_impl.cpp
+1 −1 ePub3/ePub/font_obfuscation.cpp
+2 −0 ePub3/ePub/initialization.cpp
+14 −4 ePub3/ePub/manifest.cpp
+2 −1 ePub3/ePub/media-overlays_smil_utils.h
+2 −2 ePub3/ePub/nav_table.cpp
+1 −1 ePub3/ePub/object_preprocessor.cpp
+206 −114 ePub3/ePub/package.cpp
+23 −6 ePub3/ePub/package.h
+1 −1 ePub3/ePub/spine.cpp
+1 −1 ePub3/ePub/switch_preprocessor.cpp
+5 −0 ePub3/ePub/user_action.h
+20 −1 ePub3/ePub/zip_archive.cpp
+5 −2 ePub3/ePub/zip_archive.h
+2 −0 ePub3/utilities/CPUCacheUtils.c
+4 −0 ePub3/utilities/CPUCacheUtils.h
+5 −0 ePub3/utilities/CPUCacheUtils_win.cpp
+1 −1 ePub3/utilities/byte_stream.cpp
+4 −0 ePub3/utilities/byte_stream.h
+5 −0 ePub3/utilities/executor.cpp
+4 −0 ePub3/utilities/executor.h
+20 −0 ePub3/utilities/future.cpp
+4 −0 ePub3/utilities/future.h
+4 −0 ePub3/utilities/optional.cpp
+4 −0 ePub3/utilities/optional.h
+4 −0 ePub3/utilities/run_loop.h
+4 −0 ePub3/utilities/run_loop_android.cpp
+4 −0 ePub3/utilities/run_loop_cf.cpp
+5 −0 ePub3/utilities/run_loop_common.ipp
+5 −0 ePub3/utilities/run_loop_generic.cpp
+5 −0 ePub3/utilities/run_loop_windows.cpp
+45 −8 ePub3/xml/tree/node.cpp
+57 −7 ePub3/xml/utilities/base.h
+43 −23 ePub3/xml/utilities/io.cpp
+47 −40 ePub3/xml/utilities/io.h
+11 −3 ePub3/xml/validation/ns.cpp
+3 −2 ePub3/xml/validation/ns.h
2 changes: 1 addition & 1 deletion readium-shared-js
Submodule readium-shared-js updated 13 files
+7 −4 build-output/_multiple-bundles/RequireJS.js
+88 −96 build-output/_multiple-bundles/readium-cfi-js.js
+4 −4 build-output/_multiple-bundles/readium-cfi-js.js.map
+15 −6 build-output/_multiple-bundles/readium-external-libs.js
+4 −4 build-output/_multiple-bundles/readium-external-libs.js.map
+11 −10 build-output/_multiple-bundles/readium-shared-js.js
+3 −3 build-output/_multiple-bundles/readium-shared-js.js.map
+2,704 −2,702 build-output/_single-bundle/readium-shared-js_all.js
+11 −11 build-output/_single-bundle/readium-shared-js_all.js.map
+1 −1 js/views/one_page_view.js
+1 −1 package.cson
+1 −1 package.json
+1 −1 readium-cfi-js

0 comments on commit 76d754c

Please sign in to comment.