From b9fad5f044c07a8337080ab3d3f7795d965ae247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= <cedric@cedricbonhomme.org>
Date: Tue, 28 Feb 2017 07:52:44 +0100
Subject: [PATCH] Various improvements in lsb and lsbset modules.

---
 stegano/lsb/lsb.py       |  7 +------
 stegano/lsbset/lsbset.py | 12 ++++--------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/stegano/lsb/lsb.py b/stegano/lsb/lsb.py
index 60212a9..ac17d1f 100755
--- a/stegano/lsb/lsb.py
+++ b/stegano/lsb/lsb.py
@@ -89,12 +89,9 @@ def hide(input_image_file, message, auto_convert_rgb=False):
                 img.close()
                 return encoded
 
-    img.close()
-    return encoded
 
 def reveal(input_image_file):
-    """Find a message in an image
-    (with the LSB technique).
+    """Find a message in an image (with the LSB technique).
     """
     img = Image.open(input_image_file)
     width, height = img.size
@@ -123,5 +120,3 @@ def reveal(input_image_file):
             if len(bitab)-len(str(limit))-1 == limit :
                 img.close()
                 return "".join(bitab)[len(str(limit))+1:]
-    img.close()
-    return ""
diff --git a/stegano/lsbset/lsbset.py b/stegano/lsbset/lsbset.py
index e9c0600..0dd72f5 100644
--- a/stegano/lsbset/lsbset.py
+++ b/stegano/lsbset/lsbset.py
@@ -54,16 +54,15 @@ def hide(input_image_file, message, generator, auto_convert_rgb=False):
     width, height = img.size
     index = 0
 
-    message = str(len(message)) + ":" + str(message)
-    #message_bits = tools.a2bits(message)
+    message = str(message_length) + ":" + str(message)
     message_bits = "".join(tools.a2bits_list(message))
     message_bits += '0' * ((3 - (len(message_bits) % 3)) % 3)
 
     npixels = width * height
     len_message_bits = len(message_bits)
     if len_message_bits > npixels * 3:
-        raise Exception("The message you want to hide is too long: {}".\
-                            format(message_length))
+        raise Exception("The message you want to hide is too long: {}". \
+                                                        format(message_length))
 
     while index + 3 <= len_message_bits :
         generated_number = next(generator)
@@ -92,8 +91,7 @@ def hide(input_image_file, message, generator, auto_convert_rgb=False):
 
 
 def reveal(input_image_file, generator):
-    """Find a message in an image
-    (with the LSB technique).
+    """Find a message in an image (with the LSB technique).
     """
     img = Image.open(input_image_file)
     img_list = list(img.getdata())
@@ -118,5 +116,3 @@ def reveal(input_image_file, generator):
                         pass
         if len(bitab)-len(str(limit))-1 == limit :
             return "".join(bitab)[len(str(limit))+1:]
-
-    return ""