summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2016-03-23 16:10:32 +0000
committerRobin Watts <robin.watts@artifex.com>2016-03-23 16:25:09 +0000
commit5f8ed8d0b32e8a59e3e33ae6ef67c8e9afd58bab (patch)
tree2d514528b903fde6accb7fd68c2fa0434a570246 /source
parentff349d7c4658e5aa274e0c11baad914a45970d6b (diff)
downloadmupdf-5f8ed8d0b32e8a59e3e33ae6ef67c8e9afd58bab.tar.xz
Fix MSVC builds.
Update generate.bat to generate generate/fontname.c files rather than generate/fontname.{ttc,ttf,cff} etc. Add a new libfonts target that builds those, and make libmupdf depend on it. Fix build problem in load-bmp.c - don't declare in the middle of blocks.
Diffstat (limited to 'source')
-rw-r--r--source/fitz/load-bmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/fitz/load-bmp.c b/source/fitz/load-bmp.c
index 0d53d565..19aefd25 100644
--- a/source/fitz/load-bmp.c
+++ b/source/fitz/load-bmp.c
@@ -436,12 +436,12 @@ bmp_decompress_rle4(fz_context *ctx, struct info *info, unsigned char *p, unsign
}
else if (sp[0] == 0 && sp[1] == 2)
{ /* delta */
- int deltax, deltay;
+ int deltax, deltay, startlow;
if (sp + 4 > *end)
break;
deltax = sp[2];
deltay = sp[3];
- int startlow = x & 1;
+ startlow = x & 1;
dp += (deltax + startlow) / 2 + deltay * stride;
sp += 4;
x += deltax;