cocos2d/cocos2d-x — pull request #7839 by minggo (2014-08-21 07:52:50+00:00)
Title: Revert ccimage

* use macro to control whether using jpeg, tiff and webp or not
* fix some coding style