diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2008-05-05 04:22:40 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2008-05-05 04:22:40 +0200 |
| commit | 62bff4861fc884e7f0d5cfddca7a8357a19e3d78 (patch) | |
| tree | f4b2c5ebc6329806d2ca6fd695a5fcd7257b88f8 | |
| parent | c7477e205e70390c6e97f3edef7a65c676c47f4f (diff) | |
| download | qpdf-62bff4861fc884e7f0d5cfddca7a8357a19e3d78.tar.zst | |
fix potential 64-bit issues
git-svn-id: svn+q:///qpdf/trunk@613 71b93d88-0707-0410-a8cf-f5a4172ac649
| -rw-r--r-- | include/qpdf/QPDF.hh | 6 | ||||
| -rw-r--r-- | libqpdf/QPDFWriter.cc | 2 | ||||
| -rw-r--r-- | libqpdf/QPDF_encryption.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh index d311b3c8..9030382d 100644 --- a/include/qpdf/QPDF.hh +++ b/include/qpdf/QPDF.hh @@ -85,7 +85,7 @@ class QPDF struct EncryptionData { // This class holds data read from the encryption dictionary. - EncryptionData(int V, int R, int Length_bytes, long P, + EncryptionData(int V, int R, int Length_bytes, int P, std::string const& O, std::string const& U, std::string const& id1) : V(V), @@ -101,7 +101,7 @@ class QPDF int V; int R; int Length_bytes; - long P; + int P; std::string O; std::string U; std::string id1; @@ -115,7 +115,7 @@ class QPDF static void compute_encryption_O_U( char const* user_password, char const* owner_password, - int V, int R, int key_len, unsigned long P, + int V, int R, int key_len, int P, std::string const& id1, std::string& O, std::string& U); std::string const& getUserPassword() const; diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc index 0171203a..23d0d93e 100644 --- a/libqpdf/QPDFWriter.cc +++ b/libqpdf/QPDFWriter.cc @@ -230,7 +230,7 @@ QPDFWriter::setEncryptionParameters( bits_to_clear.insert(1); bits_to_clear.insert(2); - unsigned long P = 0; + int P = 0; // Create the complement of P, then invert. for (std::set<int>::iterator iter = bits_to_clear.begin(); iter != bits_to_clear.end(); ++iter) diff --git a/libqpdf/QPDF_encryption.cc b/libqpdf/QPDF_encryption.cc index d1faefef..39b34070 100644 --- a/libqpdf/QPDF_encryption.cc +++ b/libqpdf/QPDF_encryption.cc @@ -427,7 +427,7 @@ QPDF::decryptStream(Pipeline*& pipeline, int objid, int generation, void QPDF::compute_encryption_O_U( char const* user_password, char const* owner_password, - int V, int R, int key_len, unsigned long P, + int V, int R, int key_len, int P, std::string const& id1, std::string& O, std::string& U) { EncryptionData data(V, R, key_len, P, "", "", id1); |