diff options
| author | Thomas White <taw@physics.org> | 2010-03-16 13:53:44 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2010-03-16 13:53:44 +0100 |
| commit | 99e6385361a836df2dbb8fa6c340e4e963ba3da4 (patch) | |
| tree | a98808d4807206586f9ac3d3cb0e5c78f852aebc | |
| parent | 589618b385568caa5ab862ce129261676a854422 (diff) | |
Fixes for standards compliance
| -rw-r--r-- | data/diffraction.cl | 4 | ||||
| -rw-r--r-- | src/cell.c | 2 | ||||
| -rw-r--r-- | src/image.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/data/diffraction.cl b/data/diffraction.cl index 63d807c2..a42cfc93 100644 --- a/data/diffraction.cl +++ b/data/diffraction.cl @@ -117,14 +117,14 @@ float2 get_sfac(global float2 *sfacs, float16 cell, float4 q) /* Return a silly value if indices are out of range */ if ( (abs(h) > INDMAX) || (abs(k) > INDMAX) || (abs(l) > INDMAX) ) { - return 100000.0; + return (float2)(100000.0, 0.0); } h = (h>=0) ? h : h+IDIM; k = (k>=0) ? k : k+IDIM; l = (l>=0) ? l : l+IDIM; - if ( (h>=IDIM) || (k>=IDIM) || (l>=IDIM) ) return 100000.0; + if ( (h>=IDIM) || (k>=IDIM) || (l>=IDIM) ) return (float2)(100000.0, 0.0); idx = h + (IDIM*k) + (IDIM*IDIM*l); @@ -401,7 +401,7 @@ UnitCell *match_cell(UnitCell *cell, UnitCell *template, int verbose) double angles[3]; struct cvec *cand[3]; UnitCell *new_cell = NULL; - float best_fom = +HUGE_VALF; + float best_fom = +999999999.9; /* Large number.. */ int ncand[3] = {0,0,0}; float ltl = 5.0; /* percent */ float angtol = deg2rad(5.0); diff --git a/src/image.h b/src/image.h index 5159d63e..5715d570 100644 --- a/src/image.h +++ b/src/image.h @@ -19,6 +19,7 @@ #include <stdint.h> #include <complex.h> +#include <sys/types.h> #include "utils.h" #include "cell.h" |