Issue #2080395 by mrsinguyen, lorique: Remove unused local variables from the image module.