From 762196328ab7e60f1d2908fd5a337d2ca99726dd Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 1 Oct 2007 20:12:53 +0000
Subject: add a couple of additional useful macros

git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@33 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce
---
 add.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'add.c')

diff --git a/add.c b/add.c
index ec10131..b7714f4 100644
--- a/add.c
+++ b/add.c
@@ -10,9 +10,7 @@ static void add_u8(void *dst, size_t dstr, const void *src1, size_t sstr1, const
     for (; bytes > 0; bytes--, d += dstr, s1 += sstr1, s2 += sstr2) {
         int16_t v = (int16_t) *s1 + (int16_t) *s2 - 0x80;
 
-        if (v > 0xFF) v =  0xFF;
-        if (v < 0) v = 0;
-        
+        v = CLAMP(v, 0, 0xFF);
         *d = (uint8_t) v;
     }
 }
@@ -28,9 +26,7 @@ static void add_s32(void *dst, size_t dstr, const void *src1, size_t sstr1, cons
     for (; bytes > 0; bytes--, d += dstr/sizeof(int32_t), s1 += sstr1/sizeof(int32_t), s2 += sstr2/sizeof(int32_t)) {
         int64_t v = (int64_t) *s1 + (uint64_t) *s2;
 
-        if (v >  0x7FFFFFFF) v =  0x7FFFFFFF;
-        if (v < -0x80000000) v = -0x80000000;
-        
+        v = CLAMP(v, -0x80000000, 0x7FFFFFFF);
         *d = (int32_t) v;
     }
 }
-- 
cgit