[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43216] branches/tile/source/blender/ compositor: cleanup, removing .orig files

Dalai Felinto dfelinto at gmail.com
Sun Jan 8 03:21:31 CET 2012


Revision: 43216
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43216
Author:   dfelinto
Date:     2012-01-08 02:21:30 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
cleanup, removing .orig files

Removed Paths:
-------------
    branches/tile/source/blender/compositor/intern/COM_ColorSpaces.cpp.orig
    branches/tile/source/blender/compositor/nodes/COM_ColorSpaceNode.cpp.orig
    branches/tile/source/blender/compositor/nodes/COM_ColorSpaceNode.h.orig
    branches/tile/source/blender/compositor/operations/COM_ConvertColorSpaceOperation.cpp.orig
    branches/tile/source/blender/compositor/operations/COM_ConvertColorSpaceOperation.h.orig

Deleted: branches/tile/source/blender/compositor/intern/COM_ColorSpaces.cpp.orig
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_ColorSpaces.cpp.orig	2012-01-08 02:11:59 UTC (rev 43215)
+++ branches/tile/source/blender/compositor/intern/COM_ColorSpaces.cpp.orig	2012-01-08 02:21:30 UTC (rev 43216)
@@ -1,68 +0,0 @@
-#include "COM_colorspace.h"
-#include "OpenColorIO.h"
-#include "DNA_color_types.h"
-#include "BKE_global.h"
-#include "BKE_main.h"
-#include "DNA_listBase.h"
-#include "BLI_listbase.h"
-#include "BLI_string.h"
-
-namespace OCIO = OCIO_NAMESPACE;
-
-static EnumPropertyItem* _COM_colorspaces=0;
-
-void initColorSpaces() {
-
-    G.main->colorspaces.first = NULL;
-
-    OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig();
-    int nrColorSpaces = config->getNumColorSpaces();
-    for (int index = 0 ; index < nrColorSpaces; index ++) {
-        OCIO::ConstColorSpaceRcPtr colorspace = config->getColorSpace(config->getColorSpaceNameByIndex(index));
-
-
-        ColorSpace * colorSpace = new ColorSpace();
-        colorSpace->index = index;
-        BLI_strncpy(colorSpace->name, colorspace->getName(), 32);
-        BLI_strncpy(colorSpace->family, colorspace->getFamily(), 32);
-//        BLI_strncpy(colorSpace->role, colorspace->getRole(), 32);
-        BLI_addtail(&G.main->colorspaces, colorSpace);
-    }
-}
-
-void initColorSpaces2() {
-    int numberOfColorSpaces = BLI_countlist(&G.main->colorspaces);
-
-    EnumPropertyItem* item = new EnumPropertyItem[numberOfColorSpaces+1];
-
-    ColorSpace * colorspace = (ColorSpace*)G.main->colorspaces.first;
-    int index = 0;
-    for (; colorspace != NULL; colorspace = colorspace->next, index++) {
-        item[index].value = colorspace->index;
-        item[index].name = colorspace->name;
-        item[index].identifier = colorspace->name;
-        item[index].icon = 0;
-        item[index].description= colorspace->name;
-    }
-    item[index].value = 0;
-    item[index].name = NULL;
-    item[index].identifier = NULL;
-    item[index].icon = 0;
-    item[index].description= NULL;
-
-    _COM_colorspaces = item;
-}
-
-/// @todo: needs refactoring
-extern EnumPropertyItem* COM_getColorSpaces() {
-    if (_COM_colorspaces == 0) {
-        initColorSpaces();
-        initColorSpaces2();
-    }
-    return _COM_colorspaces;
-}
-
-
-
-
-

Deleted: branches/tile/source/blender/compositor/nodes/COM_ColorSpaceNode.cpp.orig
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_ColorSpaceNode.cpp.orig	2012-01-08 02:11:59 UTC (rev 43215)
+++ branches/tile/source/blender/compositor/nodes/COM_ColorSpaceNode.cpp.orig	2012-01-08 02:21:30 UTC (rev 43216)
@@ -1,20 +0,0 @@
-#include "COM_ColorSpaceNode.h"
-
-#include "COM_ConvertColorSpaceOperation.h"
-#include "COM_ExecutionSystem.h"
-
-ColorSpaceNode::ColorSpaceNode(bNode *editorNode) : Node(editorNode) {
-}
-
-void ColorSpaceNode::convertToOperations(ExecutionSystem *graph) {
-    InputSocket *inputSocket = this->getInputSocket(0);
-    OutputSocket *outputSocket = this->getOutputSocket(0);
-    ConvertColorSpaceOperation *operation = new ConvertColorSpaceOperation();
-
-    operation->setInputProfile(this->getEditorNode()->custom1);
-    operation->setOutputProfile(this->getEditorNode()->custom2);
-
-    inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph);
-    outputSocket->relinkConnections(operation->getOutputSocket(0));
-    graph->addOperation(operation);
-}

Deleted: branches/tile/source/blender/compositor/nodes/COM_ColorSpaceNode.h.orig
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_ColorSpaceNode.h.orig	2012-01-08 02:11:59 UTC (rev 43215)
+++ branches/tile/source/blender/compositor/nodes/COM_ColorSpaceNode.h.orig	2012-01-08 02:21:30 UTC (rev 43216)
@@ -1,12 +0,0 @@
-#ifndef _COM_ColorSpaceNode_h_
-#define _COM_ColorSpaceNode_h_
-
-#include "COM_Node.h"
-
-class ColorSpaceNode: public Node {
-public:
-    ColorSpaceNode(bNode *editorNode);
-    void convertToOperations(ExecutionSystem* graph);
-};
-
-#endif

Deleted: branches/tile/source/blender/compositor/operations/COM_ConvertColorSpaceOperation.cpp.orig
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_ConvertColorSpaceOperation.cpp.orig	2012-01-08 02:11:59 UTC (rev 43215)
+++ branches/tile/source/blender/compositor/operations/COM_ConvertColorSpaceOperation.cpp.orig	2012-01-08 02:21:30 UTC (rev 43216)
@@ -1,42 +0,0 @@
-#include "COM_ConvertColorSpaceOperation.h"
-#include "COM_OutputSocket.h"
-#include "OpenColorIO.h"
-#include <stdio.h>
-namespace OCIO = OCIO_NAMESPACE;
-
-ConvertColorSpaceOperation::ConvertColorSpaceOperation(): NodeOperation("ConvertColorSpace") {
-    this->addInputSocket(*(new InputSocket("Image", COM_DT_COLOR)));
-    this->addOutputSocket(*(new OutputSocket("Image", COM_DT_COLOR)));
-    this->inputOperation = NULL;
-    this->config = OCIO::GetCurrentConfig();
-    this->useProcessor = false;
-//    this->setCpuBound(true);
-    this->inputProfile = 0;
-    this->outputProfile = 0;
-}
-
-void ConvertColorSpaceOperation::initExecution() {
-    this->inputOperation = getInputProgram(0);
-    try {
-        const char *input = config->getColorSpaceNameByIndex(this->inputProfile);
-        const char *output = config->getColorSpaceNameByIndex(this->outputProfile);
-        printf("Converting from %s to %s\n", input, output);
-        this->processor = config->getProcessor(input, output);
-        this->useProcessor = true;
-    } catch (OCIO::Exception &exceptoin) {
-        this->useProcessor = false;
-    }
-}
-
-void ConvertColorSpaceOperation::executeNAryProgram(float* outputValue, float x, float y, MemoryBuffer *inputBuffers[]) {
-    this->inputOperation->executeNAryProgram(outputValue, x, y, inputBuffers);
-    if (this->useProcessor) {
-        processor->applyRGBA(outputValue);
-    }
-}
-
-void ConvertColorSpaceOperation::deinitExecution() {
-    this->inputOperation = NULL;
-    this->useProcessor = false;
-}
-

Deleted: branches/tile/source/blender/compositor/operations/COM_ConvertColorSpaceOperation.h.orig
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_ConvertColorSpaceOperation.h.orig	2012-01-08 02:11:59 UTC (rev 43215)
+++ branches/tile/source/blender/compositor/operations/COM_ConvertColorSpaceOperation.h.orig	2012-01-08 02:21:30 UTC (rev 43216)
@@ -1,37 +0,0 @@
-#ifndef _COM_ConvertColorSpaceOperation_h
-#define _COM_ConvertColorSpaceOperation_h
-#include "COM_NodeOperation.h"
-#include "OpenColorIO.h"
-
-namespace OCIO = OCIO_NAMESPACE;
-
-/**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
-class ConvertColorSpaceOperation : public NodeOperation {
-private:
-    NodeOperation *inputOperation;
-    int inputProfile;
-    int outputProfile;
-    OCIO::ConstConfigRcPtr config;
-    OCIO::ConstProcessorRcPtr processor;
-    bool useProcessor;
-public:
-    /**
-      * Default constructor
-      */
-    ConvertColorSpaceOperation();
-
-    /**
-      * the inner loop of this program
-      */
-    void executeNAryProgram(float* color, float x, float y, MemoryBuffer *inputBuffers[]);
-
-    void initExecution();
-    void deinitExecution();
-
-    void setInputProfile(int inputProfile) {this->inputProfile = inputProfile; }
-    void setOutputProfile(int outputProfile) {this->outputProfile = outputProfile; }
-};
-#endif



More information about the Bf-blender-cvs mailing list