Author: Tim Felgentreff <[email protected]>
Branch: bitblt
Changeset: r191:df7f762c1037
Date: 2013-03-16 14:03 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/df7f762c1037/
Log: clarify this logic
diff --git a/spyvm/primitives.py b/spyvm/primitives.py
--- a/spyvm/primitives.py
+++ b/spyvm/primitives.py
@@ -578,9 +578,9 @@
height = interp.space.unwrap_int(w_rcvr.fetch(interp.space, 2))
depth = interp.space.unwrap_int(w_rcvr.fetch(interp.space, 3))
- w_prev_display = interp.space.objtable['w_display']
sdldisplay = None
+ w_prev_display = interp.space.objtable['w_display']
if w_prev_display:
w_prev_bitmap = w_prev_display.fetch(interp.space, 0)
if isinstance(w_prev_bitmap, model.W_DisplayBitmap):
@@ -590,11 +590,10 @@
assert (sdldisplay is None) or (sdldisplay is w_bitmap.display)
sdldisplay = w_bitmap.display
w_display_bitmap = w_bitmap
-
- if not sdldisplay:
- sdldisplay = display.SDLDisplay()
-
- if isinstance(w_bitmap, model.W_WordsObject):
+ else:
+ assert isinstance(w_bitmap, model.W_WordsObject)
+ if not sdldisplay:
+ sdldisplay = display.SDLDisplay()
w_display_bitmap =
model.W_DisplayBitmap(w_bitmap.getclass(interp.space), w_bitmap.size(), depth,
sdldisplay)
for idx, word in enumerate(w_bitmap.words):
w_display_bitmap.setword(idx, word)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
