Changeset 40168 for branches/eam_branches/ohana.20170822/src/libdvo

Timestamp:

Oct 15, 2017, 12:27:40 PM (9 years ago)

Author:

eugene

Message:

change opihi_int from int to long long int

Location:

branches/eam_branches/ohana.20170822/src/libdvo

Files:

• include/dvodb.h (modified) (3 diffs)
• src/dbCheckStack.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/libdvo/include/dvodb.h

@@ -3 +3 @@
 
 # define MEASURE_HAS_XCCD 1
+
+// Some values used by code moved to libdvo from opihi.
+enum {OPIHI_NOTYPE, OPIHI_FLT, OPIHI_INT};
+# define opihi_flt double
+// # define opihi_int int64_t
+# define opihi_int long long int
+# define OPIHI_INT_FMT "%lld"
 
 typedef enum {
@@ -471 +478 @@
   char    type;
   int     field;
-  // opihi_flt FltValue;
-  // opihi_int IntValue;
-  double FltValue;
-  int IntValue;
+  opihi_flt FltValue;
+  opihi_int IntValue;
+  // double FltValue;
+  // int IntValue;
 } dbStack;
 
 typedef struct {
-  // opihi_flt Flt;
-  // opihi_int Int;
-  double Flt;
-  int Int;
+  opihi_flt Flt;
+  opihi_int Int;
+  // double Flt;
+  // int Int;
 } dbValue;
 
@@ -562 +569 @@
 int dbExtractImagesReset (void);
 
-// Some values used by code moved to libdvo from opihi.
-enum {OPIHI_NOTYPE, OPIHI_FLT, OPIHI_INT};
-#define opihi_flt double
-#define opihi_int int
-
 #include "get_graphdata.h"
 

branches/eam_branches/ohana.20170822/src/libdvo/src/dbCheckStack.c

@@ -43 +43 @@
        * an int unless proven otherwise **/
       stack[i].FltValue = strtod (stack[i].name, &c1);
-      stack[i].IntValue = strtol (stack[i].name, &c2, 0);
+      stack[i].IntValue = strtoll (stack[i].name, &c2, 0);
       if (c2 == stack[i].name + strlen (stack[i].name)) {
         stack[i].type  |= DB_STACK_INT;