1 files changed, 35 insertions, 32 deletions

diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cpp b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
index 32229e2d912..ff20d4cf7f9 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
@@ -21,8 +21,12 @@
  */
 
 #include "COM_MemoryBuffer.h"
+
 #include "MEM_guardedalloc.h"
-//#include "BKE_global.h"
+
+using std::min;
+using std::max;
+
 #include "COM_MemoryBufferColor.h"
 #include "COM_MemoryBufferVector.h"
 #include "COM_MemoryBufferValue.h"
@@ -46,7 +50,7 @@ MemoryBuffer* MemoryBuffer::create(MemoryProxy *memoryProxy, unsigned int chunkN
 	type = memoryProxy->getDataType();
 
 	if (type == COM_DT_VALUE) {
-        return new MemoryBufferValue(memoryProxy, chunkNumber, rect);
+		return new MemoryBufferValue(memoryProxy, chunkNumber, rect);
 	}
 	else if (type == COM_DT_VECTOR) {
 		return new MemoryBufferVector(memoryProxy, chunkNumber, rect);
@@ -57,30 +61,30 @@ MemoryBuffer* MemoryBuffer::create(MemoryProxy *memoryProxy, unsigned int chunkN
 }
 
 MemoryBuffer* MemoryBuffer::create(MemoryProxy *memoryProxy, rcti *rect) {
-    DataType type;
-    type = memoryProxy->getDataType();
+	DataType type;
+	type = memoryProxy->getDataType();
 
-    if (type==COM_DT_VALUE){
-        return new MemoryBufferValue(memoryProxy, rect);
-    }
-    else if (type == COM_DT_VECTOR) {
-        return new MemoryBufferVector(memoryProxy, rect);
-    }
-    else {
-        return new MemoryBufferColor(memoryProxy, rect);
-    }
+	if (type==COM_DT_VALUE){
+		return new MemoryBufferValue(memoryProxy, rect);
+	}
+	else if (type == COM_DT_VECTOR) {
+		return new MemoryBufferVector(memoryProxy, rect);
+	}
+	else {
+		return new MemoryBufferColor(memoryProxy, rect);
+	}
 }
 
 MemoryBuffer* MemoryBuffer::create(DataType datatype, rcti *rect) {
-    if (datatype==COM_DT_VALUE){
-        return new MemoryBufferValue(datatype, rect);
-    }
-    else if (datatype == COM_DT_VECTOR) {
-        return new MemoryBufferVector(datatype, rect);
-    }
-    else {
-        return new MemoryBufferColor(datatype, rect);
-    }
+	if (datatype==COM_DT_VALUE){
+		return new MemoryBufferValue(datatype, rect);
+	}
+	else if (datatype == COM_DT_VECTOR) {
+		return new MemoryBufferVector(datatype, rect);
+	}
+	else {
+		return new MemoryBufferColor(datatype, rect);
+	}
 }
 
 MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber, rcti *rect, unsigned int no_channels)
@@ -106,13 +110,13 @@ MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, rcti *rect, unsigned int no
 }
 
 MemoryBuffer::MemoryBuffer(DataType datatype, rcti *rect, unsigned int no_channels) {
-    BLI_rcti_init(&this->m_rect, rect->xmin, rect->xmax, rect->ymin, rect->ymax);
-    this->m_memoryProxy = NULL;
-    this->m_chunkNumber = -1;
-    this->m_buffer = (float *)MEM_mallocN(sizeof(float) * determineBufferSize() * no_channels, "COM_MemoryBuffer");
-    this->m_state = COM_MB_TEMPORARILY;
-    this->m_chunkWidth = this->m_rect.xmax - this->m_rect.xmin;
-    this->m_no_channels = no_channels;
+	BLI_rcti_init(&this->m_rect, rect->xmin, rect->xmax, rect->ymin, rect->ymax);
+	this->m_memoryProxy = NULL;
+	this->m_chunkNumber = -1;
+	this->m_buffer = (float *)MEM_mallocN(sizeof(float) * determineBufferSize() * no_channels, "COM_MemoryBuffer");
+	this->m_state = COM_MB_TEMPORARILY;
+	this->m_chunkWidth = this->m_rect.xmax - this->m_rect.xmin;
+	this->m_no_channels = no_channels;
 }
 
 void MemoryBuffer::clear()
@@ -174,7 +178,7 @@ float MemoryBuffer::getMaximumValue(rcti *rect)
 	BLI_rcti_isect(rect, &this->m_rect, &rect_clamp);
 
 	if (!BLI_rcti_is_empty(&rect_clamp)) {
-        MemoryBuffer *temp = MemoryBuffer::create(COM_DT_VALUE, &rect_clamp);
+		MemoryBuffer *temp = MemoryBuffer::create(COM_DT_VALUE, &rect_clamp);
 		temp->copyContentFrom(this);
 		float result = temp->getMaximumValue();
 		delete temp;
@@ -189,7 +193,7 @@ float MemoryBuffer::getMaximumValue(rcti *rect)
 MemoryBuffer::~MemoryBuffer()
 {
 	if (this->m_buffer) {
-        MEM_freeN(this->m_buffer);
+		MEM_freeN(this->m_buffer);
 		this->m_buffer = NULL;
 	}
 }
@@ -197,4 +201,3 @@ MemoryBuffer::~MemoryBuffer()
 const int MemoryBuffer::get_no_channels() const {
 	return this->m_no_channels;
 }
-