ofPixels.h/cpp remove move on return to allow copy ellision (#6407)

#changelog #graphics
openframeworks · Oct 24, 2019 · 951d1e0 · 951d1e0
1 parent 6079447
commit 951d1e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libs/openFrameworks/graphics/ofPixels.cpp b/libs/openFrameworks/graphics/ofPixels.cpp
@@ -944,7 +944,7 @@ ofPixels_<PixelType> ofPixels_<PixelType>::getPlane(size_t planeIdx){
 		case OF_PIXELS_UNKNOWN:
 			break;
 	}
-	return std::move(plane);
+	return plane;
 }
 
 template<typename PixelType>
@@ -1009,7 +1009,7 @@ ofPixels_<PixelType> ofPixels_<PixelType>::getChannel(size_t channel) const{
 	for(auto p: getConstPixelsIter()){
 		*channelPixel++ = p[channel];
 	}
-	return std::move(channelPixels);
+	return channelPixels;
 }
 
 template<typename PixelType>

diff --git a/libs/openFrameworks/graphics/ofPixels.h b/libs/openFrameworks/graphics/ofPixels.h
@@ -1093,15 +1093,15 @@ template<typename PixelType>
 inline ofPixels_<PixelType> ofPixels_<PixelType>::Line::asPixels(){
 	ofPixels_<PixelType> pixels;
 	pixels.setFromExternalPixels(_begin,stride/componentsPerPixel,1,pixelFormat);
-	return std::move(pixels);
+	return pixels;
 }
 
 //----------------------------------------------------------------------
 template<typename PixelType>
 inline const ofPixels_<PixelType> ofPixels_<PixelType>::Line::asPixels() const{
 	ofPixels_<PixelType> pixels;
 	pixels.setFromExternalPixels(_begin,stride/componentsPerPixel,1,pixelFormat);
-	return std::move(pixels);
+	return pixels;
 }
 
 //----------------------------------------------------------------------