Fix some Clang warnings.

diff --git a/flow.cpp b/flow.cpp
index 71b0b23c6f85033f10cdbe93fb12798e2649778e..68392dc535b5a13c2efe5234a037347431df53af 100644 (file)
--- a/flow.cpp
+++ b/flow.cpp
@@ -953,11 +953,8 @@ void Blend::exec(GLuint image_tex, GLuint flow_tex, GLuint output_tex, GLuint ou
        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
 
-Interpolate::Interpolate(int width, int height, const OperatingPoint &op, bool split_ycbcr_output)
-       : width(width),
-         height(height),
-         flow_level(op.finest_level),
-         op(op),
+Interpolate::Interpolate(const OperatingPoint &op, bool split_ycbcr_output)
+       : flow_level(op.finest_level),
          split_ycbcr_output(split_ycbcr_output),
          splat(op),
          blend(split_ycbcr_output) {

diff --git a/flow.h b/flow.h
index 9536a3808034868810f4ba3143d782b3315b11a4..af3f8103d5e9c0c817b0f5ca59a6d4f82d5c0972 100644 (file)
--- a/flow.h
+++ b/flow.h
@@ -541,7 +541,7 @@ private:
 
 class Interpolate {
 public:
-       Interpolate(int width, int height, const OperatingPoint &op, bool split_ycbcr_output);
+       Interpolate(const OperatingPoint &op, bool split_ycbcr_output);
 
        // Returns a texture (or two, if split_ycbcr_output is true) that must
        // be released with release_texture() after use. image_tex must be a
@@ -553,10 +553,9 @@ public:
        }
 
 private:
-       int width, height, flow_level;
+       int flow_level;
        GLuint vertex_vbo, vao;
        TexturePool pool;
-       const OperatingPoint op;
        const bool split_ycbcr_output;
 
        Splat splat;

diff --git a/flow_main.cpp b/flow_main.cpp
index a961a60a9aa805df282ddd7b4a4e6fd4d428c1ea..ecaee058d78ce5b62e385160fff60549be6d8a1a 100644 (file)
--- a/flow_main.cpp
+++ b/flow_main.cpp
@@ -379,7 +379,7 @@ void interpolate_image(int argc, char **argv, int optind)
        }
        DISComputeFlow compute_flow(width1, height1, op);
        GrayscaleConversion gray;
-       Interpolate interpolate(width1, height1, op, /*split_ycbcr_output=*/false);
+       Interpolate interpolate(op, /*split_ycbcr_output=*/false);
 
        GLuint tex_gray;
        glCreateTextures(GL_TEXTURE_2D_ARRAY, 1, &tex_gray);

diff --git a/video_stream.cpp b/video_stream.cpp
index aa93dc7a0a02499a8e4555bb655adae6bfa1ad0a..2a75e20167b0f7921a90f0731438b86ac6e24c75 100644 (file)
--- a/video_stream.cpp
+++ b/video_stream.cpp
@@ -243,7 +243,7 @@ VideoStream::VideoStream()
        check_error();
 
        compute_flow.reset(new DISComputeFlow(width, height, operating_point2));
-       interpolate.reset(new Interpolate(width, height, operating_point2, /*split_ycbcr_output=*/true));
+       interpolate.reset(new Interpolate(operating_point2, /*split_ycbcr_output=*/true));
        chroma_subsampler.reset(new ChromaSubsampler);
        check_error();
 }

diff --git a/video_stream.h b/video_stream.h
index b86d271e0c473e7ec98874abdec639970ddc31df..5b8df260f89018641cf8d2836a819eb1da550f6c 100644 (file)
--- a/video_stream.h
+++ b/video_stream.h
@@ -78,8 +78,6 @@ private:
        std::string stream_mux_header;
        bool seen_sync_markers = false;
 
-       QSurface *gl_surface;
-
        // Effectively only converts from 4:2:2 to 4:4:4.
        // TODO: Have a separate version with ResampleEffect, for scaling?
        std::unique_ptr<movit::EffectChain> ycbcr_planar_convert_chain;