From f7d24971c802bdc1f8cb06f4cd2fddcc5cb8dd7e Mon Sep 17 00:00:00 2001
From: Remco Rijnders <remco@webconquest.com>
Date: Fri, 13 Feb 2015 10:41:54 +0100
Subject: [PATCH 17/18] =?UTF-8?q?Fix=20compile=20time=20warning=20on=20inl?=
 =?UTF-8?q?ined=20function:=20inlining=20failed=20in=20call=20to=20?=
 =?UTF-8?q?=E2=80=98component=5Finterpolation=5Fhardcoded.isra.3.part.4?=
 =?UTF-8?q?=E2=80=99:=20call=20is=20unlikely=20and=20code=20size=20would?=
 =?UTF-8?q?=20grow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libAfterImage/transform.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/libAfterImage/transform.c b/libAfterImage/transform.c
index f308fcd5..de1c692d 100644
--- a/libAfterImage/transform.c
+++ b/libAfterImage/transform.c
@@ -392,7 +392,7 @@ start_component_interpolation( CARD32 *c1, CARD32 *c2, CARD32 *c3, CARD32 *c4, r
 	}
 }
 
-static inline void
+static void
 component_interpolation_hardcoded( CARD32 *c1, CARD32 *c2, CARD32 *c3, CARD32 *c4, register CARD32 *T, CARD32 *unused, CARD16 kind, int len)
 {
 	register int i;
@@ -400,17 +400,9 @@ component_interpolation_hardcoded( CARD32 *c1, CARD32 *c2, CARD32 *c3, CARD32 *c
 	{
 		for( i = 0 ; i < len ; i++ )
 		{
-#if 1
 			/* its seems that this simple formula is completely sufficient
-			   and even better then more complicated one : */
+			   and even better than more complicated one : */
 			T[i] = (c2[i]+c3[i])>>1 ;
-#else
-    		register int minus = c1[i]+c4[i] ;
-			register int plus  = (c2[i]<<1)+c2[i]+(c3[i]<<1)+c3[i];
-
-			T[i] = ( (plus>>1) < minus )?(c2[i]+c3[i])>>1 :
-								   		 (plus-minus)>>2;
-#endif
 		}
 	}else if( kind == 2 )
 	{
-- 
2.22.0