Changeset 4865 for trunk/Ohana/src/libohana/include/dvo.h

Timestamp:

Aug 24, 2005, 8:51:56 AM (21 years ago)

Author:

eugene

Message:

adding internal vs external formats for average, measure, secfilt

File:

• trunk/Ohana/src/libohana/include/dvo.h (modified) (2 diffs)

trunk/Ohana/src/libohana/include/dvo.h

@@ -187 +187 @@
 char     *GetPhotcodeNamebyCode (int code);
 
-double PhotInst (Measure *measure);
-double PhotCat (Measure *measure);
-double PhotSys (Measure *measure, Average *average, SecFilt *secfilt);
-double PhotRel (Measure *measure, Average *average, SecFilt *secfilt);
-double PhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code);
-double PhotAve (PhotCode *code, Average *average, SecFilt *secfilt);
-double PhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure);
-double PhotXm (PhotCode *code, Average *average, SecFilt *secfilt);
-double PhotdM (PhotCode *code, Average *average, SecFilt *secfilt);
-
+float PhotInst (Measure *measure);
+float PhotCat (Measure *measure);
+float PhotSys (Measure *measure, Average *average, SecFilt *secfilt);
+float PhotRel (Measure *measure, Average *average, SecFilt *secfilt);
+float PhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code);
+float PhotAve (PhotCode *code, Average *average, SecFilt *secfilt);
+float PhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure);
+float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt);
+float PhotdM (PhotCode *code, Average *average, SecFilt *secfilt);
+
+# if (0)
 short iPhotInst (Measure *measure);
 short iPhotAbs (Measure *measure);
@@ -207 +208 @@
 short iPhotXm (PhotCode *code, Average *average, SecFilt *secfilt);
 short iPhotdM (PhotCode *code, Average *average, SecFilt *secfilt);
-
-short iPhotColor (Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code);
+# endif
+
+float iPhotColor (Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code);
 int PhotColor (Average *average, SecFilt *secfilt, Measure *measure, int c1, int c2, double *color);