Commit 24e2b2b76f1f0051f240c8371b2352c4cde85bf9
1 parent
b8563793
Fix gcc 4.7 warnings about C++11
Showing
2 changed files
with
7 additions
and
7 deletions
libqpdf/QPDFWriter.cc
| @@ -1408,12 +1408,12 @@ QPDFWriter::generateID() | @@ -1408,12 +1408,12 @@ QPDFWriter::generateID() | ||
| 1408 | if (this->static_id) | 1408 | if (this->static_id) |
| 1409 | { | 1409 | { |
| 1410 | // For test suite use only... | 1410 | // For test suite use only... |
| 1411 | - static char tmp[] = {0x31, 0x41, 0x59, 0x26, | ||
| 1412 | - 0x53, 0x58, 0x97, 0x93, | ||
| 1413 | - 0x23, 0x84, 0x62, 0x64, | ||
| 1414 | - 0x33, 0x83, 0x27, 0x95, | ||
| 1415 | - 0x00}; | ||
| 1416 | - result = tmp; | 1411 | + static unsigned char tmp[] = {0x31, 0x41, 0x59, 0x26, |
| 1412 | + 0x53, 0x58, 0x97, 0x93, | ||
| 1413 | + 0x23, 0x84, 0x62, 0x64, | ||
| 1414 | + 0x33, 0x83, 0x27, 0x95, | ||
| 1415 | + 0x00}; | ||
| 1416 | + result = (char*)tmp; | ||
| 1417 | } | 1417 | } |
| 1418 | else | 1418 | else |
| 1419 | { | 1419 | { |
libqpdf/QPDF_encryption.cc
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | #include <assert.h> | 16 | #include <assert.h> |
| 17 | #include <string.h> | 17 | #include <string.h> |
| 18 | 18 | ||
| 19 | -static char const padding_string[] = { | 19 | +static unsigned char const padding_string[] = { |
| 20 | 0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, | 20 | 0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, |
| 21 | 0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08, | 21 | 0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08, |
| 22 | 0x2e, 0x2e, 0x00, 0xb6, 0xd0, 0x68, 0x3e, 0x80, | 22 | 0x2e, 0x2e, 0x00, 0xb6, 0xd0, 0x68, 0x3e, 0x80, |