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/cl-inline-image.h
ViewVC logotype

Diff of /branches/pure-cfg/src/include/Diderot/cl-inline-image.h

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

revision 1289, Tue Jun 7 14:58:48 2011 UTC revision 1290, Tue Jun 7 16:22:05 2011 UTC
# Line 1  Line 1 
1  /*! \file cl-types.h  /*! \file cl-inline-image.h
2   *   *
3   * \author Lamont Samuels   * \author Lamont Samuels
4   */   */
# Line 11  Line 11 
11  #ifndef _DIDEROT_CL_INLINE_IMAGE_H_  #ifndef _DIDEROT_CL_INLINE_IMAGE_H_
12  #define _DIDEROT_CL_INLINE_IMAGE_H_  #define _DIDEROT_CL_INLINE_IMAGE_H_
13    
14    #ifndef _DIDEROT_CL_TYPES_H_
 #ifndef _DIDEROT_TYPES_H_  
15  #  include "cl-types.h"  #  include "cl-types.h"
16  #endif  #endif
17  #ifndef _DIDEROT_INLINE_MATRIX_H_  #ifndef _DIDEROT_CL_INLINE_MATRIX_H_
18  #  include "cl-inline-matrix.h"  #  include "cl-inline-matrix.h"
19  #endif  #endif
20    
# Line 46  Line 45 
45    
46  STATIC_INLINE float2 ToImageSpace2f (Diderot_image2D_t *img, float2 p)  STATIC_INLINE float2 ToImageSpace2f (Diderot_image2D_t *img, float2 p)
47  {  {
48      return (float2)(dot(img->w2i[0], p), dot2f(img->w2i[1], p)) + img->tVec;      return (float2)(dot(img->w2i[0], p), dot(img->w2i[1], p)) + img->tVec;
49  }  }
50    
51  STATIC_INLINE float2 ToWorldSpace2f (Diderot_image2D_t *img, float2 g)  STATIC_INLINE float2 ToWorldSpace2f (Diderot_image2D_t *img, float2 g)
# Line 62  Line 61 
61      mulMat2x2Mat2x2f (tmp, img->w2iT, src);      mulMat2x2Mat2x2f (tmp, img->w2iT, src);
62      mulMat2x2Mat2x2f (dst, tmp, img->w2i);      mulMat2x2Mat2x2f (dst, tmp, img->w2i);
63  }  }
64    
65  /***** 3D Image functions *****/  /***** 3D Image functions *****/
66    
67  // check if pos is inside the img, assuming that we have a border of width s.  // check if pos is inside the img, assuming that we have a border of width s.
# Line 93  Line 93 
93      mulMat3x3Mat3x3f (dst, tmp, img->w2i);      mulMat3x3Mat3x3f (dst, tmp, img->w2i);
94  }  }
95    
   
   
96  #endif /* !_DIDEROT_CL_INLINE_IMAGE_H_ */  #endif /* !_DIDEROT_CL_INLINE_IMAGE_H_ */
97    

Legend:
Removed from v.1289  
changed lines
  Added in v.1290

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