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

Palmdoc extension now compiles on windows

Browse Source
This commit is contained in:
Kovid Goyal 2009-05-31 11:20:09 -07:00
parent a2187a86ac
commit 3f14ce65e7
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calibre/ebooks/compression/palmdoc.c
View File

@ -14,8 +14,6 @@
#include <Python.h> #include <Python.h>
#include <stdio.h> #include <stdio.h>
#define DELTA sizeof(Byte)*4096
#define BUFFER 6000 #define BUFFER 6000
#define MIN(x, y) ( ((x) < (y)) ? (x) : (y) ) #define MIN(x, y) ( ((x) < (y)) ? (x) : (y) )
@ -46,26 +44,25 @@ typedef struct {
static PyObject * static PyObject *
cpalmdoc_decompress(PyObject *self, PyObject *args) { cpalmdoc_decompress(PyObject *self, PyObject *args) {
const char *_input = NULL; Py_ssize_t input_len = 0; const char *_input = NULL; Py_ssize_t input_len = 0;
Byte *input; char *output; Byte c; PyObject *ans;
Py_ssize_t i = 0, o = 0, j = 0, di, n; Py_ssize_t i = 0, o = 0, j = 0, di, n;
if (!PyArg_ParseTuple(args, "t#", &_input, &input_len)) if (!PyArg_ParseTuple(args, "t#", &_input, &input_len))
return NULL; return NULL;
Byte *input = (Byte *)PyMem_Malloc(sizeof(Byte)*input_len); input = (Byte *) PyMem_Malloc(sizeof(Byte)*input_len);
if (input == NULL) return PyErr_NoMemory(); if (input == NULL) return PyErr_NoMemory();
// Map chars to bytes // Map chars to bytes
for (j = 0; j < input_len; j++) for (j = 0; j < input_len; j++)
input[j] = (_input[j] < 0) ? _input[j]+256 : _input[j]; input[j] = (_input[j] < 0) ? _input[j]+256 : _input[j];
char *output = (char *)PyMem_Malloc(sizeof(char)*BUFFER); output = (char *)PyMem_Malloc(sizeof(char)*BUFFER);
Byte c;
PyObject *ans;
if (output == NULL) return PyErr_NoMemory(); if (output == NULL) return PyErr_NoMemory();
while (i < input_len) { while (i < input_len) {
c = input[i++]; c = input[i++];
if (c >= 1 && c <= 8) // copy 'c' bytes if (c >= 1 && c <= 8) // copy 'c' bytes
while (c--) output[o++] = input[i++]; while (c--) output[o++] = (char)input[i++];
else if (c <= 0x7F) // 0, 09-7F = self else if (c <= 0x7F) // 0, 09-7F = self
output[o++] = c; output[o++] = (char)c;
else if (c >= 0xC0) { // space + ASCII char else if (c >= 0xC0) { // space + ASCII char
output[o++] = ' '; output[o++] = ' ';
@ -107,8 +104,8 @@ cpalmdoc_do_compress(buffer *b, char *output) {
Byte c, n; Byte c, n;
bool found; bool found;
char *head; char *head;
head = output;
buffer temp; buffer temp;
head = output;
temp.data = (Byte *)PyMem_Malloc(sizeof(Byte)*8); temp.len = 0; temp.data = (Byte *)PyMem_Malloc(sizeof(Byte)*8); temp.len = 0;
if (temp.data == NULL) return 0; if (temp.data == NULL) return 0;
while (i < b->len) { while (i < b->len) {
@ -151,7 +148,7 @@ cpalmdoc_do_compress(buffer *b, char *output) {
} }
i += temp.len - 1; i += temp.len - 1;
*(output++) = temp.len; *(output++) = temp.len;
for (j=0; j < temp.len; j++) *(output++) = temp.data[j]; for (j=0; j < temp.len; j++) *(output++) = (char)temp.data[j];
} }
} }
return output - head; return output - head;
@ -160,6 +157,7 @@ cpalmdoc_do_compress(buffer *b, char *output) {
static PyObject * static PyObject *
cpalmdoc_compress(PyObject *self, PyObject *args) { cpalmdoc_compress(PyObject *self, PyObject *args) {
const char *_input = NULL; Py_ssize_t input_len = 0; const char *_input = NULL; Py_ssize_t input_len = 0;
char *output; PyObject *ans;
Py_ssize_t j = 0; Py_ssize_t j = 0;
buffer b; buffer b;
if (!PyArg_ParseTuple(args, "t#", &_input, &input_len)) if (!PyArg_ParseTuple(args, "t#", &_input, &input_len))
@ -170,11 +168,11 @@ cpalmdoc_compress(PyObject *self, PyObject *args) {
for (j = 0; j < input_len; j++) for (j = 0; j < input_len; j++)
b.data[j] = (_input[j] < 0) ? _input[j]+256 : _input[j]; b.data[j] = (_input[j] < 0) ? _input[j]+256 : _input[j];
b.len = input_len; b.len = input_len;
char *output = (char *)PyMem_Malloc(sizeof(char) * b.len); output = (char *)PyMem_Malloc(sizeof(char) * b.len);
if (output == NULL) return PyErr_NoMemory(); if (output == NULL) return PyErr_NoMemory();
j = cpalmdoc_do_compress(&b, output); j = cpalmdoc_do_compress(&b, output);
if ( j == 0) return PyErr_NoMemory(); if ( j == 0) return PyErr_NoMemory();
PyObject *ans = Py_BuildValue("s#", output, j); ans = Py_BuildValue("s#", output, j);
PyMem_Free(output); PyMem_Free(output);
PyMem_Free(b.data); PyMem_Free(b.data);
return ans; return ans;

2
src/calibre/gui2/main.py
View File

@ -1670,7 +1670,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
def update_found(self, version): def update_found(self, version):
os = 'windows' if iswindows else 'osx' if isosx else 'linux' os = 'windows' if iswindows else 'osx' if isosx else 'linux'
url = 'http://%s.kovidgoyal.net/download_%s'%(__appname__, os) url = 'http://%s.kovidgoyal.net/download_%s'%(__appname__, os)
self.latest_version = _('<span style="color:red; font-weight:bold">' self.latest_version = '<br>'+_('<span style="color:red; font-weight:bold">'
'Latest version: <a href="%s">%s</a></span>')%(url, version) 'Latest version: <a href="%s">%s</a></span>')%(url, version)
self.vanity.setText(self.vanity_template%\ self.vanity.setText(self.vanity_template%\
(dict(version=self.latest_version, (dict(version=self.latest_version,