[Bug] CCLabelTTF multiline strings fail to display.

Version: cocos2d-1.0.1-x-0.12.0
Description: If you try use a multiline string in CCLabelTTF, you get an “exceeded maximum texture size” error (it made a 128x4096 texture when I found the bug) in the logs and no text is displayed.
Reproduction step: Create a multiline string with 7 lines, and a large font, and try to display it with CCLabelTTF

const char* multilineStr = "1\n2\n3\n4\n5\n6\n7"
CCLabelTTF* label = CCLabelTTF::labelWithString(multilineStr, "Arial", 30);
this->addChild(label);

Cause: Looks like the height calculation is using the full multiline string height for each line of the string, instead of each line only, thus multiplying the full multiline string height by the number of lines in the string.
Fix: line 345 of CCImage_ios.mm, to use each line only in the height calculations.

- tmp = [FontLabelStringDrawingHelper sizeWithZFont:str zfont:font constrainedToSize:textRect];
+ tmp = [FontLabelStringDrawingHelper sizeWithZFont:s zfont:font constrainedToSize:textRect];

Thanks for this bugfix.