Encapsulate imread/imwrite in class

cr2_replace.py

@@ -57,7 +57,7 @@ def main():
    os.remove(tmpfile)
 
    # read sensor image file
-   sensor = jbimage.imread(args.sensor).squeeze()
+   sensor = jbimage.image_file.read(args.sensor).squeeze()
 
    # obtain required parameters from RAW file
    width,height = tiff.get_sensor_size()

pyshared/jbimage.py

@@ -21,23 +21,27 @@
 import numpy as np
 from PIL import Image
 
-## read and write image files
+## class to read and write general image files (using PIL)
 
-def imwrite(I,outfile):
-   # Works with PIL 1.1.6 upwards
-   assert list(map(int, Image.VERSION.split('.'))) >= [1,1,6]
-   # convert to image of the correct type based on shape and dtype
-   im = Image.fromarray(I.squeeze())
-   # save to file
-   im.save(outfile, optimize=True)
-   return
+class image_file():
 
-def imread(infile):
-   im = Image.open(infile)
-   ch = len(im.mode)
-   (x,y) = im.size
-   # Works with PIL 1.1.6 upwards
-   # return array is read-only!
-   assert list(map(int, Image.VERSION.split('.'))) >= [1,1,6]
-   I = np.asarray(im).reshape(y,x,ch)
-   return I
+   @staticmethod
+   def read(infile):
+      im = Image.open(infile)
+      ch = len(im.mode)
+      (x,y) = im.size
+      # Works with PIL 1.1.6 upwards
+      # return array is read-only!
+      assert list(map(int, Image.VERSION.split('.'))) >= [1,1,6]
+      I = np.asarray(im).reshape(y,x,ch)
+      return I
+
+   @staticmethod
+   def write(I,outfile):
+      # Works with PIL 1.1.6 upwards
+      assert list(map(int, Image.VERSION.split('.'))) >= [1,1,6]
+      # convert to image of the correct type based on shape and dtype
+      im = Image.fromarray(I.squeeze())
+      # save to file
+      im.save(outfile, optimize=True)
+      return

raw_encode.py

@@ -27,8 +27,8 @@
 
 sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)),'pyshared'))
 import jbtiff
-import jbcr2
 import jbimage
+import jbcr2
 
 ## main program
 
@@ -54,7 +54,7 @@ def main():
    # read input raw file
    tiff = jbtiff.tiff_file(open(args.raw, 'rb'))
    # load sensor image
-   sensor = jbimage.imread(args.input).squeeze()
+   sensor = jbimage.image_file.read(args.input).squeeze()
 
    # obtain required parameters from RAW file
    width,height = tiff.get_sensor_size()