am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height

* commit 'eb95e74e21a0e910704ca2fd67e074ab640bfba3':
  DO NOT MERGE - Fixed crash for odd image width/height