From 64b0577a02f160f4b2a095a50752d00dc6c5f3d1 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Sun, 6 Sep 2015 19:06:44 +0200
Subject: [PATCH 1/2] =?UTF-8?q?classe=20<BMPFile>=20cr=C3=A9=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/bmp.py     | 12 +++---------
 code/classes.py | 39 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/code/bmp.py b/code/bmp.py
index cd96659..e3b73e7 100644
--- a/code/bmp.py
+++ b/code/bmp.py
@@ -8,17 +8,11 @@ from classes import *
 
 import sys
 
-fileData = ""
-with open(sys.argv[1]) as f:
-	for byte in f.read():
-		fileData += byte
+img = BMPFile( sys.argv[1] )
 
-headerSize = 54
+print img.readableData
 
-header = BMPHeader(   fileData[:headerSize]    )
-content = BMPContent( fileData[header.offset:], header )	
-
-for line in content.map:
+for line in img.map:
 	for pixel in line:
 		print "rgb(%s, %s, %s)" % (pixel.r, pixel.g, pixel.b)
 	print	
\ No newline at end of file
diff --git a/code/classes.py b/code/classes.py
index 9d04d41..3162fb8 100644
--- a/code/classes.py
+++ b/code/classes.py
@@ -1,5 +1,6 @@
 # ~*~ encoding: utf-8 ~*~ #
 
+import sys
 
 #################################################
 # classe qui parse le header (binaire) en objet #
@@ -49,15 +50,19 @@ class BMPContent:
 		
 		# taille avec un padding de 1
 		correctSizes = [
-			( 0 + header.width * header.bpp/8 ) * header.height,
 			( 1 + header.width * header.bpp/8 ) * header.height,
 			( 2 + header.width * header.bpp/8 ) * header.height
 		]
 		
 		# si le fichier a une mauvaise taille donc mauvais format
+		padding = 0
 		if not len(binContent) in correctSizes:
 			print "Mauvais format"
 			exit
+		elif len(binContent) == correctSizes[0]:
+			padding = 1
+		else:
+			padding = 2
 
 		# attribution de la map		
 		self.map = []
@@ -77,7 +82,7 @@ class BMPContent:
 				
 				i += 3 # on passe à la suite
 			
-			i += 2 # on saute le padding de saut de ligne				
+			i += padding # on saute le padding de saut de ligne				
 			
 		self.map = self.map[::-1] # on inverse les lignes
 			
@@ -89,4 +94,32 @@ class RGBPixel:
 	def __init__(self, r, g, b):
 		self.r = r
 		self.g = g
-		self.b = b
\ No newline at end of file
+		self.b = b
+		
+		
+
+####################################################
+# classe qui parse un fichier BMP complet en objet #
+####################################################
+class BMPFile:
+	# CONSTRUCTEUR #
+	# à partir du fichier <filename>
+	# parse le header dans une classe <BMPHeader>
+	# parse le contenu dans une classe <BMPContent>
+	def __init__(self, filename):
+		# gestion du format
+		if not ".bmp" in filename[-4:]:
+			print "must be a .bmp file"
+			exit
+			
+		self.fileData = ""
+		self.readableData = ""
+		with open(sys.argv[1]) as file:
+			for byte in file.read():
+				self.fileData += byte;
+				self.readableData += str(ord(byte)) + " "
+				
+		headerSize = 54
+		self.header  = BMPHeader ( self.fileData[:headerSize] )
+		self.content = BMPContent( self.fileData[self.header.offset:], self.header )
+		self.map     = self.content.map # lien
\ No newline at end of file

From 8a067dda5202f77af50a8620f967438ad1fa45f1 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Sun, 6 Sep 2015 19:06:54 +0200
Subject: [PATCH 2/2] =?UTF-8?q?classe=20<BMPFile>=20cr=C3=A9=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/classes.pyc | Bin 0 -> 3632 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 code/classes.pyc

diff --git a/code/classes.pyc b/code/classes.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8257713be7a7f7f18d5184bf51ff8b5b141ba04e
GIT binary patch
literal 3632
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

literal 0
HcmV?d00001