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

CHM Input: Fix a regression in the previous release that broke processing of CHM files. Fixes #1796889 [Converting CHM to X (epub or pdf) no longer working. Input Error in chm.py?](https://bugs.launchpad.net/calibre/+bug/1796889)

Browse Source
This commit is contained in:
Kovid Goyal 2018-10-18 09:12:46 +05:30
parent 42ba64953d
commit d517a8eb4f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 89 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/calibre/utils/chm/swig_chm.c
View File

@ -660,14 +660,11 @@ extern "C" {
static PyObject *_wrap_chmUnitInfo_start_set(PyObject *self, PyObject *args) { static PyObject *_wrap_chmUnitInfo_start_set(PyObject *self, PyObject *args) {
PyObject *resultobj; PyObject *resultobj;
struct chmUnitInfo *arg1 = (struct chmUnitInfo *) 0 ; struct chmUnitInfo *arg1 = (struct chmUnitInfo *) 0 ;
LONGUINT64 arg2 ; unsigned long long arg2 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"OO:chmUnitInfo_start_set",&obj0,&obj1)) goto fail; if(!PyArg_ParseTuple(args,(char *)"OK:chmUnitInfo_start_set",&obj0,&arg2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_chmUnitInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_chmUnitInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
arg2 = (LONGUINT64) PyLong_AsUnsignedLongLong(obj1);
if (PyErr_Occurred()) SWIG_fail;
if (arg1) (arg1)->start = arg2; if (arg1) (arg1)->start = arg2;
Py_INCREF(Py_None); resultobj = Py_None; Py_INCREF(Py_None); resultobj = Py_None;
@ -697,14 +694,11 @@ static PyObject *_wrap_chmUnitInfo_start_get(PyObject *self, PyObject *args) {
static PyObject *_wrap_chmUnitInfo_length_set(PyObject *self, PyObject *args) { static PyObject *_wrap_chmUnitInfo_length_set(PyObject *self, PyObject *args) {
PyObject *resultobj; PyObject *resultobj;
struct chmUnitInfo *arg1 = (struct chmUnitInfo *) 0 ; struct chmUnitInfo *arg1 = (struct chmUnitInfo *) 0 ;
LONGUINT64 arg2 ; unsigned long long arg2 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"OO:chmUnitInfo_length_set",&obj0,&obj1)) goto fail; if(!PyArg_ParseTuple(args,(char *)"OO:chmUnitInfo_length_set",&obj0,&arg2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_chmUnitInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_chmUnitInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
arg2 = (LONGUINT64) PyLong_AsUnsignedLongLong(obj1);
if (PyErr_Occurred()) SWIG_fail;
if (arg1) (arg1)->length = arg2; if (arg1) (arg1)->length = arg2;
Py_INCREF(Py_None); resultobj = Py_None; Py_INCREF(Py_None); resultobj = Py_None;
@ -934,23 +928,17 @@ static PyObject *_wrap_chm_retrieve_object(PyObject *self, PyObject *args) {
struct chmFile *arg1 = (struct chmFile *) 0 ; struct chmFile *arg1 = (struct chmFile *) 0 ;
struct chmUnitInfo *arg2 = (struct chmUnitInfo *) 0 ; struct chmUnitInfo *arg2 = (struct chmUnitInfo *) 0 ;
unsigned char *arg3 = (unsigned char *) 0 ; unsigned char *arg3 = (unsigned char *) 0 ;
LONGUINT64 arg4 ; unsigned long long arg4 ;
LONGINT64 arg5 ; long long arg5 ;
LONGINT64 result; LONGINT64 result;
unsigned char temp3 ; unsigned char temp3 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
arg3 = &temp3; arg3 = &temp3;
if(!PyArg_ParseTuple(args,(char *)"OOOO:chm_retrieve_object",&obj0,&obj1,&obj2,&obj3)) goto fail; if(!PyArg_ParseTuple(args,(char *)"OOKL:chm_retrieve_object",&obj0,&obj1,&arg4,&arg5)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_chmFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_chmFile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_chmUnitInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_chmUnitInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
arg4 = (LONGUINT64) PyLong_AsUnsignedLongLong(obj2);
if (PyErr_Occurred()) SWIG_fail;
arg5 = (LONGINT64) PyLong_AsLongLong(obj3);
if (PyErr_Occurred()) SWIG_fail;
{ {
/* nasty hack */ /* nasty hack */
@ -1124,4 +1112,3 @@ CALIBRE_MODINIT_FUNC SWIG_init(void) {
SWIG_InstallConstants(d,swig_const_table); SWIG_InstallConstants(d,swig_const_table);
} }