>
> From: Christophe de Dinechin <dinechin@xxxxxxxxxx>
>
> In file included from mjpeg-fallback.cpp:8:
> ./mjpeg-fallback.hpp:28:25: warning: 'VideoCodecType' overrides a member
> function but is not marked 'override' [-Winconsistent-missing-override]
> SpiceVideoCodecType VideoCodecType() const;
> ^
> ../include/spice-streaming-agent/plugin.hpp:92:33: note: overridden virtual
> function is here
> virtual SpiceVideoCodecType VideoCodecType() const = 0;
> ^
>
> Signed-off-by: Christophe de Dinechin <dinechin@xxxxxxxxxx>
> ---
> src/mjpeg-fallback.cpp | 4 ++--
> src/mjpeg-fallback.hpp | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/mjpeg-fallback.cpp b/src/mjpeg-fallback.cpp
> index 74682f3..3366764 100644
> --- a/src/mjpeg-fallback.cpp
> +++ b/src/mjpeg-fallback.cpp
> @@ -47,7 +47,7 @@ public:
> ~MjpegFrameCapture();
> FrameInfo CaptureFrame() override;
> void Reset() override;
> - SpiceVideoCodecType VideoCodecType() const {
> + SpiceVideoCodecType VideoCodecType() const override {
> return SPICE_VIDEO_CODEC_TYPE_MJPEG;
> }
> private:
> @@ -129,7 +129,7 @@ FrameInfo MjpegFrameCapture::CaptureFrame()
>
> int format = ZPixmap;
> // TODO handle errors
> - XImage *image = XGetImage(dpy, win, win_info.x, win_info.y,
> + XImage *image = XGetImage(dpy, win, win_info.x, win_info.y,
> win_info.width, win_info.height, AllPlanes,
> format);
>
> // TODO handle errors
I personally don't like spurious changes not related to the
reason of this change.
I would prefer this hunk to be in a separate patch.
> diff --git a/src/mjpeg-fallback.hpp b/src/mjpeg-fallback.hpp
> index 04fa2eb..ca5c7d3 100644
> --- a/src/mjpeg-fallback.hpp
> +++ b/src/mjpeg-fallback.hpp
> @@ -25,7 +25,7 @@ public:
> FrameCapture *CreateCapture() override;
> unsigned Rank() override;
> void ParseOptions(const ConfigureOption *options);
> - SpiceVideoCodecType VideoCodecType() const;
> + SpiceVideoCodecType VideoCodecType() const override;
> private:
> MjpegSettings settings = { 10, 80 };
> };
Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel