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

SCM Repository

[diderot] Diff of /branches/pure-cfg/src/include/Diderot/diderot.h
ViewVC logotype

Diff of /branches/pure-cfg/src/include/Diderot/diderot.h

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

revision 556, Tue Feb 22 19:58:28 2011 UTC revision 557, Tue Feb 22 20:03:12 2011 UTC
# Line 47  Line 47 
47  /* typedefs for Diderot types */  /* typedefs for Diderot types */
48  typedef int32_t Diderot_int_t;  typedef int32_t Diderot_int_t;
49  typedef float Diderot_real_t;  typedef float Diderot_real_t;
50  typedef f4union Diderot_vec3_t; // padded to fit in SSE register  typedef union4f Diderot_vec3_t; // padded to fit in SSE register
51  typedef f4union Diderot_vec4_t;  typedef union4f Diderot_vec4_t;
52  typedef const char *Diderot_string_t;  typedef const char *Diderot_string_t;
53    
54    typedef Diderot_real_t Diderot_Mat2x2_t[4];
55    typedef Diderot_real_t Diderot_Mat3x3_t[9];
56    typedef Diderot_real_t Diderot_Mat4x4_t[16];
57    
58  typedef struct {                // wrapper for 1D image data  typedef struct {                // wrapper for 1D image data
59      uint32_t    dim;            // dimension (== 1)      uint32_t    dim;            // dimension (== 1)
60      uint32_t    size[1];      uint32_t    size[1];
# Line 114  Line 118 
118  // NOTE: there might be a vectorized way to do this compare!  // NOTE: there might be a vectorized way to do this compare!
119  // cvtps2pi -- converts vector of floats to vector of int32_t values  // cvtps2pi -- converts vector of floats to vector of int32_t values
120    
121      return ((s <= pos.f[0]) && (pos.f[0] < (img->size[0] - s))      return ((s <= pos.r[0]) && (pos.r[0] < (img->size[0] - s))
122          &&  (s <= pos.f[1]) && (pos.f[1] < (img->size[1] - s))          &&  (s <= pos.r[1]) && (pos.r[1] < (img->size[1] - s))
123          &&  (s <= pos.f[2]) && (pos.f[2] < (img->size[2] - s)));          &&  (s <= pos.r[2]) && (pos.r[2] < (img->size[2] - s)));
124  }  }
125    
126  #endif /* !_DIDEROT_H_ */  #endif /* !_DIDEROT_H_ */

Legend:
Removed from v.556  
changed lines
  Added in v.557

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