diff --git a/include/libgourou.h b/include/libgourou.h index 186b0c5..1715a7c 100644 --- a/include/libgourou.h +++ b/include/libgourou.h @@ -40,7 +40,7 @@ #define ACS_SERVER "http://adeactivate.adobe.com/adept" #endif -#define LIBGOUROU_VERSION "0.5.2" +#define LIBGOUROU_VERSION "0.5.3" namespace gourou { diff --git a/src/libgourou.cpp b/src/libgourou.cpp index b4f2918..0397045 100644 --- a/src/libgourou.cpp +++ b/src/libgourou.cpp @@ -1151,10 +1151,17 @@ namespace gourou uPDFParser::Object* object = *it; if (object->objectId() == ebxId) + { + // object->deleteKey("Filter"); continue; + } + // Should not decrypt XRef stream if (object->hasKey("Type") && (*object)["Type"]->str() == "/XRef") + { + GOUROU_LOG(DEBUG, "XRef stream at " << object->offset()); continue; + } GOUROU_LOG(DEBUG, "Obj " << object->objectId()); diff --git a/utils/drmprocessorclientimpl.cpp b/utils/drmprocessorclientimpl.cpp index 089b31a..b18b1ba 100644 --- a/utils/drmprocessorclientimpl.cpp +++ b/utils/drmprocessorclientimpl.cpp @@ -532,7 +532,7 @@ void DRMProcessorClientImpl::inflate(gourou::ByteArray& data, gourou::ByteArray& { // Real error if (ret == Z_BUF_ERROR && infstream.avail_out == (uInt)dataSize) - EXCEPTION(gourou::CLIENT_ZIP_ERROR, "Inflate error, code " << zError(ret) << ", msg " << infstream.msg); + break; result.append(buffer, dataSize-infstream.avail_out);