Commit 4b59681c authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot

Merge topic 'android_fix_to_string'

20524d86 fix a missed case of std::to_string
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !4766
parents 28283d02 20524d86
...@@ -233,7 +233,7 @@ public: ...@@ -233,7 +233,7 @@ public:
vtkCustomUniform1iv( const int count, const int *v ) { SetValue(count,v); } vtkCustomUniform1iv( const int count, const int *v ) { SetValue(count,v); }
void SetValue( const int count, const int *v ) { value.assign( v, v + count ); } void SetValue( const int count, const int *v ) { value.assign( v, v + count ); }
std::string GetGlslDec( std::string name ) override std::string GetGlslDec( std::string name ) override
{ return std::string("uniform int ") + name + "[" + std::to_string(value.size()) + "];\n"; } { return std::string("uniform int ") + name + "[" + patch::to_string(value.size()) + "];\n"; }
bool SetUniform( const char * name, vtkShaderProgram * p ) override bool SetUniform( const char * name, vtkShaderProgram * p ) override
{ return p->SetUniform1iv( name, static_cast<int>(value.size()), value.data() ); } { return p->SetUniform1iv( name, static_cast<int>(value.size()), value.data() ); }
void PrintSelf( const char * name, ostream& os, vtkIndent indent ) override void PrintSelf( const char * name, ostream& os, vtkIndent indent ) override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment