ofxKinect: std:: conformance (#7642)

#changelog #addons

Author: artificiel

addons/ofxKinect/src/ofxKinect.cpp

@@ -382,7 +382,7 @@ void ofxKinect::update() {
 		tryCount = 0;
 		if(this->lock()) {
             if( videoPixels.getHeight() == videoPixelsIntra.getHeight() ){
-                swap(videoPixels,videoPixelsIntra);
+                std::swap(videoPixels,videoPixelsIntra);
             }else{
 				int minimumSize = MIN(videoPixels.size(), videoPixelsIntra.size());
 				memcpy(videoPixels.getData(), videoPixelsIntra.getData(), minimumSize);
@@ -402,7 +402,7 @@ void ofxKinect::update() {
 		bIsFrameNewDepth = true;
 		tryCount = 0;
 		if(this->lock()) {
-			swap(depthPixelsRaw, depthPixelsRawIntra);
+			std::swap(depthPixelsRaw, depthPixelsRawIntra);
 			bNeedsUpdateDepth = false;
 			this->unlock();
 
@@ -807,7 +807,7 @@ void ofxKinect::grabDepthFrame(freenect_device *dev, void *depth, uint32_t times
 
 	if(kinect->kinectDevice == dev) {
 		kinect->lock();
-		swap(kinect->depthPixelsRawBack,kinect->depthPixelsRawIntra);
+		std::swap(kinect->depthPixelsRawBack,kinect->depthPixelsRawIntra);
 		kinect->bNeedsUpdateDepth = true;
 		kinect->unlock();
 		freenect_set_depth_buffer(kinect->kinectDevice,kinect->depthPixelsRawBack.getData());
@@ -821,7 +821,7 @@ void ofxKinect::grabVideoFrame(freenect_device *dev, void *video, uint32_t times
 
 	if(kinect->kinectDevice == dev) {
 		kinect->lock();
-		swap(kinect->videoPixelsBack,kinect->videoPixelsIntra);
+		std::swap(kinect->videoPixelsBack,kinect->videoPixelsIntra);
 		kinect->bNeedsUpdateVideo = true;
 		kinect->unlock();
 		freenect_set_video_buffer(kinect->kinectDevice,kinect->videoPixelsBack.getData());
@@ -972,7 +972,7 @@ bool ofxKinectContext::open(ofxKinect& kinect, int id) {
 		ofLogError("ofxKinect") << "could not open device " <<  id;
 		return false;
 	}
-	kinects.insert(pair<int,ofxKinect*>(id, &kinect));
+	kinects.insert(std::pair<int,ofxKinect*>(id, &kinect));
 
 	// set kinect id & serial from bus id
 	kinect.deviceId = id;
@@ -1003,7 +1003,7 @@ bool ofxKinectContext::open(ofxKinect& kinect, string serial) {
 		return false;
 	}
 	int index = getDeviceIndex(serial);
-	kinects.insert(pair<int,ofxKinect*>(deviceList[index].id, &kinect));
+	kinects.insert(std::pair<int,ofxKinect*>(deviceList[index].id, &kinect));
 	kinect.deviceId = deviceList[index].id;
 	kinect.serial = serial;
 
@@ -1068,7 +1068,7 @@ void ofxKinectContext::listDevices(bool verbose) {
     if(!isInited())
 		init();
 
-	stringstream stream;
+	std::stringstream stream;
 
 	if(numTotal() == 0) {
 		stream << "no devices found";

examples/computer_vision/kinectExample/src/ofApp.cpp

@@ -124,27 +124,27 @@ void ofApp::draw() {
 
 	// draw instructions
 	ofSetColor(255, 255, 255);
-	stringstream reportStream;
+	std::stringstream reportStream;
 
 	if(kinect.hasAccelControl()) {
 		reportStream << "accel is: " << ofToString(kinect.getMksAccel().x, 2) << " / "
 		<< ofToString(kinect.getMksAccel().y, 2) << " / "
-		<< ofToString(kinect.getMksAccel().z, 2) << endl;
+		<< ofToString(kinect.getMksAccel().z, 2) << std::endl;
 	} else {
-		reportStream << "Note: this is a newer Xbox Kinect or Kinect For Windows device," << endl
-		<< "motor / led / accel controls are not currently supported" << endl << endl;
+		reportStream << "Note: this is a newer Xbox Kinect or Kinect For Windows device," << std::endl
+		<< "motor / led / accel controls are not currently supported" << std::endl << std::endl;
 	}
 
-	reportStream << "press p to switch between images and point cloud, rotate the point cloud with the mouse" << endl
-	<< "using opencv threshold = " << bThreshWithOpenCV <<" (press spacebar)" << endl
-	<< "set near threshold " << nearThreshold << " (press: + -)" << endl
+	reportStream << "press p to switch between images and point cloud, rotate the point cloud with the mouse" << std::endl
+	<< "using opencv threshold = " << bThreshWithOpenCV <<" (press spacebar)" << std::endl
+	<< "set near threshold " << nearThreshold << " (press: + -)" << std::endl
 	<< "set far threshold " << farThreshold << " (press: < >) num blobs found " << contourFinder.nBlobs
-	<< ", fps: " << ofGetFrameRate() << endl
-	<< "press c to close the connection and o to open it again, connection is: " << kinect.isConnected() << endl;
+	<< ", fps: " << ofGetFrameRate() << std::endl
+	<< "press c to close the connection and o to open it again, connection is: " << kinect.isConnected() << std::endl;
 
 	if(kinect.hasCamTiltControl()) {
-		reportStream << "press UP and DOWN to change the tilt angle: " << angle << " degrees" << endl
-		<< "press 1-5 & 0 to change the led mode" << endl;
+		reportStream << "press UP and DOWN to change the tilt angle: " << angle << " degrees" << std::endl
+		<< "press 1-5 & 0 to change the led mode" << std::endl;
 	}
 
 	ofDrawBitmapString(reportStream.str(), 20, 652);
@@ -304,4 +304,4 @@ void ofApp::mouseExited(int x, int y){
 void ofApp::windowResized(int w, int h)
 {
 
-}
+}