Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/vis12/src/include/Diderot/diderot.h
ViewVC logotype

Diff of /branches/vis12/src/include/Diderot/diderot.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1977, Mon Jul 16 20:04:34 2012 UTC revision 1978, Sat Jul 21 16:19:40 2012 UTC
# Line 31  Line 31 
31  #  include <pthread.h>  #  include <pthread.h>
32  #endif  #endif
33    
34    #if defined (DIDEROT_SINGLE_PRECISION)
35    #  define SIZEOF_DIDEROT_REAL   4
36    #elif defined (DIDEROT_SINGLE_PRECISION)
37    #  define SIZEOF_DIDEROT_REAL   8
38    #else
39    #  error must define either DIDEROT_SINGLE_PRECISION or DIDEROT_SINGLE_PRECISION
40    #endif
41    #if defined (DIDEROT_INT)
42    #  define SIZEOF_DIDEROT_INT    4
43    #elif defined (DIDEROT_LONGINT)
44    #  define SIZEOF_DIDEROT_INT    8
45    #else
46    #  error must define either DIDEROT_SINGLE_PRECISION or DIDEROT_SINGLE_PRECISION
47    #endif
48    
49  /* gcc has a bug that breaks code that uses 8-byte vectors (e.g., vec2f_t), but clang  /* gcc has a bug that breaks code that uses 8-byte vectors (e.g., vec2f_t), but clang
50   * handles the code correctly.   * handles the code correctly.
51   */   */
# Line 106  Line 121 
121  #define NEWSTR(s)       strcpy((char *)CheckedAlloc(strlen(s)+1), s)  #define NEWSTR(s)       strcpy((char *)CheckedAlloc(strlen(s)+1), s)
122  #define FREE(p)         do { if (p != 0) free(p); } while(0)  #define FREE(p)         do { if (p != 0) free(p); } while(0)
123    
 /* dynamic sequences */  
 #include "dyn-seq.h"  
   
   
124  /********** scalar math functions **********/  /********** scalar math functions **********/
125    
126  STATIC_INLINE Diderot_real_t min (Diderot_real_t a, Diderot_real_t b)  STATIC_INLINE Diderot_real_t min (Diderot_real_t a, Diderot_real_t b)
# Line 168  Line 179 
179  /********** other Diderot support functions **********/  /********** other Diderot support functions **********/
180    
181  #include "inline-image.h"  #include "inline-image.h"
182    #include "dyn-seq.h"
183    
184  /********** other math functions **********/  /********** other math functions **********/
185  int Diderot_evals2x2 (  int Diderot_evals2x2 (

Legend:
Removed from v.1977  
changed lines
  Added in v.1978

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0