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 compilation of bzzdec with Visual Studio

Browse Source
This commit is contained in:
Kovid Goyal 2014-03-03 20:01:44 +05:30
parent 6df7412bbc
commit 576c9b3476
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/extensions.py
View File

@ -174,7 +174,7 @@ extensions = [
Extension('bzzdec', Extension('bzzdec',
['calibre/ebooks/djvu/bzzdecoder.c'], ['calibre/ebooks/djvu/bzzdecoder.c'],
incdirs=['calibre/utils/chm'] # For stdint.h inc_dirs=['calibre/utils/chm'] # For stdint.h
), ),
Extension('podofo', Extension('podofo',

16
src/calibre/ebooks/djvu/bzzdecoder.c
View File

@ -11,6 +11,8 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include "stdint.h" #include "stdint.h"
// inline does not work with the visual studio C compiler
#define inline
#else #else
#include <inttypes.h> #include <inttypes.h>
#endif #endif
@ -376,7 +378,7 @@ static bool init_state(State *state) {
return TRUE; return TRUE;
} }
static int32_t decode_sub_simple(State *state, int32_t mps, uint32_t z) { static inline int32_t decode_sub_simple(State *state, int32_t mps, uint32_t z) {
int32_t shift = 0; int32_t shift = 0;
/* Test MPS/LPS */ /* Test MPS/LPS */
@ -422,7 +424,7 @@ static inline int32_t decode_raw(State *state, int32_t bits) {
return n - m; return n - m;
} }
static int32_t decode_sub(State *state, uint8_t *ctx, int32_t index, unsigned int z) static inline int32_t decode_sub(State *state, uint8_t *ctx, int32_t index, uint32_t z)
{ {
/* Save bit */ /* Save bit */
int32_t bit = (ctx[index] & 1), shift; int32_t bit = (ctx[index] & 1), shift;
@ -462,7 +464,7 @@ static int32_t decode_sub(State *state, uint8_t *ctx, int32_t index, unsigned in
static inline int32_t zpcodec_decode(State *state, uint8_t *ctx, int32_t index) { static inline int32_t zpcodec_decode(State *state, uint8_t *ctx, int32_t index) {
int32_t z = state->a + state->p[ctx[index]]; uint32_t z = state->a + state->p[ctx[index]];
if (z <= state->fence) { if (z <= state->fence) {
state->a = z; state->a = z;
return ctx[index] & 1; return ctx[index] & 1;
@ -514,8 +516,8 @@ static bool decode(State *state, uint8_t *ctx) {
0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF}; // }}} 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF}; // }}}
int32_t freq[FREQMAX] = {0}, fadd = 4, mtfno = 3, markerpos = -1, i = 0, ctxid = 0, fshift = 0, k = 0, count[256] = {0}, last = 0, tmp = 0; int32_t fc = 0, freq[FREQMAX] = {0}, fadd = 4, mtfno = 3, markerpos = -1, ctxid = 0, fshift = 0, k = 0, count[256] = {0}, last = 0, tmp = 0;
uint32_t fc = 0, *posn = NULL, n = 0; uint32_t *posn = NULL, n = 0, i = 0;
uint8_t j = 0, c = 0; uint8_t j = 0, c = 0;
state->xsize = decode_raw(state, 24); state->xsize = decode_raw(state, 24);
@ -580,10 +582,10 @@ static bool decode(State *state, uint8_t *ctx) {
} // end loop on i } // end loop on i
////////// Reconstruct the string ////////// Reconstruct the string
if (markerpos<1 || markerpos>=state->xsize) { CORRUPT; goto end; } if (markerpos<1 || (uint32_t)markerpos>=state->xsize) { CORRUPT; goto end; }
// Allocate pointers // Allocate pointers
// Fill count buffer // Fill count buffer
for (i=0; i<markerpos; i++) for (i=0; i<(uint32_t)markerpos; i++)
{ {
c = state->buf[i]; c = state->buf[i];
posn[i] = (c<<24) | (count[c] & 0xffffff); posn[i] = (c<<24) | (count[c] & 0xffffff);