Merge upstream commits #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lution in unit tests (exact comparison of integer values)versus double floating point value used on client side for playback (seconds time unit)
…lution in unit tests (exact comparison of integer values)versus double floating point value used on client side for playback (seconds time unit)
…L Clock Values parsing. Merge branch 'feature/mo_metadata' into develop
…L Clock Values parsing. Merge branch 'feature/mo_metadata' into develop
…ny other refines="ID" metadata)
…ny other refines="ID" metadata)
…ipBegin/End pairs => total duration compared with metadata
…ipBegin/End pairs => total duration compared with metadata
…them again when GC.
…fter unpack (see __resetLibXMLOverrides)
* 'develop' of github.com:readium/readium-sdk: moved buffer allocation outside of loop fixed xmlFreeDoc crash by de-registering the libxml2 bindings right after unpack (see __resetLibXMLOverrides) debugging: filtermanager is nil restored segfaulting code fixed bad MO merge
Basic support has been added. Explicit handling for Previews, AHL, and Indices will follow at a later date.
* feature/collections: Support for EPUB 3.0.1 collections. Basic support has been added. Explicit handling for Previews, AHL, and Indices will follow at a later date. Conflicts: Platform/Apple/ePub3.xcodeproj/project.pbxproj
Also tweaked some things to work on Windows: * noexcept -> _NOEXCEPT * use native _Tss_t for thread-specific data (grumbles about there being no public API) on WinRT. * disable EPUB_COMPILER_SUPPORTS_CXX_DEFAULTED_FUNCTIONS on MSVC, because it doesn't support all cases (doesn't default operator=) * Renamed collection.* to epub_collection.*, because Windows sees #include "me" and #include <me> as equivalent, and I use the system <collection.h> (WinRT C++/CX collection types). * Properly surrounded libxml2 externs in package.cpp with #if clauses. * NativeBridge now returns *this from operator=().
* 'master' of github.com:readium/readium-sdk: Finished IRI java class and it's JNI layer. Some improvements to JNI helper classes, including Method and String access and better Exception handling and throwing. - Fixed off by 1 bug. CFIs are even and start at 2, while the list holding the spine items is zero based. Implemented a Java version of the Library class. This was implemented as pure Java class, since the C++ class didn't implement anything interesting to the Java side. Also started an IRI class, but didn't have time to finish. As it is now is building so I push this version to finish sprint 0.8. Work on IRI will continue next sprint. New template classed to ease JNI handling of Java classes, fields, arrays and many others. Finished the Pointer and PointerPool and tested the lifecycle of containers and packages. Added jni::Pointer and jni::PointerPool classes to allow storing smart pointers on C++ side that have been passed to Java side, preventing early deletion. Storage is tested and working, now release needs testing with some closeBook() function on Java side. Fix off by 1 error on CFI generation. First element is 2 not zero. Allow specifying android ndk to use at command line Delete Doxyfile
* release/0.10: (234 commits) optional.h macro fixed, added 64-bit iOS build. Optional<> unit tests and some more fixes. Properly fixed optional<>. Fixes for optional.h Compiler support macros for VC++ 2013 CTP Launcher-Android now works Now builds on Android. Requires ARMv7. not sure why this wasn't in the build file already? Updating reference to epub_collection.h Keep <codecvt> out of android. File presence check in Container and ManifestItem Adjustments to LibXML node bridging behaviour. Collections API now available for WinRT. Also tweaked some things to work on Windows: * noexcept -> _NOEXCEPT * use native _Tss_t for thread-specific data (grumbles about there being no public API) on WinRT. * disable EPUB_COMPILER_SUPPORTS_CXX_DEFAULTED_FUNCTIONS on MSVC, because it doesn't support all cases (doesn't default operator=) * Renamed collection.* to epub_collection.*, because Windows sees #include "me" and #include <me> as equivalent, and I use the system <collection.h> (WinRT C++/CX collection types). * Properly surrounded libxml2 externs in package.cpp with #if clauses. * NativeBridge now returns *this from operator=(). Support for EPUB 3.0.1 collections. Basic support has been added. Explicit handling for Previews, AHL, and Indices will follow at a later date. temporary fix for libxml node (de)allocation hijacking by WebCore XML parsing Added ContentModule spec PDF. Custom xmlNode(?:R|Der)egister functions now call their predecessors. Fixed? resource deallocation race in Unit Tests. moved buffer allocation outside of loop fixed xmlFreeDoc crash by de-registering the libxml2 bindings right after unpack (see __resetLibXMLOverrides) ...
* hotfix/0.10-no-64bit: Disabled 64-bit iOS build for now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.