Simplified zoomdiff function

2012-08-16 21:21:08 +02:00 · 2012-08-16 21:21:08 +02:00 · c78f55ebb4
commit c78f55ebb4
parent f2a3d73212
2 changed files with 1 additions and 10 deletions
--- a/image.c
+++ b/image.c
@ -37,13 +37,7 @@ float zoom_min;
 float zoom_max;

 int zoomdiff(float z1, float z2) {
-	float d = z1 - z2;
-	const float mindelta = 0.001;
-
-	if (ABS(d) < mindelta)
-		return 0;
-	else
-		return d < 0 ? -1 : 1;
+	return (int) (z1 * 1000.0 - z2 * 1000.0);
 }

 void img_init(img_t *img, win_t *win) {
--- a/util.h
+++ b/util.h
@ -27,9 +27,6 @@

 #include "types.h"

-#ifndef ABS
-#define ABS(a)   ((a) < 0 ? -(a) : (a))
-#endif
 #ifndef MIN
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif