Fixed #7896Handled the case where there is no picture and made it simpler to loada picture.
(cherry picked from commit dc91c9490a61c374b4358a3a328019f3e0e150ab)
Fixed #7896
Handled the case where there is no picture and made it simpler to load
a picture.
(cherry picked from commit dc91c9490a61c374b4358a3a328019f3e0e150ab)