Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix image memory issues #1109

Merged
merged 2 commits into from
Feb 24, 2022
Merged

Fix image memory issues #1109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d267f2
Fix QPixmap references to QImage
corranwebster Feb 23, 2022
a751eab
Add comments to explain why we are stashing references.
corranwebster Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pyface/ui/qt4/util/image_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ def image_to_bitmap(image):
bitmap : QPixmap
The corresponding QPixmap.
"""
return QPixmap.fromImage(image)
bitmap = QPixmap.fromImage(image)
# keep a reference to the QImage to ensure underlying data is available
bitmap._image = image
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest adding a comment explaining why this is necessary.

return bitmap


def bitmap_to_image(bitmap):
Expand Down Expand Up @@ -166,6 +169,7 @@ def array_to_image(array):
elif channels == 4:
image = QImage(data.data, width, height, bytes_per_line,
QImage.Format.Format_ARGB32)
# keep a reference to the array to ensure underlying data is available
image._numpy_data = data
return image

Expand Down