Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark a Clip::GetFrame() override as such #679

Merged
merged 4 commits into from May 30, 2021

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented May 30, 2021

I finally got tired of seeing this in my build output:

[104/104] Processing file .../src/effects/ObjectDetection.cpp
In file included from .../tests/FrameMapper.cpp:34:
.../src/Clip.h:233:36:
warning: 'GetFrame' overrides a member function but is not marked 'override'
[-Winconsistent-missing-override]
                std::shared_ptr<openshot::Frame>
GetFrame(std::shared_ptr<openshot::Frame> background_frame,
int64_t frame_number);
                                                 ^
.../src/ClipBase.h:104:44:
note: overridden virtual function is here
                virtual std::shared_ptr<openshot::Frame>
GetFrame(std::shared_ptr<openshot::Frame> frame, int64_t frame_number) = 0;
                                                         ^
1 warning generated.

Also, fixed some indentation while I was there.

@ferdnyc ferdnyc added the code Source code cleanup, streamlining, or style tweaks label May 30, 2021
@codecov
Copy link

codecov bot commented May 30, 2021

Codecov Report

Merging #679 (088e318) into develop (b09416c) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #679   +/-   ##
========================================
  Coverage    52.39%   52.39%           
========================================
  Files          151      151           
  Lines        12365    12365           
========================================
  Hits          6479     6479           
  Misses        5886     5886           
Impacted Files Coverage Δ
src/Clip.h 75.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b09416c...088e318. Read the comment docs.

@ferdnyc ferdnyc merged commit 129619f into OpenShot:develop May 30, 2021
@ferdnyc ferdnyc deleted the fix-getframe-override branch May 30, 2021 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code Source code cleanup, streamlining, or style tweaks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant