Changeset 37822 for branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/relastro/src/relastroVisual.c

Timestamp:

Jan 12, 2015, 12:29:24 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge/Ohana

Files:

• . (modified) (1 prop)
• src/relastro/src/relastroVisual.c (modified) (2 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/relastro/src/relastroVisual.c

@@ -24 +24 @@
 /** Spawn a kapa window */
 static int initWindow(int *kapid) {
+  if (NTHREADS) {
+    fprintf (stderr, "-visual and -threads are incompatible, quitting\n");
+    exit (2);
+  }
   if (*kapid == -1) {
     *kapid = KapaOpenNamedSocket("kapa", "relastro_plots");
@@ -348 +352 @@
 
   int i;
-  for(i = 0; i < numObj; i++) {
+  for (i = 0; i < numObj; i++) {
     if (raw[i].mask) continue; // XXX