search

flourishlib / flourish-classes

The class files for Flourish
http://flourishlib.com
182 stars 78 forks source link

fImage bug fix #163

Closed jeffturcotte closed 11 years ago

jeffturcotte commented 11 years ago

Certain types of JPEG's could not be read. Increased the byte read limit.

Minor whitespace changes. Line 380 is where the real change occurred.

jeffturcotte commented 11 years ago

Hmm, the manual merge is not playing nice. May have to close and resubmit. Leaving this open for the time being.

wbond commented 11 years ago

I think it is because I trimmed the whitespace - it is ok, I can manually merge it when it is broken down like this.

wbond commented 11 years ago

Woah, weird. Guess I've never had a merge conflict during a cherry-pick before.

Anyway, this is merged. Thanks!