From 0d1c5cc4c18eb970316ff16eb54dfb3e81dbad81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 4 Aug 2016 21:30:51 +0200 Subject: [PATCH] Update steganalysis functions. --- bin/lsb-set | 4 ++-- bin/steganalysis-parity | 20 +++++++++---------- stegano/steganalysis/steganalysisParity.py | 16 --------------- .../steganalysis/steganalysisStatistics.py | 16 +++++++-------- 4 files changed, 18 insertions(+), 38 deletions(-) diff --git a/bin/lsb-set b/bin/lsb-set index b18f6b9..5421e33 100755 --- a/bin/lsb-set +++ b/bin/lsb-set @@ -20,9 +20,9 @@ # along with this program. If not, see __author__ = "Cedric Bonhomme" -__version__ = "$Revision: 0.5.1 $" +__version__ = "$Revision: 0.6 $" __date__ = "$Date: 2016/03/18 $" -__revision__ = "$Date: 2016/05/22 $" +__revision__ = "$Date: 2016/08/04 $" __license__ = "GPLv3" try: diff --git a/bin/steganalysis-parity b/bin/steganalysis-parity index 63e2063..98dc4c1 100644 --- a/bin/steganalysis-parity +++ b/bin/steganalysis-parity @@ -20,8 +20,8 @@ # along with this program. If not, see __author__ = "Cedric Bonhomme" -__version__ = "$Revision: 0.5 $" -__date__ = "$Date: 2016/03/18 $" +__version__ = "$Revision: 0.6 $" +__date__ = "$Date: 2016/08/04 $" __license__ = "GPLv3" try: @@ -31,16 +31,14 @@ except: from PIL import Image -from optparse import OptionParser -parser = OptionParser() -parser.add_option("-i", "--input", dest="input_image_file", +import argparse +parser = argparse.ArgumentParser(prog='steganalysis-parity') +parser.add_argument("-i", "--input", dest="input_image_file", help="Image file") -parser.add_option("-o", "--output", dest="output_image_file", +parser.add_argument("-o", "--output", dest="output_image_file", help="Image file") -parser.set_defaults(input_image_file = './pictures/Lenna.png', - output_image_file = './pictures/Lenna_steganalysed.png') -(options, args) = parser.parse_args() +arguments = parser.parse_args() -input_image_file = Image.open(options.input_image_file) +input_image_file = Image.open(arguments.input_image_file) output_image = steganalysisParity.steganalyse(input_image_file) -output_image.save(options.output_image_file) +output_image.save(arguments.output_image_file) diff --git a/stegano/steganalysis/steganalysisParity.py b/stegano/steganalysis/steganalysisParity.py index 71153ce..a3ca3c3 100644 --- a/stegano/steganalysis/steganalysisParity.py +++ b/stegano/steganalysis/steganalysisParity.py @@ -50,19 +50,3 @@ def steganalyse(img): b = 255 encoded.putpixel((col, row), (r, g , b)) return encoded - -if __name__ == '__main__': - # Point of entry in execution mode. - from optparse import OptionParser - parser = OptionParser() - parser.add_option("-i", "--input", dest="input_image_file", - help="Image file") - parser.add_option("-o", "--output", dest="output_image_file", - help="Image file") - parser.set_defaults(input_image_file = './pictures/Lenna.png', - output_image_file = './pictures/Lenna_steganalysed.png') - (options, args) = parser.parse_args() - - input_image_file = Image.open(options.input_image_file) - output_image = steganalyse(input_image_file) - output_image.save(options.output_image_file) diff --git a/stegano/steganalysis/steganalysisStatistics.py b/stegano/steganalysis/steganalysisStatistics.py index 3bbdc84..c678417 100644 --- a/stegano/steganalysis/steganalysisStatistics.py +++ b/stegano/steganalysis/steganalysisStatistics.py @@ -55,16 +55,14 @@ def steganalyse(img): if __name__ == '__main__': # Point of entry in execution mode. - from optparse import OptionParser - parser = OptionParser() - parser.add_option("-i", "--input", dest="input_image_file", + import argparse + parser = argparse.ArgumentParser(prog='steganalysis-statistics') + parser.add_argument("-i", "--input", dest="input_image_file", help="Image file.") - parser.add_option("-o", "--output", dest="output_image_file", + parser.add_argument("-o", "--output", dest="output_image_file", help="Image file.") - parser.set_defaults(input_image_file = './pictures/Lenna.png', - output_image_file = './pictures/Lenna_steganalysed.png') - (options, args) = parser.parse_args() + arguments = parser.parse_args() - input_image_file = Image.open(options.input_image_file) + input_image_file = Image.open(arguments.input_image_file) output_image = steganalyse(input_image_file) - soutput_image.save(options.output_image_file) + soutput_image.save(arguments.output_image_file)