Changeset 495Tweet

Timestamp:

Jul 13, 2005, 7:45:47 PM (17 years ago)

Author:

Jean-Yves Lamoureux

Message:

• src/math.c src/bitmap.c src/caca.h Removed powf call, added caca_powf, to remove libm depencies and problems on old compilers/linkers.

Location:

libcaca/trunk/src

Files:

• bitmap.c (modified) (2 diffs)
• caca.h (modified) (1 diff)
• math.c (modified) (1 diff)

libcaca/trunk/src/bitmap.c

@@ -46 +46 @@
 #include <limits.h>
 #include <string.h>
-#include <math.h>
 
 #include "caca.h"
@@ -339 +338 @@
 
     for(i = 0; i < 4096; i++)
-        bitmap->gammatab[i] = 4096.0 * powf((float)i / 4096.0, 1.0 / gammaval);
+        bitmap->gammatab[i] = 4096.0 * caca_powf((float)i / 4096.0, 1.0 / gammaval);
 }
 

libcaca/trunk/src/caca.h

@@ -318 +318 @@
 int caca_rand(int, int);
 unsigned int caca_sqrt(unsigned int);
+float caca_powf(float x, float y);
 /*  @} */
 

libcaca/trunk/src/math.c

@@ -79 +79 @@
 }
 
+
+/**
+ * \brief powf substitute (x^y)
+ * \param x The value to be raised
+ * \param y The power to raise x of.
+ * \return \p x raised to the power of \p y
+ */
+
+float caca_powf(float x, float y)
+{
+    int i=((int)y);
+    float r=x;
+
+    if(((int)y)==1 || ((int)x)==1)
+        return x;
+
+    i--;
+    while(i--)
+    {
+        r*=x;
+    }
+    return r;
+}