issue #2217: Revert changes in CCPlatformMacro.h.
issue 2217: Removing unused fps_image png data.
fixed #2217: Updating logic when m_bIgnoreContentScaleFactor is enabled.