octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2025-01-03 15:17:29 +00:00
Code Issues Releases Wiki Activity

fix potential 64-bit issues

Browse Source 
git-svn-id: svn+q:///qpdf/trunk@613 71b93d88-0707-0410-a8cf-f5a4172ac649
This commit is contained in:
Jay Berkenbilt 2008-05-05 02:22:40 +00:00
parent c7477e205e
commit 62bff4861f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/qpdf/QPDF.hh
View File

@ -85,7 +85,7 @@ class QPDF
struct EncryptionData struct EncryptionData
{ {
// This class holds data read from the encryption dictionary. // 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& O, std::string const& U,
std::string const& id1) : std::string const& id1) :
V(V), V(V),
@ -101,7 +101,7 @@ class QPDF
int V; int V;
int R; int R;
int Length_bytes; int Length_bytes;
long P; int P;
std::string O; std::string O;
std::string U; std::string U;
std::string id1; std::string id1;
@ -115,7 +115,7 @@ class QPDF
static void compute_encryption_O_U( static void compute_encryption_O_U(
char const* user_password, char const* owner_password, 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 const& id1,
std::string& O, std::string& U); std::string& O, std::string& U);
std::string const& getUserPassword() const; std::string const& getUserPassword() const;

2
libqpdf/QPDFWriter.cc
View File

@ -230,7 +230,7 @@ QPDFWriter::setEncryptionParameters(
bits_to_clear.insert(1); bits_to_clear.insert(1);
bits_to_clear.insert(2); bits_to_clear.insert(2);
unsigned long P = 0; int P = 0;
// Create the complement of P, then invert. // Create the complement of P, then invert.
for (std::set<int>::iterator iter = bits_to_clear.begin(); for (std::set<int>::iterator iter = bits_to_clear.begin();
iter != bits_to_clear.end(); ++iter) iter != bits_to_clear.end(); ++iter)

2
libqpdf/QPDF_encryption.cc
View File

@ -427,7 +427,7 @@ QPDF::decryptStream(Pipeline*& pipeline, int objid, int generation,
void void
QPDF::compute_encryption_O_U( QPDF::compute_encryption_O_U(
char const* user_password, char const* owner_password, 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& id1, std::string& O, std::string& U)
{ {
EncryptionData data(V, R, key_len, P, "", "", id1); EncryptionData data(V, R, key_len, P, "", "", id1);