style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Wed, 13 Jun 2012 19:07:09 +0000 (19:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 13 Jun 2012 19:07:09 +0000 (19:07 +0000)
source/blender/compositor/operations/COM_CompositorOperation.cpp
source/blender/compositor/operations/COM_CompositorOperation.h

index 4ce7ffac9ef8e76a74b3dcca7f9463dc98fbaa4d..11cb4f7fc74c8287c79d7bdef9f2837f947b5ed5 100644 (file)
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *             Jeroen Bakker 
+ * Contributor:
+ *             Jeroen Bakker
  *             Monique Dewanchand
  */
 
@@ -53,14 +53,14 @@ void CompositorOperation::initExecution()
        this->imageInput = getInputSocketReader(0);
        this->alphaInput = getInputSocketReader(1);
        if (this->getWidth() * this->getHeight() != 0) {
-               this->outputBuffer=(float*) MEM_callocN(this->getWidth()*this->getHeight()*4*sizeof(float), "CompositorOperation");
+               this->outputBuffer = (float *) MEM_callocN(this->getWidth() * this->getHeight() * 4 * sizeof(float), "CompositorOperation");
        }
 }
 
 void CompositorOperation::deinitExecution()
 {
        if (isBreaked()) {
-               const Scene * scene = this->scene;
+               const Scene *scene = this->scene;
                Render *re = RE_GetRender(scene->id.name);
                RenderResult *rr = RE_AcquireResultWrite(re);
                if (rr) {
@@ -85,14 +85,14 @@ void CompositorOperation::deinitExecution()
                        MEM_freeN(this->outputBuffer);
                }
        }
-       
+
        this->outputBuffer = NULL;
        this->imageInput = NULL;
        this->alphaInput = NULL;
 }
 
 
-void CompositorOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers)
+void CompositorOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers)
 {
        float color[8]; // 7 is enough
        float *buffer = this->outputBuffer;
@@ -102,50 +102,47 @@ void CompositorOperation::executeRegion(rcti *rect, unsigned int tileNumber, Mem
        int y1 = rect->ymin;
        int x2 = rect->xmax;
        int y2 = rect->ymax;
-       int offset = (y1*this->getWidth() + x1 ) * COM_NUMBER_OF_CHANNELS;
+       int offset = (y1 * this->getWidth() + x1) * COM_NUMBER_OF_CHANNELS;
        int x;
        int y;
        bool breaked = false;
 
-       for (y = y1 ; y < y2 && (!breaked); y++) {
-               for (x = x1 ; x < x2 && (!breaked) ; x++) {
+       for (y = y1; y < y2 && (!breaked); y++) {
+               for (x = x1; x < x2 && (!breaked); x++) {
                        imageInput->read(color, x, y, COM_PS_NEAREST, memoryBuffers);
                        if (alphaInput != NULL) {
                                alphaInput->read(&(color[3]), x, y, COM_PS_NEAREST, memoryBuffers);
                        }
-                       buffer[offset] = color[0];
-                       buffer[offset+1] = color[1];
-                       buffer[offset+2] = color[2];
-                       buffer[offset+3] = color[3];
-                       offset +=COM_NUMBER_OF_CHANNELS;
+                       copy_v4_v4(buffer + offset, color);
+                       offset += COM_NUMBER_OF_CHANNELS;
                        if (isBreaked()) {
                                breaked = true;
                        }
                }
-               offset += (this->getWidth()-(x2-x1))*COM_NUMBER_OF_CHANNELS;
+               offset += (this->getWidth() - (x2 - x1)) * COM_NUMBER_OF_CHANNELS;
        }
 }
 
 void CompositorOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
-       int width = this->scene->r.xsch*this->scene->r.size/100;
-       int height = this->scene->r.ysch*this->scene->r.size/100;
-       
+       int width = this->scene->r.xsch * this->scene->r.size / 100;
+       int height = this->scene->r.ysch * this->scene->r.size / 100;
+
        // check actual render resolution with cropping it may differ with cropped border.rendering
        // FIX for: [31777] Border Crop gives black (easy)
-       Render *re= RE_GetRender(this->scene->id.name);
+       Render *re = RE_GetRender(this->scene->id.name);
        if (re) {
-               RenderResult *rr= RE_AcquireResultRead(re);
+               RenderResult *rr = RE_AcquireResultRead(re);
                if (rr) {
                        width = rr->rectx;
                        height = rr->recty;
                }
                RE_ReleaseResult(re);
        }
-       
+
        preferredResolution[0] = width;
        preferredResolution[1] = height;
-       
+
        NodeOperation::determineResolution(resolution, preferredResolution);
 
        resolution[0] = width;
index 36099b3eb91a0b8eb6387ed1da852810947c2174..0129c953946921e522b47cc2872d3bbb3c685357 100644 (file)
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *             Jeroen Bakker 
+ * Contributor:
+ *             Jeroen Bakker
  *             Monique Dewanchand
  */
 
 #include "BLI_rect.h"
 
 /**
 * @brief Compositor output operation
 */
+ * @brief Compositor output operation
+ */
 class CompositorOperation : public NodeOperation {
 private:
        /**
-         * @brief local reference to the scene
-         */
+        * @brief local reference to the scene
+        */
        const Scene *scene;
-       
+
        /**
-         * @brief reference to the output float buffer
-         */
+        * @brief reference to the output float buffer
+        */
        float *outputBuffer;
-       
+
        /**
-         * @brief local reference to the input image operation
-         */
+        * @brief local reference to the input image operation
+        */
        SocketReader *imageInput;
 
        /**
-         * @brief local reference to the input alpha operation
-         */
+        * @brief local reference to the input alpha operation
+        */
        SocketReader *alphaInput;
 public:
        CompositorOperation();
-       void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers);
-       void setScene(const Scene *scene) {this->scene = scene;}
-       bool isOutputOperation(bool rendering) const {return true;}
+       void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers);
+       void setScene(const Scene *scene) { this->scene = scene; }
+       bool isOutputOperation(bool rendering) const { return true; }
        void initExecution();
        void deinitExecution();
-       const CompositorPriority getRenderPriority() const {return COM_PRIORITY_MEDIUM;}
+       const CompositorPriority getRenderPriority() const { return COM_PRIORITY_MEDIUM; }
        void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 };
 #endif