Ignore:
Timestamp:
Mar 25, 2013, 2:39:16 AM (6 years ago)
Author:
ldelgass
Message:

Fix crash on getting transfer function name, remove unused plane command.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/nanovis/TransferFunction.h

    r3502 r3568  
    1717#define TRANSFER_FUNCTION_H
    1818
     19#include <string>
     20
    1921#include <vrmath/Vector3f.h>
    2022
     
    2426{
    2527public:
    26     TransferFunction(int size, float *data);
     28    TransferFunction(const char *name, int size, float *data);
    2729
    2830    void update(float *data);
     
    5759    const char *name() const
    5860    {
    59         return _name;
    60     }
    61 
    62     void name(const char *name)
    63     {
    64         _name = name;
     61        return _name.c_str();
    6562    }
    6663
     
    7774    float *_data;
    7875    Texture1D *_tex;    ///< the texture storing the colors
    79     const char *_name;
     76    std::string _name;
    8077    GLuint _id;         ///< OpenGL texture identifier
    8178};
Note: See TracChangeset for help on using the changeset viewer.