Changeset 37803 for branches/eam_branches/ipp-20140904/Ohana/src/libdvo/include/dvo.h

Timestamp:

Jan 11, 2015, 2:02:45 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140904/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/include/dvo.h (modified) (2 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/include/dvo.h

@@ -332 +332 @@
 # include "cmf-ps1-dv3.h"
 # include "cmf-ps1-sv3.h"
+# include "cmf-ps1-sv4.h"
 # include "cmf-ps1-v5.h"
 # include "cmf-ps1-v5-lensing.h"
+# include "cmf-ps1-v5-lensing-alt.h"
 
 typedef struct {
@@ -1055 +1057 @@
 # define LENSFIELD(NAME) float LensValue_##NAME (PhotCode *code, Lensobj *lensobj);
 
-LENSFIELD(X11_sm_obj);
-LENSFIELD(X12_sm_obj);
-LENSFIELD(X22_sm_obj);
-LENSFIELD(E1_sm_obj);
-LENSFIELD(E2_sm_obj);
-
-LENSFIELD(X11_sh_obj);
-LENSFIELD(X12_sh_obj);
-LENSFIELD(X22_sh_obj);
-LENSFIELD(E1_sh_obj);
-LENSFIELD(E2_sh_obj);
-
-LENSFIELD(X11_sm_psf);
-LENSFIELD(X12_sm_psf);
-LENSFIELD(X22_sm_psf);
-LENSFIELD(E1_sm_psf);
-LENSFIELD(E2_sm_psf);
-
-LENSFIELD(X11_sh_psf);
-LENSFIELD(X12_sh_psf);
-LENSFIELD(X22_sh_psf);
-LENSFIELD(E1_sh_psf);
-LENSFIELD(E2_sh_psf);
+LENSFIELD(X11_sm_obj)
+LENSFIELD(X12_sm_obj)
+LENSFIELD(X22_sm_obj)
+LENSFIELD(E1_sm_obj)
+LENSFIELD(E2_sm_obj)
+
+LENSFIELD(X11_sh_obj)
+LENSFIELD(X12_sh_obj)
+LENSFIELD(X22_sh_obj)
+LENSFIELD(E1_sh_obj)
+LENSFIELD(E2_sh_obj)
+
+LENSFIELD(X11_sm_psf)
+LENSFIELD(X12_sm_psf)
+LENSFIELD(X22_sm_psf)
+LENSFIELD(E1_sm_psf)
+LENSFIELD(E2_sm_psf)
+
+LENSFIELD(X11_sh_psf)
+LENSFIELD(X12_sh_psf)
+LENSFIELD(X22_sh_psf)
+LENSFIELD(E1_sh_psf)
+LENSFIELD(E2_sh_psf)
 
 # undef LENSFIELD