From e3707861676d58143e83089d6db067b0394de691 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Wobst?= Date: Sat, 17 Jun 2006 18:59:56 +0000 Subject: [PATCH] correct indentation git-svn-id: https://pyx.svn.sourceforge.net/svnroot/pyx/trunk/pyx@2826 069f4177-920e-0410-937b-c2a4a81bcd90 --- pyx/bitmap.py | 86 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/pyx/bitmap.py b/pyx/bitmap.py index 9fc6679f..0ae8d9b2 100644 --- a/pyx/bitmap.py +++ b/pyx/bitmap.py @@ -106,49 +106,49 @@ class image: class jpegimage(image): - def __init__(self, file): - try: - data = file.read() - except: - data = open(file, "rb").read() - pos = 0 - nestinglevel = 0 - try: - while 1: - if data[pos] == "\377" and data[pos+1] not in ["\0", "\377"]: - # print "marker: 0x%02x \\%03o" % (ord(data[pos+1]), ord(data[pos+1])) - if data[pos+1] == "\330": - if not nestinglevel: - begin = pos - nestinglevel += 1 - elif not nestinglevel: - raise ValueError("begin marker expected") - elif data[pos+1] == "\331": - nestinglevel -= 1 - if not nestinglevel: - end = pos + 2 - break - elif data[pos+1] in ["\300", "\301"]: - l, bits, height, width, components = struct.unpack(">HBHHB", data[pos+2:pos+10]) - if bits != 8: - raise ValueError("implementation limited to 8 bit per component only") - try: - mode = {1: "L", 3: "RGB", 4: "CMYK"}[components] - except KeyError: - raise ValueError("invalid number of components") - pos += l+1 - elif data[pos+1] == "\340": - l, id, major, minor, dpikind, xdpi, ydpi = struct.unpack(">H5sBBBHH", data[pos+2:pos+16]) - if dpikind == 1: - self.info = {"dpi": (xdpi, ydpi)} - elif dpikind == 2: - self.info = {"dpi": (xdpi*2.54, ydpi*2.45)} - # else do not provide dpi information - pos += l+1 - pos += 1 - except IndexError: - raise ValueError("end marker expected") - image.__init__(self, width, height, mode, data[begin:end], compressed="DCT") + def __init__(self, file): + try: + data = file.read() + except: + data = open(file, "rb").read() + pos = 0 + nestinglevel = 0 + try: + while 1: + if data[pos] == "\377" and data[pos+1] not in ["\0", "\377"]: + # print "marker: 0x%02x \\%03o" % (ord(data[pos+1]), ord(data[pos+1])) + if data[pos+1] == "\330": + if not nestinglevel: + begin = pos + nestinglevel += 1 + elif not nestinglevel: + raise ValueError("begin marker expected") + elif data[pos+1] == "\331": + nestinglevel -= 1 + if not nestinglevel: + end = pos + 2 + break + elif data[pos+1] in ["\300", "\301"]: + l, bits, height, width, components = struct.unpack(">HBHHB", data[pos+2:pos+10]) + if bits != 8: + raise ValueError("implementation limited to 8 bit per component only") + try: + mode = {1: "L", 3: "RGB", 4: "CMYK"}[components] + except KeyError: + raise ValueError("invalid number of components") + pos += l+1 + elif data[pos+1] == "\340": + l, id, major, minor, dpikind, xdpi, ydpi = struct.unpack(">H5sBBBHH", data[pos+2:pos+16]) + if dpikind == 1: + self.info = {"dpi": (xdpi, ydpi)} + elif dpikind == 2: + self.info = {"dpi": (xdpi*2.54, ydpi*2.45)} + # else do not provide dpi information + pos += l+1 + pos += 1 + except IndexError: + raise ValueError("end marker expected") + image.__init__(self, width, height, mode, data[begin:end], compressed="DCT") class PSimagedata(pswriter.PSresource): -- 2.11.4.GIT