diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
| commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
| tree | f053238978479e408a2b83571443e132f30586ab /src/cmd/paint | |
| parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
| parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
| download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/paint')
| -rw-r--r-- | src/cmd/paint/eenter.c | 2 | ||||
| -rw-r--r-- | src/cmd/paint/paint.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/paint/eenter.c b/src/cmd/paint/eenter.c index 6645820c..d3d68a35 100644 --- a/src/cmd/paint/eenter.c +++ b/src/cmd/paint/eenter.c @@ -78,6 +78,7 @@ eenter(char *ask, char *buf, int len, Mouse *m) b = screen; sc = b->clipr; replclipr(b, 0, b->r); + t = ZP; while(!done){ p = stringsize(font, buf ? buf : ""); @@ -255,4 +256,3 @@ nodraw: return n; } - diff --git a/src/cmd/paint/paint.c b/src/cmd/paint/paint.c index 7dce3710..e7f502cf 100644 --- a/src/cmd/paint/paint.c +++ b/src/cmd/paint/paint.c @@ -97,7 +97,7 @@ strokedraw(Image *dst, Rectangle r, Image *ink, int brush) * mp and sp get aligned with bot.min. */ static void -gendrawdiff(Image *dst, Rectangle bot, Rectangle top, +gendrawdiff(Image *dst, Rectangle bot, Rectangle top, Image *src, Point sp, Image *mask, Point mp, int op) { Rectangle r; @@ -482,7 +482,7 @@ center(void) { cpos = ZP; if(canvas) - cpos = addpt(canvas->r.min, + cpos = addpt(canvas->r.min, divpt(subpt(canvas->r.max, canvas->r.min), 2)); spos = addpt(screen->r.min, divpt(subpt(screen->r.max, screen->r.min), 2)); @@ -633,7 +633,7 @@ main(int argc, char *argv[]) if(argc == 1) filename = strdup(argv[0]); else if(argc != 0) - usage(); + usage(); if(initdraw(0, 0, "paint") < 0) sysfatal("initdraw: %r"); |