nsxiv71e61b1
Made zoomdiff an inline function
+8 −4
1 file changed
- M image.c +8 −4
| @@ -38,13 +38,17 @@ | |||
| 38 | 38 | #include <gif_lib.h> | |
| 39 | 39 | #endif | |
| 40 | 40 | ||
| 41 | − | #define ZOOMDIFF(z1,z2) ((z1) - (z2) > 0.001 || (z1) - (z2) < -0.001) | |
| 42 | − | ||
| 43 | 41 | enum { MIN_GIF_DELAY = 50 }; | |
| 44 | 42 | ||
| 45 | 43 | float zoom_min; | |
| 46 | 44 | float zoom_max; | |
| 47 | 45 | ||
| 46 | + | static inline | |
| 47 | + | bool zoomdiff(float z1, float z2) { | |
| 48 | + | const float mindelta = 0.001; | |
| 49 | + | return (z1 - z2 > mindelta) || (z1 - z2 < mindelta); | |
| 50 | + | } | |
| 51 | + | ||
| 48 | 52 | void img_init(img_t *img, win_t *win) { | |
| 49 | 53 | zoom_min = zoom_levels[0] / 100.0; | |
| 50 | 54 | zoom_max = zoom_levels[ARRLEN(zoom_levels) - 1] / 100.0; | |
| @@ -394,7 +398,7 @@ bool img_fit(img_t *img) { | |||
| 394 | 398 | z = MAX(z, zoom_min); | |
| 395 | 399 | z = MIN(z, zmax); | |
| 396 | 400 | ||
| 397 | − | if (ZOOMDIFF(z, img->zoom)) { | |
| 401 | + | if (zoomdiff(z, img->zoom)) { | |
| 398 | 402 | img->zoom = z; | |
| 399 | 403 | img->dirty = true; | |
| 400 | 404 | return true; | |
| @@ -511,7 +515,7 @@ bool img_zoom(img_t *img, float z) { | |||
| 511 | 515 | ||
| 512 | 516 | img->scalemode = SCALE_ZOOM; | |
| 513 | 517 | ||
| 514 | − | if (ZOOMDIFF(z, img->zoom)) { | |
| 518 | + | if (zoomdiff(z, img->zoom)) { | |
| 515 | 519 | img->x = img->win->w / 2 - (img->win->w / 2 - img->x) * z / img->zoom; | |
| 516 | 520 | img->y = img->win->h / 2 - (img->win->h / 2 - img->y) * z / img->zoom; | |
| 517 | 521 | img->zoom = z; | |