Changeset dd56945 for python/lib

Timestamp:

10/30/18 14:31:57 (6 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

c8c291b

Parents:

22c1c0a

git-author:

Hal Finkel <hfinkel@…> (10/30/18 14:31:57)

git-committer:

Hal Finkel <hfinkel@…> (10/30/18 14:31:57)

Message:

import uint16 fix by Biwer, Christopher Michael <cmbiwer@…>

Location:

python/lib

Files:

• gio.cxx (modified) (2 diffs)
• gio.h (modified) (2 diffs)

python/lib/gio.cxx

@@ -49 +49 @@
     read_gio<double>(file_name,var_name,data,field_count);
   }
+  void read_gio_uint16(char* file_name, char* var_name, uint16_t* data, int field_count){
+    read_gio<uint16_t>(file_name,var_name,data,field_count);
+  }
   void read_gio_int32(char* file_name, char* var_name, int* data, int field_count){
     read_gio<int>(file_name,var_name,data,field_count);
@@ -81 +84 @@
         else if(vinfo.IsFloat && vinfo.ElementSize == 8)
           return double_type;
+        else if(!vinfo.IsFloat && vinfo.ElementSize == 2)
+          return uint16_type;
         else if(!vinfo.IsFloat && vinfo.ElementSize == 4)
           return int32_type;

python/lib/gio.h

@@ -73 +73 @@
 extern "C" void read_gio_float (char* file_name, char* var_name, float* data, int field_count);
 extern "C" void read_gio_double(char* file_name, char* var_name, double* data, int field_count);
+extern "C" void read_gio_uint16 (char* file_name, char* var_name, uint16_t* data, int field_count); 
 extern "C" void read_gio_int32 (char* file_name, char* var_name, int* data, int field_count); 
 extern "C" void read_gio_int64 (char* file_name, char* var_name, int64_t* data, int field_count);
@@ -80 +81 @@
   int32_type=2,
   int64_type=3,
+  uint16_type=4,
   type_not_found=9,
   var_not_found=10