[eso-midas] 04/16: Use fabs() instead of abs() since we removed the local abs() macro

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository eso-midas.

commit 200d6927308a048a8932bb058dee1b26e41d540c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Mar 25 13:24:48 2015 +0100

    Use fabs() instead of abs() since we removed the local abs() macro
---
 debian/patches/resolve_conflictig_macro.patch | 76 +++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/debian/patches/resolve_conflictig_macro.patch b/debian/patches/resolve_conflictig_macro.patch
index 8d96257..50ff4cf 100644
--- a/debian/patches/resolve_conflictig_macro.patch
+++ b/debian/patches/resolve_conflictig_macro.patch
@@ -13,3 +13,79 @@ Description: Remove abs() macro
  #define sign(X, Y) (((Y) < 0) ? -abs(X) : abs(X))  /* Vorzeichen von  */
                                                 /* Y mal abs(X)        */
  #define sqr(X) ((X) * (X))                     /* Quadrat von X       */
+--- a/prim/dio/libsrc/fitsrhd.c
++++ b/prim/dio/libsrc/fitsrhd.c
+@@ -532,8 +532,8 @@
+ */
+ 
+              else if ( (dtype == D_I2_FORMAT) && 
+-                  (abs(bfdef->bzero-32768.0) < eps) &&
+-	          (abs(bfdef->bscale-1.0) < eps) )
++                  (fabs(bfdef->bzero-32768.0) < eps) &&
++	          (fabs(bfdef->bscale-1.0) < eps) )
+                 {
+ 		xtype = D_UI2_FORMAT;
+ 		bfdef->bitpix = -16;
+--- a/stdred/feros/libsrc/glsp.c
++++ b/stdred/feros/libsrc/glsp.c
+@@ -19,6 +19,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <math.h>
+ 
+ /* FEROS specific includes */
+ 
+@@ -630,13 +631,13 @@
+     und strenge Regularitaet ueberprueft
+ */
+ ud1[n] = ud2[n] = ud2[n - 1] = 0.0;
+-def_reg = abs (md[1]) + abs (ud1[1]) + abs (ud2[1]);
++def_reg = fabs (md[1]) + abs (ud1[1]) + abs (ud2[1]);
+ if (def_reg == 0.0)
+ return (1);
+ def_reg = 1. / def_reg;
+ if (md[1] < 0.0)
+ return (-1);
+-if (abs (md[1]) * def_reg <= MACH4_EPS)
++if (fabs (md[1]) * def_reg <= MACH4_EPS)
+ return (1);
+ /*
+     Zerlegung der Matrix bei gleichzeitiger Ueberpruefung
+@@ -646,14 +647,14 @@
+ ud1[1] /= md[1];
+ h_var_2 = ud2[1];
+ ud2[1] /= md[1];
+-def_reg = abs (h_var_1) + abs (md[2]) + abs (ud1[2]) + abs (ud2[2]);
++def_reg = fabs (h_var_1) + fabs (md[2]) + fabs (ud1[2]) + fabs (ud2[2]);
+ if (def_reg == 0.0)
+ return (1);
+ def_reg = 1. / def_reg;
+ md[2] -= h_var_1 * ud1[1];
+ if (md[2] < 0.0)
+ return (-1);
+-if (abs (md[2]) <= MACH4_EPS)
++if (fabs (md[2]) <= MACH4_EPS)
+ return (1);
+ 
+ h_var_1 = ud1[2];
+@@ -662,8 +663,8 @@
+ ud2[2] /= md[2];
+ for (i = 3; i <= n; ++i)
+    {
+-   def_reg = abs (h_var_2) + abs (h_var_1) + abs (md[i])
+-   + abs (ud1[i]) + abs (ud2[i]);
++   def_reg = fabs (h_var_2) + fabs (h_var_1) + fabs (md[i])
++   + fabs (ud1[i]) + fabs (ud2[i]);
+    if (def_reg == 0.0)
+    return (1);
+    def_reg = 1. / def_reg;
+@@ -671,7 +672,7 @@
+    md[i] -= (md[i - 1] * sqr (ud1[i - 1]) + h_var_2 * ud2[i - 2]);
+    if (md[i] < 0.0)
+    return (-1);
+-   if (abs (md[i] * def_reg) <= MACH4_EPS)
++   if (fabs (md[i] * def_reg) <= MACH4_EPS)
+    return (1);
+    if (i < n)
+       {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git