From 16b42b7380c9be151332f84c2aa5c84b51643630 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Mon, 7 Sep 2015 10:11:04 +0200
Subject: [PATCH] =?UTF-8?q?pb=20padding=20r=C3=A9gl=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/bmp.py      |   8 ++++++--
 code/classes.py  |  27 +++++++++++++++------------
 code/classes.pyc | Bin 5648 -> 5917 bytes
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/code/bmp.py b/code/bmp.py
index d424d54..893a69b 100644
--- a/code/bmp.py
+++ b/code/bmp.py
@@ -11,9 +11,13 @@ import sys
 img = BMPFile()
 img.parse( sys.argv[1] );
 
-### print header human-readable data ###
-#print img.header.info()
 
+### print header human-readable data ###
+print img.header.info()
+
+print
+print img.content.readableData
+print
 ### print file human-readable data ###
 #print img.readableData
 
diff --git a/code/classes.py b/code/classes.py
index 3c7ccb6..102df19 100644
--- a/code/classes.py
+++ b/code/classes.py
@@ -9,7 +9,7 @@ class BMPHeader:
 	
 	# CONSTRUCTEUR: initialise les variables
 	def __init__(self):
-		self.header    = 0; # header brut (format initial: bin)
+		self.bin       = 0; # header brut (format initial: bin)
 		self.signature = 0; # signature (4D42)
 		self.fileSize  = 0; # taille du fichier bmp (bytes)
 		self.offset    = 0; # début de l'image (bytes)
@@ -75,7 +75,12 @@ class BMPHeader:
 		print "nombre de couleur: %s" % ( hex(self.colorNb  ) )
 		print "nb couleurs impor: %s" % ( hex(self.colorINb ) )
 		print "====================="
-		print
+		print "INFORMATIONS COMP."
+		print "====================="
+		print "padding:           %s" % ( (4- self.width*3 %4)%4 )
+		print "====================="
+		
+		
 
 ####################################################
 # classe qui parse le content (binaire) en matrice #		
@@ -97,20 +102,13 @@ class BMPContent:
 			exit()
 		
 		# taille avec un padding de 1
-		correctSizes = [
-			( header.width * ( 1 +header.bpp/8 ) ) * header.height, # padding de 1
-			( header.width * ( 2 + header.bpp/8 ) ) * header.height # padding de 2
-		]
+		padding = ( 4 - header.width*3 % 4 ) % 4
+		correctSize = header.width * ( padding + header.bpp/8 ) * header.height;
 		
 		# si le fichier a une mauvaise taille donc mauvais format
-		padding = 0
-		if not len(binContent) in correctSizes:
+		if not len(binContent) == correctSize:
 			print "Mauvais format (erreur de taille)"
 			exit()
-		elif len(binContent) == correctSizes[0]:
-			padding = 1
-		else:
-			padding = 2
 
 		# attribution de la map		
 		self.map = []
@@ -139,6 +137,11 @@ class BMPContent:
 		for byte in binContent:
 			self.readableData += str(ord(byte)) + " "
 
+
+	# unparse une map de pixels en binaire
+	def unparse(self, map):
+		print "To Do!"
+		print "unparsing content and creating header"
 			
 #################################
 # classe contenant un pixel RGB #
diff --git a/code/classes.pyc b/code/classes.pyc
index e6f2d3c84e51e66a0e7f19eb29a7a4bdca5abe42..78f0a29513d4353325041211d799adc40c757ab4 100644
GIT binary patch
delta 1070
zcmZ8gTTc^F5T3J_Zri1lwp*})&;lh{ED{hRMq(o2qDZ)SN`lcSDcuGaObgvL8q>xH
z^a*1mClY-yArXD^!Sq=lcsKe#j3(+IaAsG8*ml0m%+7vi<~!5p{jUc!`FA92Pk;ZQ
zJz<&*0IPPnvB&a?${9wDpK6eW74#<1oUw+iMcI%QgUeSei69PE0%`#3Dp&>>7_^=u
zXgw+b$eYPVDtN%goH%mK%ug@yx$&i$h53ADVqtD^z)50yvtU_vdF?{x_|xmybg)fb
ziI1W8tY2(|`&5;wtV4+KnLsB#;2H5bIxAxOIo7lLF01goDT_7zT7bIe?c$TZ)O{0O
zCx8Gfgx?|&hS0)j-dK;tNK@A%ONN>R>k?QB4kFVa2=$|E&36DS6_RZRmC9h$6>t@(
zG1z8MQ(!{^=RQ~gl*Yvzo>&H015#)O71E%t!h^Tq2FUj*wk4RnwF`BjMp8@@=}7KI
z5ZY46=Z1*5hVO;`PiTH(Tc&dvl_)TZ+*^mRj1l(gMXxaO?*`k(UsxPO&c}6V8<kdc
z*ji@Gn9Z9_;zwjc|0lK`6ywdObyNpziGYc_&BH7!_M3C_zOI<%9SA1r$XgIxQWKYF
zqEdECWfvy|xKk=vrK+o;`}clbVl7sx)l$*T+Yd{^h~Dm`dt60x1`$At;suB06idr-
z^2Ez%I#8rOBr$9BP7(1^B{Ny+a(dCdSKcgC9bBDE(LXs;C|j9gwN!8^>9=5FA(+JB
z^~$qiC^jX&8BOLh%sDhU;8~_h6<q|~1Tg|{%LZx7l06t-NAs2`AcwS2KkpN{mZ$m<
zRh}gnM(XJ-y}5T(>93thYj={IDAhhpzG&29U)Uv@#{1LpcJy$o04kd(B{?{b<q6Ky
zRFxn=1D+%BTI>-!i5->PH=^D6YI0KZ5bbz8Vmi^m@nq@<KG_%R$zh#l<kS@(!3M92
NU&)lZn7EkG{{XqzzDocA

delta 847
zcmZuvOK1~e5T1V@|0cV6G@F;f)V66_YFo4#utg~?RJ2%xvH=UeO6`W47SeXJ_##0h
z2!bApb1sVLNfb*Eym{|MZ{ks}dh5x9=*$KMi?H+UJihs7=Kp8=$kwQ#?nTYXo$ouw
zePK!fxL#RuD_$E#Squ3pIj&V}?QeQWm~70D)D!KWGA@i+7oa?pXitWo3(T9Z#31gP
zhw+CwDtn0L^x?EUhc~Pf_|7ikXY0H?$nHG8NzdyEQZL}WNblXZ0-&M5Du63sO$F}|
zxC)$|^#!y5M6DB5z*YayG)QMtoT5VTqnQ4`*op#86<i5T4SWq6bfAES3Tp;<EpUyX
z$mvd%fqxj3lUq~3d&X5MyC%5=DJ#?sz@i?Us>7`p;8RFqDLN!1UXG4j)FGRrGJcrr
zHHfJ0cgT*TrE)uhDIpkd>ae*73uHC4j<rh`z$%65X6Os!m*|9TLUvqPv|#grSP1Ul
z!jafa7u_LLLktQ7;O*G3Q1NxFBnI$nY{cqZJ;j`EJP^+p9M13~1k3B5S6TMU)jO5C
zZ;)eS$#tu>6}%L`I>--sg`_?~07_iw!qoDjph;n~E;1slNc<G<$qZ@4a0(3l4E(}Q
z5AQ&-NNSm+&J?MJ4QCjq5|6AgrW|89j$_uDU?~v$?3C;rgQx6yeVF2p+gtVrF+IrC
zzmw3D0<3RTYJuX>-a6e(=w(PUkU%h~6D(vApQIk@tUkq~>5urbE7Jd-te`ERarTc8
iWS!&@^b+y5@n)uE@h}cI<&-FL4u55G`do4<Y5fM)Z<tH~