[Bf-blender-cvs] [68824d5] blender-tiles: Allignment

Jeroen Bakker noreply at git.blender.org
Wed Jul 9 20:37:47 CEST 2014


Commit: 68824d5202a157bbea48c9dcbb4fb9214b9bb24d
Author: Jeroen Bakker
Date:   Wed Jul 9 20:31:22 2014 +0200
https://developer.blender.org/rB68824d5202a157bbea48c9dcbb4fb9214b9bb24d

Allignment

===================================================================

M	source/blender/compositor/intern/COM_MemoryBufferValue.cpp
M	source/blender/compositor/intern/COM_MemoryBufferValue.h
M	source/blender/compositor/intern/COM_MemoryBufferVector.cpp
M	source/blender/compositor/intern/COM_MemoryBufferVector.h
M	source/blender/compositor/intern/COM_Node.cpp

===================================================================

diff --git a/source/blender/compositor/intern/COM_MemoryBufferValue.cpp b/source/blender/compositor/intern/COM_MemoryBufferValue.cpp
index 42afb4d..0aff4c0 100644
--- a/source/blender/compositor/intern/COM_MemoryBufferValue.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBufferValue.cpp
@@ -35,12 +35,12 @@ MemoryBufferValue::MemoryBufferValue(MemoryProxy *memoryProxy, rcti *rect) :
 }
 
 MemoryBufferValue::MemoryBufferValue(DataType datatype, rcti *rect) :
-    MemoryBuffer(datatype, rect, NUMBER_OF_CHANNELS) {
+	MemoryBuffer(datatype, rect, NUMBER_OF_CHANNELS) {
 }
 
 MemoryBuffer *MemoryBufferValue::duplicate()
 {
-    MemoryBufferValue *result = new MemoryBufferValue(this->m_memoryProxy, &this->m_rect);
+	MemoryBufferValue *result = new MemoryBufferValue(this->m_memoryProxy, &this->m_rect);
 	memcpy(result->getBuffer(), this->getBuffer(), this->determineBufferSize() * NUMBER_OF_CHANNELS * sizeof(float));
 	return result;
 }
@@ -50,7 +50,7 @@ MemoryBuffer *MemoryBufferValue::duplicate()
 void MemoryBufferValue::writePixel(int x, int y, const float *color)
 {
 	if (x >= this->m_rect.xmin && x < this->m_rect.xmax &&
-	    y >= this->m_rect.ymin && y < this->m_rect.ymax)
+		y >= this->m_rect.ymin && y < this->m_rect.ymax)
 	{
 		const int offset = (this->m_chunkWidth * (y - this->m_rect.ymin) + x - this->m_rect.xmin) * NUMBER_OF_CHANNELS;
 		copy_v4_v4(&this->m_buffer[offset], color);
@@ -60,17 +60,17 @@ void MemoryBufferValue::writePixel(int x, int y, const float *color)
 void MemoryBufferValue::addPixel(int x, int y, const float *color)
 {
 	if (x >= this->m_rect.xmin && x < this->m_rect.xmax &&
-	    y >= this->m_rect.ymin && y < this->m_rect.ymax)
+		y >= this->m_rect.ymin && y < this->m_rect.ymax)
 	{
 		const int offset = (this->m_chunkWidth * (y - this->m_rect.ymin) + x - this->m_rect.xmin) * NUMBER_OF_CHANNELS;
-        this->m_buffer[offset] = color[0];
+		this->m_buffer[offset] = color[0];
 	}
 }
 
 // --- SAMPLERS ---
 inline void MemoryBufferValue::read(float *result, int x, int y,
-	                 MemoryBufferExtend extend_x,
-	                 MemoryBufferExtend extend_y)
+									MemoryBufferExtend extend_x,
+									MemoryBufferExtend extend_y)
 {
 	bool clip_x = (extend_x == COM_MB_CLIP && (x < m_rect.xmin || x >= m_rect.xmax));
 	bool clip_y = (extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax));
@@ -82,13 +82,13 @@ inline void MemoryBufferValue::read(float *result, int x, int y,
 	{
 		wrap_pixel(x, y, extend_x, extend_y);
 		const int offset = (this->m_chunkWidth * y + x) * NUMBER_OF_CHANNELS;
-        result[0] = this->m_buffer[offset];
+		result[0] = this->m_buffer[offset];
 	}
 }
 
 inline void MemoryBufferValue::readNoCheck(float *result, int x, int y,
-	                        MemoryBufferExtend extend_x,
-	                        MemoryBufferExtend extend_y)
+										   MemoryBufferExtend extend_x,
+										   MemoryBufferExtend extend_y)
 {
 
 	wrap_pixel(x, y, extend_x, extend_y);
@@ -97,14 +97,14 @@ inline void MemoryBufferValue::readNoCheck(float *result, int x, int y,
 	BLI_assert(offset >= 0);
 	BLI_assert(offset < this->determineBufferSize() * NUMBER_OF_CHANNELS);
 	BLI_assert(!(extend_x == COM_MB_CLIP && (x < m_rect.xmin || x >= m_rect.xmax)) &&
-		   !(extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax)));
+			   !(extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax)));
 
-    result[0] = this->m_buffer[offset];
+	result[0] = this->m_buffer[offset];
 }
 
 inline void MemoryBufferValue::readBilinear(float *result, float x, float y,
-			 MemoryBufferExtend extend_x,
-			 MemoryBufferExtend extend_y)
+											MemoryBufferExtend extend_x,
+											MemoryBufferExtend extend_y)
 {
 	int x1 = floor(x);
 	int y1 = floor(y);
@@ -118,35 +118,35 @@ inline void MemoryBufferValue::readBilinear(float *result, float x, float y,
 	float mvaluex = 1.0f - valuex;
 	float mvaluey = 1.0f - valuey;
 
-    float value1;
-    float value2;
-    float value3;
-    float value4;
+	float value1;
+	float value2;
+	float value3;
+	float value4;
 
-    read(&value1, x1, y1);
-    read(&value2, x1, y2);
-    read(&value3, x2, y1);
-    read(&value4, x2, y2);
+	read(&value1, x1, y1);
+	read(&value2, x1, y2);
+	read(&value3, x2, y1);
+	read(&value4, x2, y2);
 
-    value1 = value1 * mvaluey + value2 * valuey;
-    value3 = value3 * mvaluey + value4 * valuey;
-    result[0] = value1 * mvaluex + value3 * valuex;
+	value1 = value1 * mvaluey + value2 * valuey;
+	value3 = value3 * mvaluey + value4 * valuey;
+	result[0] = value1 * mvaluex + value3 * valuex;
 }
 
 float MemoryBufferValue::getMaximumValue() const
 {
-    float result = this->m_buffer[0];
-    const unsigned int size = this->determineBufferSize();
-    unsigned int i;
+	float result = this->m_buffer[0];
+	const unsigned int size = this->determineBufferSize();
+	unsigned int i;
 
-    const float *fp_src = this->m_buffer;
+	const float *fp_src = this->m_buffer;
 
-    for (i = 0; i < size; i++, fp_src += NUMBER_OF_CHANNELS) {
-        float value = *fp_src;
-        if (value > result) {
-            result = value;
-        }
-    }
+	for (i = 0; i < size; i++, fp_src += NUMBER_OF_CHANNELS) {
+		float value = *fp_src;
+		if (value > result) {
+			result = value;
+		}
+	}
 
-    return result;
+	return result;
 }
diff --git a/source/blender/compositor/intern/COM_MemoryBufferValue.h b/source/blender/compositor/intern/COM_MemoryBufferValue.h
index fac376b..8963b78 100644
--- a/source/blender/compositor/intern/COM_MemoryBufferValue.h
+++ b/source/blender/compositor/intern/COM_MemoryBufferValue.h
@@ -33,36 +33,36 @@ protected:
 	/**
 	 * @brief construct new MemoryBuffer for a chunk
 	 */
-    MemoryBufferValue(MemoryProxy *memoryProxy, unsigned int chunkNumber, rcti *rect);
+	MemoryBufferValue(MemoryProxy *memoryProxy, unsigned int chunkNumber, rcti *rect);
 	
 	/**
 	 * @brief construct new temporarily MemoryBuffer for an area
 	 */
-    MemoryBufferValue(MemoryProxy *memoryProxy, rcti *rect);
-    MemoryBufferValue(DataType datatype, rcti *rect);
+	MemoryBufferValue(MemoryProxy *memoryProxy, rcti *rect);
+	MemoryBufferValue(DataType datatype, rcti *rect);
 
 public:
 	void writePixel(int x, int y, const float *color);
 	void addPixel(int x, int y, const float *color);
 	void read(float *result, int x, int y,
-	                 MemoryBufferExtend extend_x = COM_MB_CLIP,
-	                 MemoryBufferExtend extend_y = COM_MB_CLIP);
+				MemoryBufferExtend extend_x = COM_MB_CLIP,
+				MemoryBufferExtend extend_y = COM_MB_CLIP);
 
 	void readNoCheck(float *result, int x, int y,
-	                        MemoryBufferExtend extend_x = COM_MB_CLIP,
-	                        MemoryBufferExtend extend_y = COM_MB_CLIP);
+					MemoryBufferExtend extend_x = COM_MB_CLIP,
+					MemoryBufferExtend extend_y = COM_MB_CLIP);
 
 	void readBilinear(float *result, float x, float y,
-	                         MemoryBufferExtend extend_x = COM_MB_CLIP,
-	                         MemoryBufferExtend extend_y = COM_MB_CLIP);
+					 MemoryBufferExtend extend_x = COM_MB_CLIP,
+					 MemoryBufferExtend extend_y = COM_MB_CLIP);
 
-    float getMaximumValue() const;
+	float getMaximumValue() const;
 	MemoryBuffer *duplicate();
 
 	friend class MemoryBuffer;
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-    MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryBufferValue")
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryBufferValue")
 #endif
 };
 #endif
diff --git a/source/blender/compositor/intern/COM_MemoryBufferVector.cpp b/source/blender/compositor/intern/COM_MemoryBufferVector.cpp
index 9c65147..88fcc31 100644
--- a/source/blender/compositor/intern/COM_MemoryBufferVector.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBufferVector.cpp
@@ -35,7 +35,7 @@ MemoryBufferVector::MemoryBufferVector(MemoryProxy *memoryProxy, rcti *rect) :
 }
 
 MemoryBufferVector::MemoryBufferVector(DataType datatype, rcti *rect) :
-    MemoryBuffer(datatype, rect, NUMBER_OF_CHANNELS) {
+	MemoryBuffer(datatype, rect, NUMBER_OF_CHANNELS) {
 }
 
 
@@ -51,7 +51,7 @@ MemoryBuffer *MemoryBufferVector::duplicate()
 void MemoryBufferVector::writePixel(int x, int y, const float *color)
 {
 	if (x >= this->m_rect.xmin && x < this->m_rect.xmax &&
-	    y >= this->m_rect.ymin && y < this->m_rect.ymax)
+		y >= this->m_rect.ymin && y < this->m_rect.ymax)
 	{
 		const int offset = (this->m_chunkWidth * (y - this->m_rect.ymin) + x - this->m_rect.xmin) * NUMBER_OF_CHANNELS;
 		copy_v4_v4(&this->m_buffer[offset], color);
@@ -61,7 +61,7 @@ void MemoryBufferVector::writePixel(int x, int y, const float *color)
 void MemoryBufferVector::addPixel(int x, int y, const float *color)
 {
 	if (x >= this->m_rect.xmin && x < this->m_rect.xmax &&
-	    y >= this->m_rect.ymin && y < this->m_rect.ymax)
+		y >= this->m_rect.ymin && y < this->m_rect.ymax)
 	{
 		const int offset = (this->m_chunkWidth * (y - this->m_rect.ymin) + x - this->m_rect.xmin) * NUMBER_OF_CHANNELS;
 		add_v4_v4(&this->m_buffer[offset], color);
@@ -70,8 +70,8 @@ void MemoryBufferVector::addPixel(int x, int y, const float *color)
 
 // --- SAMPLERS ---
 inline void MemoryBufferVector::read(float *result, int x, int y,
-	                 MemoryBufferExtend extend_x,
-	                 MemoryBufferExtend extend_y)
+									 MemoryBufferExtend extend_x,
+									 MemoryBufferExtend extend_y)
 {
 	bool clip_x = (extend_x == COM_MB_CLIP && (x < m_rect.xmin || x >= m_rect.xmax));
 	bool clip_y = (extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax));
@@ -88,8 +88,8 @@ inline void MemoryBufferVector::read(float *result, int x, int y,
 }
 
 inline void MemoryBufferVector::readNoCheck(float *result, int x, int y,
-	                        MemoryBufferExtend extend_x,
-	                        MemoryBufferExtend extend_y)
+											MemoryBufferExtend extend_x,
+											MemoryBufferExtend extend_y)
 {
 
 	wrap_pixel(x, y, extend_x, extend_y);
@@ -104,8 +104,8 @@ inline void MemoryBufferVector::readNoCheck(float *result, int x, int y,
 }
 
 inline void MemoryBufferVector::readBilinear(float *result, float x, float y,
-			 MemoryBufferExtend extend_x,
-			 MemoryBufferExtend extend_y)
+											 MemoryBufferExtend extend_x,
+											 MemoryBufferExtend extend_y)


@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list