diff --git a/code/blue.bmp b/code/blue.bmp deleted file mode 100644 index 0bcd5c5..0000000 Binary files a/code/blue.bmp and /dev/null differ diff --git a/code/classes.py b/code/classes.py index d5453c5..72255b1 100644 --- a/code/classes.py +++ b/code/classes.py @@ -1,6 +1,5 @@ # ~*~ encoding: utf-8 ~*~ # -import binascii import sys ################################################# @@ -66,6 +65,11 @@ class BMPHeader: # fonction qui créer à partir des attributs def unparse(self): + + # pas de gestion du header complémentaire + self.infoSize = 54 + self.offset = 54 + bytes = [] bytes += [ self.fromInt(self.signature, 2) ] # signature bytes += [ self.fromInt(self.fileSize, 4) ] # taille fichier BMP @@ -127,17 +131,17 @@ class BMPHeader: return intReturn # écrit le valeur entière en octet bourrés jusqu'à la taille - def fromInt(self, intCode, N): - s = '0' + bin(intCode)[2:] + def fromInt(self, value, size): + s = '0' + bin(value)[2:] rtn = "" while s != "": rtn += chr( int(s[-8:], 2) ) s = s[:-8] - + # on rajoute des zéros si besoin de padding if N > len(rtn): - rtn = chr(int( "0" * ( N-len(rtn) ) )) + rtn - + rtn = chr(int( "0" * (size - len(rtn)) )) + rtn + return rtn @@ -167,7 +171,7 @@ class BMPContent: # si le fichier a une mauvaise taille donc mauvais format if not len(binContent) == correctSize: print "Mauvais format (erreur de taille)" - # exit() + exit() # attribution de la map self.map = [] diff --git a/code/classes.pyc b/code/classes.pyc index 4e32847..73517bc 100644 Binary files a/code/classes.pyc and b/code/classes.pyc differ diff --git a/code/green.bmp b/code/green.bmp deleted file mode 100644 index 48536de..0000000 Binary files a/code/green.bmp and /dev/null differ diff --git a/code/red.bmp b/code/red.bmp deleted file mode 100644 index 5d25b0a..0000000 Binary files a/code/red.bmp and /dev/null differ diff --git a/code/rgbw.bmp b/code/rgbw.bmp deleted file mode 100644 index 1d89d2c..0000000 Binary files a/code/rgbw.bmp and /dev/null differ diff --git a/code/test.bmp b/code/test.bmp deleted file mode 100644 index 0b2fe5d..0000000 Binary files a/code/test.bmp and /dev/null differ