diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2013-03-21 22:03:12 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-03-22 01:06:10 +0000 |
| commit | 7b334e226f7ac03352461935e7193d4c9a27ddca (patch) | |
| tree | d4d768c49164a9c885c9f5d784c6a88cc99ae80b /apps | |
| parent | bf08301ded2f44e33bebf5572587a9c7102dcc98 (diff) | |
| download | mupdf-7b334e226f7ac03352461935e7193d4c9a27ddca.tar.xz | |
Squash some warnings.
Some -Wshadow ones, plus some 'set but not used' ones.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pdfapp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/apps/pdfapp.c b/apps/pdfapp.c index bc0c3188..cdb110c6 100644 --- a/apps/pdfapp.c +++ b/apps/pdfapp.c @@ -1340,15 +1340,15 @@ void pdfapp_onkey(pdfapp_t *app, int c) void pdfapp_onmouse(pdfapp_t *app, int x, int y, int btn, int modifiers, int state) { fz_context *ctx = app->ctx; - fz_irect rect; + fz_irect irect; fz_link *link; fz_matrix ctm; fz_point p; int processed = 0; - fz_pixmap_bbox(app->ctx, app->image, &rect); - p.x = x - app->panx + rect.x0; - p.y = y - app->pany + rect.y0; + fz_pixmap_bbox(app->ctx, app->image, &irect); + p.x = x - app->panx + irect.x0; + p.y = y - app->pany + irect.y0; pdfapp_viewctm(&ctm, app); fz_invert_matrix(&ctm, &ctm); @@ -1533,10 +1533,10 @@ void pdfapp_onmouse(pdfapp_t *app, int x, int y, int btn, int modifiers, int sta if (app->iscopying) { app->iscopying = 0; - app->selr.x0 = fz_mini(app->selx, x) - app->panx + rect.x0; - app->selr.x1 = fz_maxi(app->selx, x) - app->panx + rect.x0; - app->selr.y0 = fz_mini(app->sely, y) - app->pany + rect.y0; - app->selr.y1 = fz_maxi(app->sely, y) - app->pany + rect.y0; + app->selr.x0 = fz_mini(app->selx, x) - app->panx + irect.x0; + app->selr.x1 = fz_maxi(app->selx, x) - app->panx + irect.x0; + app->selr.y0 = fz_mini(app->sely, y) - app->pany + irect.y0; + app->selr.y1 = fz_maxi(app->sely, y) - app->pany + irect.y0; winrepaint(app); if (app->selr.x0 < app->selr.x1 && app->selr.y0 < app->selr.y1) windocopy(app); @@ -1603,10 +1603,10 @@ void pdfapp_onmouse(pdfapp_t *app, int x, int y, int btn, int modifiers, int sta else if (app->iscopying) { - app->selr.x0 = fz_mini(app->selx, x) - app->panx + rect.x0; - app->selr.x1 = fz_maxi(app->selx, x) - app->panx + rect.x0; - app->selr.y0 = fz_mini(app->sely, y) - app->pany + rect.y0; - app->selr.y1 = fz_maxi(app->sely, y) - app->pany + rect.y0; + app->selr.x0 = fz_mini(app->selx, x) - app->panx + irect.x0; + app->selr.x1 = fz_maxi(app->selx, x) - app->panx + irect.x0; + app->selr.y0 = fz_mini(app->sely, y) - app->pany + irect.y0; + app->selr.y1 = fz_maxi(app->sely, y) - app->pany + irect.y0; winrepaint(app); } |