Stop using static initialisation so that dcpomatic::write() can be called more than...

[dcpomatic.git] / src / wx / gl_video_view.cc

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index be13cea43c1510fbf98c3b4314266c8d12a87b74..29d44fcd2a6bf9bbd0126573b432a7dc815347b5 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -408,10 +408,9 @@ GLVideoView::setup_shaders ()
                        glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &log_length);
                        string log;
                        if (log_length > 0) {
-                               char* log_char = new char[log_length];
-                               glGetShaderInfoLog(shader, log_length, nullptr, log_char);
-                               log = string(log_char);
-                               delete[] log_char;
+                               std::vector<char> log_char(log_length);
+                               glGetShaderInfoLog(shader, log_length, nullptr, log_char.data());
+                               log = string(log_char.data());
                        }
                        glDeleteShader(shader);
                        throw GLError(String::compose("Could not compile shader (%1)", log).c_str(), -1);
@@ -437,10 +436,9 @@ GLVideoView::setup_shaders ()
                glGetProgramiv(program, GL_INFO_LOG_LENGTH, &log_length);
                string log;
                if (log_length > 0) {
-                       char* log_char = new char[log_length];
-                       glGetProgramInfoLog(program, log_length, nullptr, log_char);
-                       log = string(log_char);
-                       delete[] log_char;
+                       std::vector<char> log_char(log_length);
+                       glGetProgramInfoLog(program, log_length, nullptr, log_char.data());
+                       log = string(log_char.data());
                }
                glDeleteProgram (program);
                throw GLError(String::compose("Could not link shader (%1)", log).c_str(), -1);
@@ -468,7 +466,7 @@ GLVideoView::setup_shaders ()
        check_gl_error ("glGetUniformLocation");
        glUniformMatrix4fv (colour_conversion, 1, GL_TRUE, gl_matrix);
 
-       glLineWidth (2.0f);
+       glLineWidth (1.0f);
        check_gl_error ("glLineWidth");
        glEnable (GL_BLEND);
        check_gl_error ("glEnable");
@@ -538,7 +536,7 @@ GLVideoView::draw ()
                check_gl_error ("glDrawElements");
        }
        if (auto guess = _viewer->crop_guess()) {
-               glUniform1i(_fragment_type, 1);
+               glUniform1i(_fragment_type, static_cast<GLint>(FragmentType::CROP_GUESS));
                glDrawElements (GL_LINES, indices_crop_guess_number, GL_UNSIGNED_INT, reinterpret_cast<void*>(indices_crop_guess_offset * sizeof(int)));
                check_gl_error ("glDrawElements");
        }