From 185f42d917f2b66f366ea59260bd0543bb9849c1 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Sun, 22 Oct 2000 21:59:23 +0000 Subject: struct.pack has become picky about h (short) and H (unsigned short). --- Mac/Demo/imgbrowse/mac_image.py | 2 +- 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', -- cgit v0.12