diff options
author | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2017-12-18 17:52:51 +0000 |
---|---|---|
committer | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2017-12-18 17:52:51 +0000 |
commit | 790b58477460c3f73c723772a3639a97be410087 (patch) | |
tree | 3ccb15c5fff23d985e83e62c2f788580fa5f3c96 /Gem/develop/include/Gem/Base | |
parent | c886922cc0b8c32ead0459b581f51ff60fdebbd4 (diff) |
Gem 56872f9347ef666944a3af62bbfda36a8c9f21b0 osx/x86_64
built 'master:56872f9347ef666944a3af62bbfda36a8c9f21b0' for osx/x86_64
Diffstat (limited to 'Gem/develop/include/Gem/Base')
-rw-r--r-- | Gem/develop/include/Gem/Base/CPPExtern.h | 6 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Base/GemPathBase.h | 3 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Base/GemPixDualObj.h | 6 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Base/TextBase.h | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/Gem/develop/include/Gem/Base/CPPExtern.h b/Gem/develop/include/Gem/Base/CPPExtern.h index 9b1d25c..4523eef 100644 --- a/Gem/develop/include/Gem/Base/CPPExtern.h +++ b/Gem/develop/include/Gem/Base/CPPExtern.h @@ -143,13 +143,15 @@ public: void post(const char*format, ...) const; void endpost(void) const; void verbose(const int level, const char*format, ...) const; - void error(const char*format, ...) const; /* internally uses pd_error() */ + void error(const char*format, + ...) const; /* internally uses pd_error() */ // searches for a file based on the parent abstraction's path // wraps open_via_path() and canvas_makefilename() // the full filename is returned // if the file does not exist, it is constructed - std::string findFile(const std::string&filename, const std::string&ext) const; + std::string findFile(const std::string&filename, + const std::string&ext) const; std::string findFile(const std::string&filename) const; private: diff --git a/Gem/develop/include/Gem/Base/GemPathBase.h b/Gem/develop/include/Gem/Base/GemPathBase.h index e1f7264..f2bdd83 100644 --- a/Gem/develop/include/Gem/Base/GemPathBase.h +++ b/Gem/develop/include/Gem/Base/GemPathBase.h @@ -53,7 +53,8 @@ protected: /////////// // do the actual interpolation - virtual void lookupFunc(t_float x, t_float *ret, int numDimen, int npnts, t_float *pnts) = 0; + virtual void lookupFunc(t_float x, t_float *ret, int numDimen, int npnts, + t_float *pnts) = 0; ////////// // The number of dimensions diff --git a/Gem/develop/include/Gem/Base/GemPixDualObj.h b/Gem/develop/include/Gem/Base/GemPixDualObj.h index bb1f02d..5069d93 100644 --- a/Gem/develop/include/Gem/Base/GemPixDualObj.h +++ b/Gem/develop/include/Gem/Base/GemPixDualObj.h @@ -61,7 +61,8 @@ protected: // The derived class HAS override this. // This is called whenever a new image comes through and // both of the image structs are RGBA - virtual void processDualImage(imageStruct &image, imageStruct &right) = 0; + virtual void processDualImage(imageStruct &image, + imageStruct &right) = 0; ////////// // The derived class CAN override this. @@ -191,6 +192,7 @@ private: ////////// // Static member functions static void obj_setupCallback(t_class *classPtr); - static void gem_rightMessCallback(void *x, t_symbol *s, int argc, t_atom *argv); + static void gem_rightMessCallback(void *x, t_symbol *s, int argc, + t_atom *argv); }; #endif // for header file diff --git a/Gem/develop/include/Gem/Base/TextBase.h b/Gem/develop/include/Gem/Base/TextBase.h index 2b553c4..0834ef0 100644 --- a/Gem/develop/include/Gem/Base/TextBase.h +++ b/Gem/develop/include/Gem/Base/TextBase.h @@ -128,7 +128,8 @@ protected: // Set the justification virtual void setJustification(JustifyWidth wType); virtual void setJustification(JustifyWidth wType, JustifyHeight hType); - virtual void setJustification(JustifyWidth wType, JustifyHeight hType, JustifyDepth dType); + virtual void setJustification(JustifyWidth wType, JustifyHeight hType, + JustifyDepth dType); typedef struct Justification_ { float width; |