Changeset 37807 for trunk/Ohana/src/addstar/include/addstar.h

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/include/addstar.h (modified) (3 diffs)

trunk/Ohana/src/addstar/include/addstar.h

@@ -20 +20 @@
 # define IN_REGION(R,D) ( \
 ((D) >= region[0].Dmin) && ((D) < region[0].Dmax) && \
-((R) >= region[0].Rmin)  && ((R) < region[0].Rmax))
+((R) >= region[0].Rmin) && ((R) < region[0].Rmax))
 
 /* grab named photcode */
@@ -31 +31 @@
 # define dCOS(A)   ((double) cos ((double)RAD_DEG*A))
 # define dSIN(A)   ((double) sin ((double)RAD_DEG*A))
+
+# define myAbortF(FORMAT,...) { fprintf (stderr, FORMAT, __VA_ARGS__); abort(); }
 
 typedef struct {
@@ -326 +328 @@
 int strextend (char *input, char *format,...);
 
+void initMosaicCoords ();
+void saveMosaicCoords (Coords *input);
+
+
 /** 
     there is an inconsistency to be resolved: fixed structures (like Image)