Skip to content

Fix linking issues #5

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.

Sign up for GitHub

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

Open
oliv3 wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix linking issues #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f232d4b
Prevent multiple definition of 'stretching_buffer' at link time.
oliv3 Jan 2, 2022
d8e765e
Add 'core'.
oliv3 Jan 2, 2022
18c241f
screen_getaddress() already checks 'stretch' value.
oliv3 Jan 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*~
effectv
v4lutils/v4ltest
core
6 changes: 1 addition & 5 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,7 @@ static int startTV(const char *startEffect)
} else {
if(screen_lock() == 0) {
src = (RGB32 *)video_getaddress();
if(stretch) {
dest = stretching_buffer;
} else {
dest = (RGB32 *)screen_getaddress();
}
dest = (RGB32 *)screen_getaddress();

ret = currentEffect->draw(src, dest);

Expand Down
3 changes: 3 additions & 0 deletions screen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
#include "EffecTV.h"
#include "utils.h"

/* Defined in image.c */
extern RGB32 *stretching_buffer;

/* Main screen for displaying video image */
SDL_Surface *screen;
SDL_Window *window;
Expand Down
2 changes: 0 additions & 2 deletions utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ void fastsrand(unsigned int);
/*
* image.c
*/

RGB32 *stretching_buffer;
int image_init(void);
void image_end(void);
void image_stretching_buffer_clear(RGB32 color);
Expand Down