Changeset 1090 for trunk/src

Timestamp:

Aug 4, 2008, 5:51:37 PM (16 years ago)

Author:

gah

Message:

various fixes

Location:

trunk/src/core

Files:

• RpDXWriter.cc (modified) (2 diffs)
• RpUtils.cc (modified) (1 diff)
• RpUtilsFInterface.cc (modified) (2 diffs)

trunk/src/core/RpDXWriter.cc

@@ -82 +82 @@
             if (j != i) {
                 _delta[idx] = 0.0f;
-            }
-            else {
+            } else {
                 _delta[idx] = 1.0f;
             }
@@ -321 +320 @@
         _dataBuf.read(&f,1);
         // nanovis and many other progs fail when you send it inf data
-        if (isinf(f)) {
+        if (!isfinite(f)) {
             f = 0.0;
         }

trunk/src/core/RpUtils.cc

@@ -21 +21 @@
 using namespace Rappture::Utils;
 
-int progress(int percent, const char* text)
+int 
+progress(int percent, const char* text)
 {
-    int retVal = 0;
     if (text != NULL) {
         std::cout << "=RAPPTURE-PROGRESS=>" << percent << " " << text << std::endl;
-    }
-    else {
+    } else {
         std::cout << "=RAPPTURE-PROGRESS=>" << percent << std::endl;
     }
-    return retVal;
+    return 0;
 }
 

trunk/src/core/RpUtilsFInterface.cc

@@ -18 +18 @@
 
 #ifdef __cplusplus
-extern "C" {
+extern "C" int rp_utils_progress(int *percent, char *text, int text_len);
 #endif
+
+#include <stdlib.h>
 
 /**********************************************************************/
@@ -27 +29 @@
  */
 
-int rp_utils_progress(int* percent, char* text, int text_len)
+int 
+rp_utils_progress(int *percentPtr, char *text, int text_len)
 {
-    int retVal = 1;
-    const char* inText = NULL;
+    const char* inText;
     inText = null_terminate(text, text_len);
     if (inText != NULL) {
-        retVal = Rappture::Utils::progress(*percent,inText);
-        free((void*)inText);
-    }
+        return 1;
+    } 
+    int retVal;
+    retVal = Rappture::Utils::progress(*percentPtr, inText);
+    free((void*)inText);
     return retVal;
 }
 
-#ifdef __cplusplus
-}
-#endif