Skip to content

Another minor fblits refactor #2002

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

Merged
itzpr3d4t0r merged 3 commits into from
Mar 11, 2023
Merged

Another minor fblits refactor #2002

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b09082
refactor
itzpr3d4t0r Mar 7, 2023
9b81149
refactors 2
itzpr3d4t0r Mar 8, 2023
05b4d9e
moved blit_sequence to top of var definition. renamed flags_numeric->…
itzpr3d4t0r Mar 11, 2023
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
23 changes: 11 additions & 12 deletions src_c/surface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2139,25 +2139,24 @@ surf_fblits(pgSurfaceObject *self, PyObject *const *args, Py_ssize_t nargs)
SURF_INIT_CHECK(dest)

SDL_Rect *src_rect, temp, dest_rect;
PyObject *item = NULL, *src_surf = NULL, *blit_pos = NULL;
PyObject *blit_sequence;
int error = 0, flags_numeric = 0;
PyObject *blit_sequence, *item, *src_surf, *blit_pos;
int blend_flags = 0; /* Default flag is 0, opaque */
int error = 0;

if (nargs == 0 || nargs > 2) {
error = FBLITS_ERR_INCORRECT_ARGS_NUM;
goto on_error;
}
/* Get the blend flags if they are passed */
else if (nargs == 2) {
if (PyLong_Check(args[1])) {
flags_numeric = PyLong_AsLong(args[1]);
if (PyErr_Occurred()) {
return NULL;
}
}
else {
if (!PyLong_Check(args[1])) {
error = FBLITS_ERR_FLAG_NOT_NUMERIC;
goto on_error;
}
blend_flags = PyLong_AsLong(args[1]);
if (PyErr_Occurred()) {
return NULL;
}
}

blit_sequence = args[0];
Expand Down Expand Up @@ -2206,7 +2205,7 @@ surf_fblits(pgSurfaceObject *self, PyObject *const *args, Py_ssize_t nargs)

/* Perform the blit */
if (pgSurface_Blit(self, (pgSurfaceObject *)src_surf, &dest_rect,
NULL, flags_numeric)) {
NULL, blend_flags)) {
error = BLITS_ERR_BLIT_FAIL;
goto on_error;
}
Expand Down Expand Up @@ -2256,7 +2255,7 @@ surf_fblits(pgSurfaceObject *self, PyObject *const *args, Py_ssize_t nargs)

/* Perform the blit */
if (pgSurface_Blit(self, (pgSurfaceObject *)src_surf, &dest_rect,
NULL, flags_numeric)) {
NULL, blend_flags)) {
error = BLITS_ERR_BLIT_FAIL;
goto on_error;
}
Expand Down