am 79afbdd4: am 9789c42e: Fix crashes for images that are not PNG or JPEG

* commit '79afbdd4303f3cd0db1eb963ffc6f00a635ce78b':
  Fix crashes for images that are not PNG or JPEG