Commit: 970f24a1560664c37d3ca4508915aee34539558f
Author: Jeroen Bakker
Date: Wed Jul 9 20:15:39 2014 +0200
https://developer.blender.org/rB970f24a1560664c37d3ca4508915aee34539558f
Renamed no_channels to num_channels
===================================================================
M source/blender/compositor/COM_defines.h
M source/blender/compositor/intern/COM_MemoryBuffer.cpp
M source/blender/compositor/intern/COM_MemoryBuffer.h
M source/blender/compositor/intern/COM_MemoryBufferColor.cpp
M source/blender/compositor/intern/COM_MemoryBufferValue.cpp
M source/blender/compositor/intern/COM_MemoryBufferVector.cpp
M source/blender/compositor/intern/COM_OpenCLDevice.cpp
M source/blender/compositor/operations/COM_CompositorOperation.cpp
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
M source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
M source/blender/compositor/operations/COM_GlareGhostOperation.cpp
M source/blender/compositor/operations/COM_InpaintOperation.cpp
M source/blender/compositor/operations/COM_NormalizeOperation.cpp
M
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
M source/blender/compositor/operations/COM_VectorBlurOperation.cpp
M source/blender/compositor/operations/COM_WriteBufferOperation.cpp
===================================================================
diff --git a/source/blender/compositor/COM_defines.h
b/source/blender/compositor/COM_defines.h
index 969d2a7..9936914 100644
--- a/source/blender/compositor/COM_defines.h
+++ b/source/blender/compositor/COM_defines.h
@@ -105,9 +105,9 @@ typedef enum OrderOfChunks {
#define COM_RULE_OF_THIRDS_DIVIDER 100.0f
-#define COM_NO_CHANNELS_VALUE 1
-#define COM_NO_CHANNELS_VECTOR 3
-#define COM_NO_CHANNELS_COLOR 4
+#define COM_NUM_CHANNELS_VALUE 1
+#define COM_NUM_CHANNELS_VECTOR 3
+#define COM_NUM_CHANNELS_COLOR 4
#define COM_BLUR_BOKEH_PIXELS 512
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cpp
b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
index a4ebfa2..05e8a0d 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
@@ -87,41 +87,41 @@ MemoryBuffer* MemoryBuffer::create(DataType datatype, rcti
*rect) {
}
}
-MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber,
rcti *rect, unsigned int no_channels)
+MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber,
rcti *rect, unsigned int num_channels)
{
BLI_rcti_init(&this->m_rect, rect->xmin, rect->xmax, rect->ymin,
rect->ymax);
this->m_memoryProxy = memoryProxy;
this->m_chunkNumber = chunkNumber;
- this->m_buffer = (float *)MEM_mallocN_aligned(sizeof(float) *
determineBufferSize() * no_channels, 16, "COM_MemoryBuffer");
+ this->m_buffer = (float *)MEM_mallocN_aligned(sizeof(float) *
determineBufferSize() * num_channels, 16, "COM_MemoryBuffer");
this->m_state = COM_MB_ALLOCATED;
this->m_chunkWidth = this->m_rect.xmax - this->m_rect.xmin;
- this->m_no_channels = no_channels;
+ this->m_num_channels = num_channels;
}
-MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, rcti *rect, unsigned int
no_channels)
+MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, rcti *rect, unsigned int
num_channels)
{
BLI_rcti_init(&this->m_rect, rect->xmin, rect->xmax, rect->ymin,
rect->ymax);
this->m_memoryProxy = memoryProxy;
this->m_chunkNumber = -1;
- this->m_buffer = (float *)MEM_mallocN_aligned(sizeof(float) *
determineBufferSize() * no_channels, 16, "COM_MemoryBuffer");
+ this->m_buffer = (float *)MEM_mallocN_aligned(sizeof(float) *
determineBufferSize() * num_channels, 16, "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;
+ this->m_num_channels = num_channels;
}
-MemoryBuffer::MemoryBuffer(DataType datatype, rcti *rect, unsigned int
no_channels) {
+MemoryBuffer::MemoryBuffer(DataType datatype, rcti *rect, unsigned int
num_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_aligned(sizeof(float) *
determineBufferSize() * no_channels, 16, "COM_MemoryBuffer");
+ this->m_buffer = (float *)MEM_mallocN_aligned(sizeof(float) *
determineBufferSize() * num_channels, 16, "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;
+ this->m_num_channels = num_channels;
}
void MemoryBuffer::clear()
{
- memset(this->m_buffer, 0, this->determineBufferSize() *
this->m_no_channels * sizeof(float));
+ memset(this->m_buffer, 0, this->determineBufferSize() *
this->m_num_channels * sizeof(float));
}
void MemoryBuffer::copyContentFrom(MemoryBuffer *otherBuffer)
@@ -140,9 +140,9 @@ void MemoryBuffer::copyContentFrom(MemoryBuffer
*otherBuffer)
for (otherY = minY; otherY < maxY; otherY++) {
- otherOffset = ((otherY - otherBuffer->m_rect.ymin) *
otherBuffer->m_chunkWidth + minX - otherBuffer->m_rect.xmin) *
this->m_no_channels;
- offset = ((otherY - this->m_rect.ymin) * this->m_chunkWidth +
minX - this->m_rect.xmin) * this->m_no_channels;
- memcpy(&this->m_buffer[offset],
&otherBuffer->m_buffer[otherOffset], (maxX - minX) * this->m_no_channels *
sizeof(float));
+ otherOffset = ((otherY - otherBuffer->m_rect.ymin) *
otherBuffer->m_chunkWidth + minX - otherBuffer->m_rect.xmin) *
this->m_num_channels;
+ offset = ((otherY - this->m_rect.ymin) * this->m_chunkWidth +
minX - this->m_rect.xmin) * this->m_num_channels;
+ memcpy(&this->m_buffer[offset],
&otherBuffer->m_buffer[otherOffset], (maxX - minX) * this->m_num_channels *
sizeof(float));
}
}
@@ -158,7 +158,7 @@ float *MemoryBuffer::convertToValueBuffer()
const float *fp_src = this->m_buffer;
float *fp_dst = result;
- for (i = 0; i < size; i++, fp_dst++, fp_src += COM_NO_CHANNELS_COLOR) {
+ for (i = 0; i < size; i++, fp_dst++, fp_src += COM_NUM_CHANNELS_COLOR) {
*fp_dst = *fp_src;
}
@@ -198,6 +198,6 @@ MemoryBuffer::~MemoryBuffer()
}
}
-const int MemoryBuffer::get_no_channels() const {
- return this->m_no_channels;
+const int MemoryBuffer::get_num_channels() const {
+ return this->m_num_channels;
}
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h
b/source/blender/compositor/intern/COM_MemoryBuffer.h
index cdf2fe7..8eddcb9 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -75,7 +75,7 @@ private:
/**
* @brief the number of channels that form a single pixel in this buffer
*/
- unsigned int m_no_channels;
+ unsigned int m_num_channels;
protected:
@@ -102,23 +102,23 @@ protected:
/**
* @brief construct new MemoryBuffer for a chunk
*
- * @param no_channels Number of channels that must be allocated for
every pixel
+ * @param num_channels Number of channels that must be allocated for
every pixel
*/
- MemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber, rcti
*rect, unsigned int no_channels);
+ MemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber, rcti
*rect, unsigned int num_channels);
/**
* @brief construct new temporarily MemoryBuffer for an area
*
- * @param no_channels Number of channels that must be allocated for
every pixel
+ * @param num_channels Number of channels that must be allocated for
every pixel
*/
- MemoryBuffer(MemoryProxy *memoryProxy, rcti *rect, unsigned int
no_channels);
+ MemoryBuffer(MemoryProxy *memoryProxy, rcti *rect, unsigned int
num_channels);
/**
* @brief construct new temporarily MemoryBuffer for an area
*
- * @param no_channels Number of channels that must be allocated for every
pixel
+ * @param num_channels Number of channels that must be allocated for every
pixel
*/
- MemoryBuffer(DataType datatype, rcti *rect, unsigned int no_channels);
+ MemoryBuffer(DataType datatype, rcti *rect, unsigned int num_channels);
public:
/**
* @brief factory method for the constructor, selecting the right
subclass
@@ -257,7 +257,7 @@ public:
* Vector= 3
* Color = 4
*/
- const int get_no_channels() const;
+ const int get_num_channels() const;
protected:
unsigned int determineBufferSize() const;
diff --git a/source/blender/compositor/intern/COM_MemoryBufferColor.cpp
b/source/blender/compositor/intern/COM_MemoryBufferColor.cpp
index 82ea320..1513e2a 100644
--- a/source/blender/compositor/intern/COM_MemoryBufferColor.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBufferColor.cpp
@@ -22,7 +22,7 @@
#include "COM_MemoryBufferColor.h"
-#define NUMBER_OF_CHANNELS COM_NO_CHANNELS_COLOR
+#define NUMBER_OF_CHANNELS COM_NUM_CHANNELS_COLOR
MemoryBufferColor::MemoryBufferColor(MemoryProxy *memoryProxy, unsigned int
chunkNumber, rcti *rect):
MemoryBuffer(memoryProxy, chunkNumber, rect, NUMBER_OF_CHANNELS)
diff --git a/source/blender/compositor/intern/COM_MemoryBufferValue.cpp
b/source/blender/compositor/intern/COM_MemoryBufferValue.cpp
index 5b7920e..42afb4d 100644
--- a/source/blender/compositor/intern/COM_MemoryBufferValue.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBufferValue.cpp
@@ -22,7 +22,7 @@
#include "COM_MemoryBufferValue.h"
-#define NUMBER_OF_CHANNELS COM_NO_CHANNELS_VALUE
+#define NUMBER_OF_CHANNELS COM_NUM_CHANNELS_VALUE
MemoryBufferValue::MemoryBufferValue(MemoryProxy *memoryProxy, unsigned int
chunkNumber, rcti *rect):
MemoryBuffer(memoryProxy, chunkNumber, rect, NUMBER_OF_CHANNELS)
diff --git a/source/blender/compositor/intern/COM_MemoryBufferVector.cpp
b/source/blender/compositor/intern/COM_MemoryBufferVector.cpp
index 51feb06..9c65147 100644
--- a/source/blender/compositor/intern/COM_MemoryBufferVector.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBufferVector.cpp
@@ -22,7 +22,7 @@
#include "COM_MemoryBufferVector.h"
-#define NUMBER_OF_CHANNELS COM_NO_CHANNELS_VECTOR
+#define NUMBER_OF_CHANNELS COM_NUM_CHANNELS_VECTOR
MemoryBufferVector::MemoryBufferVector(MemoryProxy *memoryProxy, unsigned int
chunkNumber, rcti *rect):
MemoryBuffer(memoryProxy, chunkNumber, rect, NUMBER_OF_CHANNELS)
diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp
b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
index 5976f0c..13093b4 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
@@ -85,10 +85,10 @@ cl_mem
OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel,
const cl_image_format* OpenCLDevice::determineImageFormat(MemoryBuffer
*memoryBuffer)
{
const cl_image_format *imageFormat;
- int no_channels = memoryBuffer->get_no_channels();
- if (no_channels == 1) {
+ int num_channels = memoryBuffer->get_num_channels();
+ if (num_channels == 1) {
imageFormat = &IMAGE_FORMAT_VALUE;
- } else if (no_channels == 3) {
+ } else if (num_channels == 3) {
imageFormat = &IMAGE_FORMAT_VECTOR;
} else {
imageFormat = &IMAGE_FORMAT_COLOR;
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp
b/source/blender/compositor/operations/COM_CompositorOperation.cpp
index 6c59614..96da5d5 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.cpp
+++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp
@@ -141,7 +141,7 @@ void CompositorOperation::executeRegion(Tile* tile)
int y2 = rect->ymax;
int offset = (y1 * this-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
