diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2000-10-22 21:59:23 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2000-10-22 21:59:23 (GMT) |
| commit | 185f42d917f2b66f366ea59260bd0543bb9849c1 (patch) | |
| tree | 6c29156603936fee6ecc2ddd3c0e514f085c5f15 | |
| parent | 339ecc61f81703613d8b5536b35de3dcf745a9ad (diff) | |
| download | cpython-185f42d917f2b66f366ea59260bd0543bb9849c1.zip cpython-185f42d917f2b66f366ea59260bd0543bb9849c1.tar.gz cpython-185f42d917f2b66f366ea59260bd0543bb9849c1.tar.bz2 | |
struct.pack has become picky about h (short) and H (unsigned short).
| -rw-r--r-- | Mac/Demo/imgbrowse/mac_image.py | 2 | ||||
| -rw-r--r-- | Mac/Lib/PixMapWrapper.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Mac/Demo/imgbrowse/mac_image.py b/Mac/Demo/imgbrowse/mac_image.py index c4b034e..4e3881f 100644 --- a/Mac/Demo/imgbrowse/mac_image.py +++ b/Mac/Demo/imgbrowse/mac_image.py @@ -13,7 +13,7 @@ def mkpixmap(w, h, fmt, data): """kludge a pixmap together""" fmtinfo = _fmt_to_mac[fmt] - rv = struct.pack("lhhhhhhhlllhhhhlll", + rv = struct.pack("lHhhhhhhlllhhhhlll", id(data)+MacOS.string_id_to_buffer, # HACK HACK!! w*2 + 0x8000, 0, 0, h, w, diff --git a/Mac/Lib/PixMapWrapper.py b/Mac/Lib/PixMapWrapper.py index 39e5f8e..72a64ba 100644 --- a/Mac/Lib/PixMapWrapper.py +++ b/Mac/Lib/PixMapWrapper.py @@ -15,7 +15,7 @@ import imgformat # PixMap data structure element format (as used with struct) _pmElemFormat = { 'baseAddr':'l', # address of pixel data - 'rowBytes':'h', # bytes per row, plus 0x8000 + 'rowBytes':'H', # bytes per row, plus 0x8000 'bounds':'hhhh', # coordinates imposed over pixel data 'top':'h', 'left':'h', |