Small update

upcean/encode/binary.py

@@ -97,8 +97,10 @@ def encode_binary_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48,
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(not re.findall("^([0-9]*[\\.]?[0-9])", str(resize)) or int(resize) < 1):
         resize = 1
     if(pilsupport and imageoutlib == "pillow"):

upcean/encode/codabar.py

@@ -109,19 +109,10 @@ def encode_codabar_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    imageoutlib = "pillow"
-    if pilsupport and isinstance(upc_img, ImageDraw.ImageDraw) and isinstance(upc_preimg, Image.Image):
-        imageoutlib = "pillow"
-    elif cairosupport and isinstance(upc_img, cairo.Context) and isinstance(upc_preimg, cairo.Surface):
-        imageoutlib = "cairo"
-    elif svgwritesupport and isinstance(upc_img, svgwrite.Drawing):
-        imageoutlib = "svgwrite"
-    elif(imageoutlib != "pillow" and imageoutlib != "cairo" and imageoutlib != "qahirah" and imageoutlib != "cairosvg" and imageoutlib != "svgwrite"):
-        imageoutlib = "pillow"
-    elif(not pilsupport and not cairosupport and not svgwritesupport):
-        return False
-    else:
-        return False
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
+        imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) < 1):
         return False
     if(barwidth[0] < 1):

upcean/encode/code11.py

@@ -107,8 +107,10 @@ def encode_code11_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48,
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) < 1):
         return False
     if(not re.findall("([0-9\\-]+)", upc)):

upcean/encode/code128.py

@@ -102,8 +102,10 @@ def encode_code128_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) % 2):
         return False
     if(len(upc) < 8):
@@ -703,8 +705,10 @@ def encode_code128old_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) % 2):
         return False
     if(len(upc) < 8):

upcean/encode/code32.py

@@ -104,8 +104,10 @@ def encode_code32_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48,
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) < 1):
         return False
     if(not re.findall("([0-9a-zB-DF-HJ-NP-Z\\-\\.\\$\\/\\+% ]+)", upc)):

upcean/encode/code39.py

@@ -104,8 +104,10 @@ def encode_code39_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48,
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) < 1):
         return False
     if(not re.findall("([0-9a-zA-Z\\-\\.\\$\\/\\+% ]+)", upc)):
@@ -426,8 +428,10 @@ def encode_code39extended_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barhei
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) < 1):
         return False
     if(not re.findall("([0-9a-zA-Z\\-\\.\\$\\/\\+% ]+)", upc)):

upcean/encode/code93.py

@@ -103,8 +103,10 @@ def encode_code93_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48,
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) < 1):
         return False
     if(not re.findall("([0-9a-zA-Z\\-\\.\\$\\/\\+% ]+)", upc)):
@@ -424,8 +426,10 @@ def encode_code93extended_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barhei
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) < 1):
         return False
     if(not re.findall("([0-9a-zA-Z\\-\\.\\$\\/\\+% ]+)", upc)):

upcean/encode/ean13.py

@@ -115,8 +115,10 @@ def encode_ean13_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48,
         upc_preimg = inimage[1]
     upc_pieces = None
     supplement = None
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)):
         upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)
         upc_pieces = upc_pieces[0]

upcean/encode/ean2.py

@@ -99,8 +99,10 @@ def encode_ean2_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) > 2 or len(upc) < 2):
         return False
     upc_matches = re.findall("(\\d{2})", upc)

upcean/encode/ean5.py

@@ -100,8 +100,10 @@ def encode_ean5_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) > 5 or len(upc) < 5):
         return False
     upc_matches = re.findall("(\\d{5})", upc)

upcean/encode/ean8.py

@@ -115,8 +115,10 @@ def encode_ean8_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5
         upc_preimg = inimage[1]
     upc_pieces = None
     supplement = None
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)):
         upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)
         upc_pieces = upc_pieces[0]

upcean/encode/itf.py

@@ -107,8 +107,10 @@ def encode_itf_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) % 2):
         return False
     if(len(upc) < 6):

upcean/encode/itf14.py

@@ -107,8 +107,10 @@ def encode_itf14_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48,
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) % 2):
         return False
     if(len(upc) < 6):

upcean/encode/msi.py

@@ -101,8 +101,10 @@ def encode_msi_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) < 1):
         return False
     if(not re.findall("([0-9]+)", upc)):

upcean/encode/plessey.py

@@ -104,8 +104,10 @@ def encode_plessey_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) < 1):
         return False
     if(not re.findall("([0-9a-fA-F]+)", upc)):

upcean/encode/stf.py

@@ -107,8 +107,10 @@ def encode_stf_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54
     else:
         upc_img = inimage[0]
         upc_preimg = inimage[1]
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(len(upc) % 2):
         return False
     if(len(upc) < 6):

upcean/encode/upca.py

@@ -113,8 +113,10 @@ def encode_upca_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5
         upc_preimg = inimage[1]
     upc_pieces = None
     supplement = None
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)):
         upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)
         upc_pieces = upc_pieces[0]
@@ -510,8 +512,10 @@ def encode_upcaean_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48
         upc_preimg = inimage[1]
     upc_pieces = None
     supplement = None
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)):
         upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)
         upc_pieces = upc_pieces[0]

upcean/encode/upcavar.py

@@ -117,8 +117,10 @@ def encode_upcavar_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48
         upc_preimg = inimage[1]
     upc_pieces = None
     supplement = None
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)):
         upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)
         upc_pieces = upc_pieces[0]
@@ -521,8 +523,10 @@ def encode_upcaeanvar_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=
         upc_preimg = inimage[1]
     upc_pieces = None
     supplement = None
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)):
         upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)
         upc_pieces = upc_pieces[0]

upcean/encode/upce.py

@@ -117,8 +117,10 @@ def encode_upce_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5
         upc_preimg = inimage[1]
     upc_pieces = None
     supplement = None
-    if(imageoutlib not in imagelibsupport):
+    if(imageoutlib not in imagelibsupport and imageoutlib is not None):
         imageoutlib = defaultdraw
+    if(imageoutlib is not None):
+        inimage = None
     if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)):
         upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)
         upc_pieces = upc_pieces[0]