Merge pull request #19 from tinalasisi/updates

updated version & fixed file reading error

Author: tinalasisi

fibermorph/_version.py

@@ -1 +1 @@
-__version__ = "0.2.6"
+__version__ = "0.2.7"

fibermorph/fibermorph.py

@@ -1325,8 +1325,11 @@ def imread(input_file, use_skimage=False):
     """
     input_path = pathlib.Path(input_file)
     if use_skimage:
-        img_float = skimage.io.imread(input_file, as_gray=True)
-        img = skimage.img_as_ubyte(img_float)
+        try:
+            img_float = skimage.io.imread(input_file, as_gray=True)
+            img = skimage.img_as_ubyte(img_float)
+        except ValueError:
+            img = np.array(Image.open(str(input_path)).convert('L'))
     else:
         img = np.array(Image.open(str(input_path)).convert('L'))
     im_name = input_path.stem

fibermorph/test/test_fibermorph.py

@@ -209,7 +209,7 @@ def test_segment_section():
 
     #input
     # input_directory = pathlib.Path("/Users/tinalasisi/Desktop/Nov01_2338_ValidationTest_Section/ValidationData")
-    input_directory = pathlib.Path("/Users/tinalasisi/Desktop/Nov3_RealSections/Images")
+    input_directory = pathlib.Path("/Users/tinalasisi/Box/01_TPL5158/Box_Dissertation/HairPhenotyping_Methods/data/fibermorph_input/admixed_real_hair/section/AfrEu_SectionImages_RawJPG/AfrEu_SectionImages_GrayTIFF/tiff")
     file_list = fibermorph.list_images(input_directory)
     main_output_path = "/Users/tinalasisi/Desktop"
     output_path = main_output_path