diff options
| -rw-r--r-- | Makefile | 126 | ||||
| -rw-r--r-- | mupdf/nametree.c | 2 | ||||
| -rw-r--r-- | mupdf/shade.c | 7 | ||||
| -rw-r--r-- | mupdf/shade3.c | 6 | ||||
| -rw-r--r-- | test/gtkpdf.c | 2 |
5 files changed, 106 insertions, 37 deletions
@@ -14,35 +14,106 @@ all: libfitz.a libmupdf.a libfonts.a pdfrip pdfclean pdfdebug x11pdf gtkpdf # util/strsep.o \ libfitz.a: \ - base/cpudep.o base/error.o base/memory.o base/md5.o base/arc4.o \ - base/rect.o base/matrix.o base/hash.o base/rune.o \ - object/simple.o object/array.o object/dict.o object/print.o object/parse.o \ - filter/buffer.o filter/filter.o \ - filter/filec.o filter/filer.o filter/filew.o \ - filter/null.o filter/arc4filter.o filter/pipeline.o \ - filter/ahxd.o filter/ahxe.o filter/a85d.o filter/a85e.o \ - filter/rld.o filter/rle.o filter/predict.o filter/lzwd.o filter/lzwe.o \ - filter/faxd.o filter/faxdtab.o filter/faxe.o filter/faxetab.o \ - filter/flate.o filter/dctd.o filter/dcte.o \ - tree/cmap.o tree/font.o tree/colorspace.o tree/image.o tree/shade.o \ - tree/tree.o tree/node1.o tree/node2.o tree/text.o tree/path.o \ - tree/debug.o tree/optimize.o \ - render/glyphcache.o render/pixmap.o render/rastshade.o render/render.o \ - render/pathscan.o render/pathfill.o render/pathstroke.o \ - render/optduff.o render/optimage.o render/optunpack.o render/optscale.o + base/cpudep.o \ + base/error.o \ + base/memory.o \ + base/md5.o \ + base/arc4.o \ + base/rect.o \ + base/matrix.o \ + base/hash.o \ + base/rune.o \ + object/simple.o \ + object/array.o \ + object/dict.o \ + object/print.o \ + object/parse.o \ + filter/buffer.o \ + filter/filter.o \ + filter/filec.o \ + filter/filer.o \ + filter/filew.o \ + filter/null.o \ + filter/arc4filter.o \ + filter/pipeline.o \ + filter/ahxd.o \ + filter/ahxe.o \ + filter/a85d.o \ + filter/a85e.o \ + filter/rld.o \ + filter/rle.o \ + filter/predict.o \ + filter/lzwd.o \ + filter/lzwe.o \ + filter/faxd.o \ + filter/faxdtab.o \ + filter/faxe.o \ + filter/faxetab.o \ + filter/flate.o \ + filter/dctd.o \ + filter/dcte.o \ + tree/cmap.o \ + tree/font.o \ + tree/colorspace.o \ + tree/image.o \ + tree/shade.o \ + tree/tree.o \ + tree/node1.o \ + tree/node2.o \ + tree/text.o \ + tree/path.o \ + tree/debug.o \ + tree/optimize.o \ + render/glyphcache.o \ + render/pixmap.o \ + render/porterduff.o \ + render/meshdraw.o \ + render/imagedraw.o \ + render/imageunpack.o \ + render/imagescale.o \ + render/pathscan.o \ + render/pathfill.o \ + render/pathstroke.o \ + render/render.o ar cru $(@) $(?) ranlib $(@) libmupdf.a: \ - mupdf/debug.o mupdf/lex.o mupdf/parse.o mupdf/crypt.o \ - mupdf/open.o mupdf/repair.o mupdf/save.o mupdf/xref.o \ - mupdf/stream.o mupdf/doctor.o \ - mupdf/nametree.o mupdf/outline.o mupdf/pagetree.o mupdf/function.o \ - mupdf/cmap.o mupdf/fontagl.o mupdf/fontenc.o mupdf/fontfile.o \ - mupdf/unicode.o mupdf/font.o mupdf/type3.o \ - mupdf/colorspace1.o mupdf/colorspace2.o \ - mupdf/image.o mupdf/xobject.o mupdf/pattern.o mupdf/shade.o \ - mupdf/resources.o mupdf/page.o mupdf/build.o mupdf/interpret.o + mupdf/debug.o \ + mupdf/lex.o \ + mupdf/parse.o \ + mupdf/crypt.o \ + mupdf/open.o \ + mupdf/repair.o \ + mupdf/save.o \ + mupdf/xref.o \ + mupdf/stream.o \ + mupdf/doctor.o \ + mupdf/nametree.o \ + mupdf/outline.o \ + mupdf/annot.o \ + mupdf/pagetree.o \ + mupdf/store.o \ + mupdf/resources.o \ + mupdf/function.o \ + mupdf/colorspace1.o \ + mupdf/colorspace2.o \ + mupdf/xobject.o \ + mupdf/image.o \ + mupdf/pattern.o \ + mupdf/shade.o \ + mupdf/shade2.o \ + mupdf/shade3.o \ + mupdf/cmap.o \ + mupdf/unicode.o \ + mupdf/fontagl.o \ + mupdf/fontenc.o \ + mupdf/fontfile.o \ + mupdf/font.o \ + mupdf/type3.o \ + mupdf/page.o \ + mupdf/build.o \ + mupdf/interpret.o ar cru $(@) $(?) ranlib $(@) @@ -103,9 +174,8 @@ pdfrip: test/pdfrip.o $(CC) -o $(@) $(?) libmupdf.a libfonts.a libfitz.a $(LDLIBS) pdfdebug: test/pdfdebug.o - $(CC) -o $(@) $(?) libmupdf.a libfitz.a $(LDLIBS) + $(CC) -o $(@) $(?) libmupdf.a libfonts.a libfitz.a $(LDLIBS) pdfclean: test/pdfclean.o - $(CC) -o $(@) $(?) libmupdf.a libfitz.a $(LDLIBS) - + $(CC) -o $(@) $(?) libmupdf.a libfonts.a libfitz.a $(LDLIBS) diff --git a/mupdf/nametree.c b/mupdf/nametree.c index 2dd0d76d..8f4e9561 100644 --- a/mupdf/nametree.c +++ b/mupdf/nametree.c @@ -178,7 +178,7 @@ pdf_loadnametree(pdf_nametree **pnt, pdf_xref *xref, char* key) error = pdf_loadindirect(&catalog, xref, ref); if (error) goto cleanup; -#if 1 // XXX XXX +#if 1 names = fz_dictgets(catalog, "Names"); if (!names) { diff --git a/mupdf/shade.c b/mupdf/shade.c index 18dc9cfe..12d6b525 100644 --- a/mupdf/shade.c +++ b/mupdf/shade.c @@ -8,6 +8,7 @@ pdf_loadshadefunction(fz_shade *shade, pdf_xref *xref, fz_obj *shading, float t0 float t; fz_obj *obj; pdf_function *func; + int i; obj = fz_dictgets(shading, "Function"); if (obj) @@ -18,7 +19,7 @@ pdf_loadshadefunction(fz_shade *shade, pdf_xref *xref, fz_obj *shading, float t0 if (error) return error; - for (int i = 0; i < 256; ++i) + for (i = 0; i < 256; ++i) { t = t0 + (i / 256.0) * (t1 - t0); error = pdf_evalfunction(func, &t, 1, shade->function[i], shade->cs->n); @@ -99,10 +100,6 @@ loadshadedict(fz_shade **shadep, pdf_xref *xref, fz_obj *dict, fz_obj *ref, fz_m switch(type) { -// case 1: -// error = pdf_loadtype1shade(shade, xref, dict, ref, mat); -// if (error) goto cleanup; -// break; case 2: error = pdf_loadtype2shade(shade, xref, dict, ref, mat); if (error) goto cleanup; diff --git a/mupdf/shade3.c b/mupdf/shade3.c index d56c3819..a6b4b40a 100644 --- a/mupdf/shade3.c +++ b/mupdf/shade3.c @@ -344,11 +344,12 @@ fz_buildannulusmesh(float* mesh, fz_point pt1, pt2, pt3, pt4; float step; float theta; + int n; theta = 0.; step = 3.1415921 * 2. / (float)nsegs; - for (int n=0; theta < step*nsegs; theta += step) { + for (n=0; theta < step*nsegs; theta += step) { pt1.x = cos (theta) * r1 + x1; pt1.y = sin (theta) * r1 + y1; pt2.x = cos (theta) * r0 + x0; @@ -385,6 +386,7 @@ pdf_loadtype3shade(fz_shade *shade, pdf_xref *xref, fz_obj *shading, float t0, t1; fz_obj *obj; pdf_function *func; + int i; pdf_logshade("load type3 shade {\n"); @@ -419,7 +421,7 @@ pdf_loadtype3shade(fz_shade *shade, pdf_xref *xref, fz_obj *shading, tn = t0; tn1 = t0 + tstep; - for (int i = 0; i < 10; ++i) { + for (i = 0; i < 10; ++i) { float tx0, ty0, tr0; float tx1, ty1, tr1; float c0, c1; diff --git a/test/gtkpdf.c b/test/gtkpdf.c index c50190d3..07730b38 100644 --- a/test/gtkpdf.c +++ b/test/gtkpdf.c @@ -422,7 +422,7 @@ static void mousemove(GtkWidget *widget, GdkEventMotion *event, void *data) gtk_adjustment_value_changed(adj); } else - mouseup(widget, event, data); // XXX + mouseup(widget, event, data); } static void keypress(GtkWidget *widget, GdkEventKey *event, void *data) |