modify calculate img width and height effects
Merge remote-tracking branch 'origin/master'