Conflict resolved full request for update Radium SDK to support LCP implementation #219
Conversation
- update RDContainer, lcp initialize - update content module process - update encryption, compression/uncompression - update zip_fseek - jni epub3 bug fix
…ium-sdk-1 into feature/sdkForLcp
Conflicts: Platform/Apple/RDServices/Main/RDContainer.h
Modify indentation from line 92 to 95
|
Having tested the previous version of this pull request (when it was pull request #216), I could verify that this is pretty much the same with the added advantage of having being based upon develop. As such, it can be merged into develop without any conflicts. I just downloaded this pull request on my machine and, just to double check, I could verify that it compiles fine on Xcode. As such, and based upon the conversation we had in our latest Readium SDK meeting, I'm moving forward with merging this pull request into develop. |
Conflict resolved full request for update Radium SDK to support LCP implementation
| // such as bad index access error | ||
| zf->fpos += (abspos - zf->file_fpos); | ||
| zf->cbytes_left = zf->bytes_left; | ||
| /* adding end */ | ||
| } |
There was a problem hiding this comment.
@nleme the code above has been merged to develop, so I wonder if this issue and associated PR is still valid?
#177
https://github.com/readium/readium-sdk/pull/179/files
There was a problem hiding this comment.
And just a reminder of the pending zip lib update PR (not sure how this zip_fseek patch will survive / need to be adjusted):
#191 (comment)
I send a pull request again which is conflict resolved from #216