Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: sebleedelisle/openFrameworks
...
head fork: sebleedelisle/openFrameworks
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
Commits on May 14, 2012
@sebleedelisle Fixed ofxTCPServer::setup so that if it fails to bind, it closes the …
…connection.

Signed-off-by: Seb Lee-Delisle <sebleedelisle@gmail.com>
c38dde5
@sebleedelisle minor changes to clear XCode4 warnings
Signed-off-by: Seb Lee-Delisle <sebleedelisle@gmail.com>
5134234
View
1  addons/ofxNetwork/src/ofxTCPServer.cpp
@@ -29,6 +29,7 @@ bool ofxTCPServer::setup(int _port, bool blocking){
}
if( !TCPServer.Bind(_port) ){
if(verbose)printf("ofxTCPServer: bind(port = %i) failed\n", _port);
+ TCPServer.Close();
return false;
}
View
2  addons/ofxNetwork/src/ofxTCPServer.h
@@ -6,7 +6,7 @@
#include "ofxTCPManager.h"
#include <map>
-#define TCP_MAX_CLIENTS 32
+#define TCP_MAX_CLIENTS 20000
//forward decleration
class ofxTCPClient;
View
2  addons/ofxXmlSettings/libs/tinyxmlparser.cpp
@@ -354,7 +354,7 @@ const char* TiXmlBase::SkipWhiteSpace( const char* p, TiXmlEncoding encoding )
}
else
{
- while ( *p && IsWhiteSpace( *p ) || *p == '\n' || *p =='\r' )
+ while ( (*p && IsWhiteSpace( *p )) || *p == '\n' || *p =='\r' )
++p;
}
View
6 libs/openFrameworks/graphics/ofTrueTypeFont.cpp
@@ -236,14 +236,14 @@ bool ofTrueTypeFont::loadFont(string filename, int fontsize, bool _bAntiAliased,
FT_Error err;
FT_Library library;
- if (err = FT_Init_FreeType( &library )){
+ if ((err = FT_Init_FreeType( &library ))){
ofLog(OF_LOG_ERROR,"ofTrueTypeFont::loadFont - Error initializing freetype lib: FT_Error = %d", err);
return false;
}
FT_Face face;
- if (err = FT_New_Face( library, filename.c_str(), 0, &face )) {
+ if ((err = FT_New_Face( library, filename.c_str(), 0, &face ))) {
// simple error table in lieu of full table (see fterrors.h)
string errorString = "unknown freetype";
if(err == 1) errorString = "INVALID FILENAME";
@@ -277,7 +277,7 @@ bool ofTrueTypeFont::loadFont(string filename, int fontsize, bool _bAntiAliased,
for (int i = 0 ; i < nCharacters; i++){
//------------------------------------------ anti aliased or not:
- if(err = FT_Load_Glyph( face, FT_Get_Char_Index( face, (unsigned char)(i+NUM_CHARACTER_TO_START) ), FT_LOAD_DEFAULT )){
+ if((err = FT_Load_Glyph( face, FT_Get_Char_Index( face, (unsigned char)(i+NUM_CHARACTER_TO_START) ), FT_LOAD_DEFAULT ))){
ofLog(OF_LOG_ERROR,"ofTrueTypeFont::loadFont - Error with FT_Load_Glyph %i: FT_Error = %d", i, err);
}
View
2  libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj
@@ -631,7 +631,7 @@
E4B69B4C0A3A1720003C02F2 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0430;
};
buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "openFrameworksLib" */;
compatibilityVersion = "Xcode 3.2";
View
BIN  scripts/linux/codeblocks_wizard/openframeworks/Thumbs.db
Binary file not shown
View
BIN  scripts/win_cb/codeblocks_wizard/openframeworks/Thumbs.db
Binary file not shown

No commit comments for this range

Something went wrong with that request. Please try again.