From 784622d3dafaaaec9ce1f41b5301db3c4e1c5322 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Sun, 6 Sep 2015 17:05:52 +0200
Subject: [PATCH] =?UTF-8?q?d=C3=A9but=20d=20la=20classe=20BMPContent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/bmp.py          |   2 +-
 code/classes.py      |  17 ++++++++---------
 code/classes.pyc     | Bin 2000 -> 1988 bytes
 code/contentDat.algo |   5 +++++
 4 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 code/contentDat.algo

diff --git a/code/bmp.py b/code/bmp.py
index 0b28047..448ff3b 100644
--- a/code/bmp.py
+++ b/code/bmp.py
@@ -17,7 +17,7 @@ with open(sys.argv[1]) as f:
 headerSize = 54
 
 header = BMPHeader(   fileData[:headerSize]    )
-content = BMPContent( fileData[header.offset:], header.width, header.bpp)	
+content = BMPContent( fileData[header.offset:], header )	
 
 print header.bpp
 print
diff --git a/code/classes.py b/code/classes.py
index f976b8e..d6b5adf 100644
--- a/code/classes.py
+++ b/code/classes.py
@@ -30,7 +30,8 @@ class BMPHeader:
 		self.colorNb   = self.toInt(binHeader[46:50]) # nombre de couleurs de l'image (ou 0)
 		self.colorINb  = self.toInt(binHeader[50:54]) # nombre d'images importantes (ou 0)
 		self.header    = binHeader
-	
+
+
 
 ####################################################
 # classe qui parse le content (binaire) en matrice #		
@@ -38,17 +39,15 @@ class BMPHeader:
 class BMPContent:
 	
 	# CONSTRUCTEUR: parse le content (bin) <binContent> avec les informations:
-	#	<width>		longueur de l'image (en pixels)
-	#	<bpp>		nombre de bits par pixel
-	def __init__(self, binContent, width, bpp):
+	#	<header>	BMPHeader de l'image en question
+	def __init__(self, binContent, header):
 		# gestion du bpp
-		if( bpp != 24 ):
+		if( header.bpp != 24 ):
 			print "ne prends pas en charge les versions autre que bmp24";
 			exit
 		
-		# matrice du contenu
-		self.map = []
 		
+		self.map = ""
 		for byte in binContent:
-			self.map.append( ord(byte) )
-		self.map = self.map[::-1]
\ No newline at end of file
+			self.map += str(ord(byte)) + " "
+		
\ No newline at end of file
diff --git a/code/classes.pyc b/code/classes.pyc
index 6a4e1627c93dc56eb120709704181b9f45a060b9..121bf9fad892df960a271f0e2d1efd6af4ce5a76 100644
GIT binary patch
delta 263
zcmW+wL2ANK5PkE1@<pk{g`m)l8>wKssRa+9U^iMwDY}tjNfuH3t!6+M5urjakdyQd
zJ%IOc*$X&7Fz?OGo8irzgTKJ&|7xZ8_G@<jQ3LP<MlcYhGoegj2}FdI#`YGG!swX^
zWJT1-fOm!c12V#J-o~Mjyrlwbu!l_JL@pu^jlPoIO&8M$c<uONK1rJH&XbUh^RjuI
zu#^ygpjB*yHP^eZ;(fwm3al4jMNWAeD(O3J8oCKrggz2G__Q2b4jcK8d8yxvnBE9M
U1>{pnm#Lax%!2Onap{{{SFJ`W!2kdN

delta 246
zcmX@Ye}SKk`7<w9mj6b!a@Kkl1_lOJAO_LSKwO*(Bx;x$QWzPsnHh>C7*d!R+&xMd
z7#Q;y7}9}K3=Hv%3>7L2HH-`{u`&#`EFhsQMusdVh7x9m8Wx6TMi62w)L;mQ$fPhZ
zfDki7D>H*6L_d%ptO2re@_SZ$_RRl4pusZPflXAO4JepcP>`CJ62t^#YJl7p#0(@#
zxPU}bW}b6?UP)?RNf0kcLSS+Yo4=SgkXg(JBp8@@7+D$FnK_ww8KoxQXG>&Mo9xKm
H#3&B{9FZ({

diff --git a/code/contentDat.algo b/code/contentDat.algo
new file mode 100644
index 0000000..58dc8ba
--- /dev/null
+++ b/code/contentDat.algo
@@ -0,0 +1,5 @@
+c = contenu binaire
+w = pixels d'une ligne
+h = pixels d'une colonne
+b = octets par pixels
+