Add files via upload

Author: JPZEBRA

raw2tiff.py

@@ -1,8 +1,8 @@
 # 趣味のPython学習　Project 02-12
 # Python RAW 2 TIFF CONVERTER
-# ばーじょん 0.1.2
+# ばーじょん 0.1.3
 
-ver = "0.1.2"
+ver = "0.1.3"
 
 # NEED THIS ! get 'pillow' with pip command !
 from PIL import Image
@@ -15,6 +15,7 @@
 
 # NEED THIS ! get 'rawpy' with pip command !
 import rawpy as RPY
+from rawpy import LibRawFileUnsupportedError
 from rawpy import LibRawIOError
 
 #
@@ -32,12 +33,15 @@
 
     try :
 
-        raw = RPY.imread(fnm)
+#       CHECK EXIST
+        f = open(fnm,'rb')
+        f.close()
 
-        tif = raw.postprocess(demosaic_algorithm=RPY.DemosaicAlgorithm.LINEAR,output_bps=16)
+        raw = RPY.imread(fnm)
 
         width  = raw.sizes.width
         height = raw.sizes.height
+
         clr    = raw.color_desc
         pat    = raw.raw_pattern
 
@@ -48,35 +52,45 @@
 
         print("*** READ OK ***")
 
-    except LibRawIOError:
+    except FileNotFoundError:
         print(f"{fnm} : not found !")
 
-    except AssertionError:
+    except LibRawIOError:
+        print(f"{fnm} : decode error !")
+
+    except LibRawFileUnsupportedError:
         print(f"{fnm} : type error !")
 
     else :
 
         fno = fnm + ".tif"
         print(f"*** SAVE : {fno}  ( 48bit color ) ***")
-        imageio.imsave(fno,tif)
 
-        if type(pat) != numpy.ndarray : continue
+        tif = raw.postprocess(demosaic_algorithm=RPY.DemosaicAlgorithm.LINEAR,output_bps=16)
+        imageio.imsave(fno,tif)
 
-        rgb = raw.postprocess(half_size=True,four_color_rgb=True,output_color=RPY.ColorSpace.raw,output_bps=16)
+        ptn = True
+        if type(pat) != numpy.ndarray :
+            ptn = False
 
         fno = fnm + ".rb.png"
         print(f"*** SAVE : {fno} ( 16bit bayer pattern ) ***")
 
+
+        rgb = raw.postprocess(half_size=True,four_color_rgb=True,output_color=RPY.ColorSpace.raw,output_bps=16)
         img_cv = Image.new('I;16',(width,height))
 
         for y in range(height) :
             for x in range(width) :
 
+#               RGGB CONVERT
                 if x%2 == 0 and y%2 == 0 : c = 0
                 if x%2 == 1 and y%2 == 0 : c = 1
                 if x%2 == 0 and y%2 == 1 : c = 3
                 if x%2 == 1 and y%2 == 1 : c = 2
 
+                if ptn == False and c == 3 : c = 1
+
                 img_cv.putpixel((x,y),int(rgb[y//2][x//2][c]))
 
         img_cv.save(fno)