lannybroo / numpyIO / changeset / d2415a5d8104

@@ -34,6 +34,15 @@ 2003-03-31: Coded and tested.
 import numpy
 type2size = dict(
     b = 1, B = 1, c = 1,
     s = 2, w = 2, h = 2, H = 2,
     f = 4, i = 4, I = 4, l = 4, u = 4,
     d = 8, F = 8,
     D = 16,
+)
 type2size['1'] = 1
 def fread(fid, num=None, readType='f', mem_type=None, byteswap=0):
     '''g = numpyIO.fread(fid, num, read_type, {mem_type, byteswap})
@@ -48,19 +57,7 @@ OPTIONAL
                  different endianness).    Default = 0'''
     # how many bytes per number
     if readType in '1bcB':
         byteSize = 1
     elif readType in 'swhH':
         byteSize = 2
     elif readType in 'fiIlu':
         byteSize = 4
     elif readType in 'dF':
         byteSize = 8
     elif readType=='D':
         byteSize = 16
     else:
         print readType
-        raise TypeError
+    byteSize = type2size[readType]
     # figure out num
     if not num:
@@ -106,18 +103,14 @@ OPTIONAL
     if write_type==0 or write_type==None:
         write_type = mem_type
     # figure out total size of myArray
     temp1 = myArray.shape
     totalSize = 1
     for i in temp1:
-        totalSize = totalSize * i
+    totalSize = myArray.size
     if num==None:
         num = totalSize
     # if not all elements of myArray are written
     if num!=totalSize:
-        myArray1 = numpy.ravel(myArray)[:num]
+        myArray1 = myArray.ravel()[:num]
     else:
         myArray1 = myArray