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

Fix #3294 (Calibre 0.6.8 E-book library management has stopped working)

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-26 13:31:39 -06:00
parent 779fcd4fe2
commit f289c6b44b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/utils/poppler/__init__.py
View File

@ -22,6 +22,7 @@ def get_metadata(stream, cover=True):
raw = stream.read() raw = stream.read()
doc = poppler.PDFDoc() doc = poppler.PDFDoc()
doc.load(raw) doc.load(raw)
del raw
title = doc.title title = doc.title
if not title or not title.strip(): if not title or not title.strip():
title = _('Unknown') title = _('Unknown')
@ -55,7 +56,6 @@ def get_metadata(stream, cover=True):
if cdata is not None: if cdata is not None:
mi.cover_data = ('jpg', cdata) mi.cover_data = ('jpg', cdata)
del doc del doc
del raw
return mi return mi

9
src/calibre/utils/poppler/poppler.cpp
View File

@ -176,15 +176,16 @@ poppler_PDFDoc_render_page(poppler_PDFDoc *self, PyObject *args, PyObject *kwarg
int num; int num;
if (!PyArg_ParseTuple(args, "i|ff", &num, &xdpi, &ydpi)) return ans; if (!PyArg_ParseTuple(args, "i|ff", &num, &xdpi, &ydpi)) return ans;
if ( num < 0 || num >= self->doc->numPages()) {
PyErr_SetString(PyExc_ValueError, "Invalid page number");
return ans;
}
if ( self->doc->isLocked()) { if ( self->doc->isLocked()) {
PyErr_SetString(PyExc_ValueError, "This document is copyrighted."); PyErr_SetString(PyExc_ValueError, "This document is copyrighted.");
return ans; return ans;
} }
if ( num < 0 || num >= self->doc->numPages()) {
PyErr_SetString(PyExc_ValueError, "Invalid page number");
return ans;
}
page = self->doc->page(num); page = self->doc->page(num);
img = page->renderToImage(xdpi, ydpi); img = page->renderToImage(xdpi, ydpi);
if (img.isNull()) { if (img.isNull()) {