merge develop to fix merging #5
Conversation
This reverts commit 8f12ae4. It was erroneously merged into master, the error was already fixed in develop.
…was a hungry thread that did not even sleep. This has been changed into an intelligent wait/notify thread scenario.
…tion, switched order of lock/signal
This reverts commit ea6895e.
This change affects only Linux, the manpage of readlink() says: > readlink() places the contents of the symbolic link path in the > buffer buf, which has size bufsiz. readlink() does not append a null > byte to buf. It will truncate the contents (to a length of bufsiz > characters), in case the buffer is too small to hold all of the > contents.
Only comment function if needed in the future.
…urity]. Fix identical to 957aeec
…Font ofTrueTypeFont: remove unneded push/pop & translate
…amgetters ofSoundStream: adds getters for samplerate, bufferSize and numChannels
…rial-isInitialized add ofSerial isInitialized( )
android: w,h weren't set before setup + fix deprecated constants
…ddons addons.make: remove deprecated addons
…to bugfix-linuxscripts Conflicts: scripts/linux/buildAllExamples.sh scripts/linux/cleanAllExamples.sh
linux: fix build scripts
- Previous code was passing the wrong argument. The first argument is the pointer index, not the pointer id.
…d-historical-events Fixed onTouchMoved historical event handling
…1,1,1) returns white
…color fixes a bug where ofColor::fromHsb(255,x,y) or ofFloatColor::fromHsb(1,1,1) returns white
…ny_parse_poly remove freeing of non-allocated memory in svgtiny_parse_poly(...)
…example_permissions add WRITE_EXTERNAL_STORAGE permission back in for android examples with ...
fix getHex and setHex for ofFloatColor and ofShortColor
…ness add default values to private members of ofGLRenderer.
Conflicts: libs/openFrameworks/gl/ofGLRenderer.cpp
merge develop to fix merging
|
Thanks Arturo, I made the merge. On Mar 6, 2013, at 5:04 AM, arturo notifications@github.com wrote:
|
Added lots of descriptions for ofImage and ofTrueTypeFont
Added @Arturo's suggested fix for path specification within include dire...
i've merged latest develop into your branch. if you can merge this i'll merge it into develop later