Merge branch 'openframeworks:master' into master

Author: dimitre

.github/workflows/build-msys2.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        mingw: [MINGW64,MINGW32]
+        mingw: [MINGW64, MINGW32]
     defaults:
       run:
         shell: msys2 {0}

INSTALL_FROM_GITHUB.md

@@ -9,7 +9,7 @@ If you are a developer, or if you want to submit a pull request, [read this firs
 Let's start by cloning the last `master` branch of openFrameworks and its submodules.
 
 ```bash
-git clone --recursive git@github.com:openframeworks/openFrameworks.git
+git clone --recursive git@github.com:openframeworks/openFrameworks.git --depth 1
 ```
 
 _Before continuing make sure your new openFrameworks path **has no spaces**. Many of the shell scripts below will fail on paths that include spaces._

SECURITY.md

@@ -0,0 +1,7 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report any security vulnerabilities to:
+
+**of** at **openFrameworks** [**.cc**]

addons/ofxNetwork/src/ofxUDPManager.cpp

@@ -309,7 +309,6 @@ int	ofxUDPManager::SendAll(const char*	pBuff, const int iSize)
 	auto timeleftSecs = m_dwTimeoutSend;
 	auto timeleftMicros = 0;
 	int total= 0;
-	int bytesleft = iSize;
 	int ret=-1;
 
 	while (total < iSize) {
@@ -324,7 +323,6 @@ int	ofxUDPManager::SendAll(const char*	pBuff, const int iSize)
 			return SOCKET_ERROR;
 		}
 		total += ret;
-		bytesleft -=ret;
 		if (m_dwTimeoutSend	!= NO_TIMEOUT){
 			auto now = ofGetElapsedTimeMicros();
 			auto diff = now - timestamp;

addons/ofxPoco/src/ofxXmlPoco.h

@@ -6,6 +6,8 @@
 
 #include <numeric>
 
+#define byte _priv_byte
+
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/DocumentFragment.h>
 #include <Poco/DOM/Element.h>
@@ -26,6 +28,8 @@
 #include <Poco/DOM/NamedNodeMap.h>
 #include <Poco/DOM/ChildNodesList.h>
 
+#undef byte
+
 class ofxXmlPoco{
 
 public:

libs/openFrameworks/3d/of3dUtils.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ofConstants.h"
+#include "ofFileUtils.h"
 #include "glm/fwd.hpp"
 
 /// \brief Draws x,y,z axes representing the current reference frame.

libs/openFrameworks/app/ofAppRunner.cpp

@@ -127,18 +127,19 @@ void ofInit(){
 	signal(SIGABRT, &ofSignalHandler);  // abort signal
 #endif
 
-        of::priv::initutils();
-
-	#ifdef WIN32_HIGH_RES_TIMING
-		timeBeginPeriod(1);		// ! experimental, sets high res time
-								// you need to call timeEndPeriod.
-								// if you quit the app other than "esc"
-								// (ie, close the console, kill the process, etc)
-								// at exit wont get called, and the time will
-								// remain high res, that could mess things
-								// up on your system.
-								// info here:http://www.geisswerks.com/ryan/FAQS/timing.html
-	#endif
+    of::priv::initutils();
+    of::priv::initfileutils();
+
+#ifdef WIN32_HIGH_RES_TIMING
+    timeBeginPeriod(1);		// ! experimental, sets high res time
+                            // you need to call timeEndPeriod.
+                            // if you quit the app other than "esc"
+                            // (ie, close the console, kill the process, etc)
+                            // at exit wont get called, and the time will
+                            // remain high res, that could mess things
+                            // up on your system.
+                            // info here:http://www.geisswerks.com/ryan/FAQS/timing.html
+#endif
 
 #ifdef TARGET_LINUX
 	if(std::locale().name() == "C"){
@@ -173,7 +174,7 @@ void ofSetMainLoop(shared_ptr<ofMainLoop> newMainLoop) {
 
 //--------------------------------------
 int ofRunApp(ofBaseApp * OFSA){
-	mainLoop()->run(std::move(shared_ptr<ofBaseApp>(OFSA)));
+	mainLoop()->run(shared_ptr<ofBaseApp>(OFSA));
 	auto ret = ofRunMainLoop();
 #if !defined(TARGET_ANDROID) && !defined(TARGET_OF_IOS)
 	ofExitCallback();

libs/openFrameworks/math/ofMath.h

@@ -441,13 +441,13 @@ bool ofLineSegmentIntersection(const vectype& line1Start, const vectype& line1En
 	compareB = diffLB.x*line2Start.y - diffLB.y*line2Start.x;
 	if (
 		(
-			( ( diffLA.x*line2Start.y - diffLA.y*line2Start.x ) < compareA ) ^
-			( ( diffLA.x*line2End.y - diffLA.y*line2End.x ) < compareA )
+			( ( diffLA.x*line2Start.y - diffLA.y*line2Start.x ) <= compareA ) ^
+			( ( diffLA.x*line2End.y - diffLA.y*line2End.x ) <= compareA )
 		)
 		&&
 		(
-			( ( diffLB.x*line1Start.y - diffLB.y*line1Start.x ) < compareB ) ^
-			( ( diffLB.x*line1End.y - diffLB.y*line1End.x) < compareB )
+			( ( diffLB.x*line1Start.y - diffLB.y*line1Start.x ) <= compareB ) ^
+			( ( diffLB.x*line1End.y - diffLB.y*line1End.x) <= compareB )
 		)
 	)
 	{

libs/openFrameworks/sound/ofSoundBaseTypes.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ofConstants.h"
+#include "ofFileUtils.h"
 #include <functional>
 
 class ofSoundBuffer;

libs/openFrameworks/types/ofParameter.h

@@ -747,7 +747,7 @@ inline void ofParameter<ParameterType>::eventsSetValue(const ParameterType & v){
 			// Erase each invalid parent
 			obj->parents.erase(std::remove_if(obj->parents.begin(),
 											  obj->parents.end(),
-											  [this](const std::weak_ptr<ofParameterGroup::Value> & p){ return p.expired(); }),
+											  [](const std::weak_ptr<ofParameterGroup::Value> & p){ return p.expired(); }),
 							   obj->parents.end());
 
 			// notify all leftover (valid) parents of this object's changed value.