Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

PDF metadata: Fix last character corrupted when setting metadata in encrypted files. The fix required a workaround, which means that setting metadata in encrypted PDF files will only work for values of metadata that can be encoded in the cp-1252 encoding.

Browse Source
This commit is contained in:
Kovid Goyal 2010-06-30 13:11:48 -06:00
parent 985cbb78e3
commit f124ad0b47
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/calibre/utils/podofo/podofo.cpp
View File

@ -6,15 +6,10 @@
#include <podofo.h> #include <podofo.h>
using namespace PoDoFo; using namespace PoDoFo;
class podofo_pdfmem_wrapper : public PdfMemDocument {
public:
inline void set_info(PdfInfo *i) { this->SetInfo(i); }
};
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
/* Type-specific fields go here. */ /* Type-specific fields go here. */
podofo_pdfmem_wrapper *doc; PdfMemDocument *doc;
} podofo_PDFDoc; } podofo_PDFDoc;
@ -33,7 +28,7 @@ podofo_PDFDoc_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self = (podofo_PDFDoc *)type->tp_alloc(type, 0); self = (podofo_PDFDoc *)type->tp_alloc(type, 0);
if (self != NULL) { if (self != NULL) {
self->doc = new podofo_pdfmem_wrapper(); self->doc = new PdfMemDocument();
if (self->doc == NULL) { Py_DECREF(self); return NULL; } if (self->doc == NULL) { Py_DECREF(self); return NULL; }
} }
@ -171,6 +166,19 @@ podofo_convert_pystring(PyObject *py) {
return ans; return ans;
} }
static PdfString *
podofo_convert_pystring_single_byte(PyObject *py) {
Py_UNICODE* u = PyUnicode_AS_UNICODE(py);
PyObject *s = PyUnicode_Encode(u, PyUnicode_GET_SIZE(py), "cp1252", "replace");
if (s == NULL) { PyErr_NoMemory(); return NULL; }
PdfString *ans = new PdfString(PyString_AS_STRING(s));
Py_DECREF(s);
if (ans == NULL) PyErr_NoMemory();
return ans;
}
static PyObject * static PyObject *
podofo_PDFDoc_getter(podofo_PDFDoc *self, int field) podofo_PDFDoc_getter(podofo_PDFDoc *self, int field)
{ {
@ -219,7 +227,10 @@ podofo_PDFDoc_setter(podofo_PDFDoc *self, PyObject *val, int field) {
PyErr_SetString(PyExc_Exception, "You must first load a PDF Document"); PyErr_SetString(PyExc_Exception, "You must first load a PDF Document");
return -1; return -1;
} }
PdfString *s = podofo_convert_pystring(val); PdfString *s = NULL;
if (self->doc->GetEncrypted()) s = podofo_convert_pystring_single_byte(val);
else s = podofo_convert_pystring(val);
if (s == NULL) return -1; if (s == NULL) return -1;
@ -241,9 +252,6 @@ podofo_PDFDoc_setter(podofo_PDFDoc *self, PyObject *val, int field) {
return -1; return -1;
} }
self->doc->set_info(info);
return 0; return 0;
} }