Added functions to read/write images using PIL

pyshared/jbimage.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright © 2015-2018 Johann A. Briffa
+#
+# This file is part of CR2_Scripts.
+#
+# CR2_Scripts is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# CR2_Scripts is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with CR2_Scripts. If not, see <http:https://www.gnu.org/licenses/>.
+
+import numpy as np
+from PIL import Image
+
+## read and write image files
+
+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
+
+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

raw_encode.py

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