From b7b513b70b516c922371d90d51b7c30cb6f7a245 Mon Sep 17 00:00:00 2001 From: Isaac Aronson Date: Sat, 8 Jun 2024 22:32:59 -0500 Subject: [PATCH] Fix bytes_per_pixel rename --- src/video/SDL_blit_A.c | 4 ++-- src/video/SDL_fillrect.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c index 4a36e5ecd..3b97440ac 100644 --- a/src/video/SDL_blit_A.c +++ b/src/video/SDL_blit_A.c @@ -1219,7 +1219,7 @@ SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface *surface) } case 2: - if (sf->BytesPerPixel == 4 && sf->Amask == 0xff000000 && sf->Gmask == 0xff00 && ((sf->Rmask == 0xff && df->Rmask == 0x1f) || (sf->Bmask == 0xff && df->Bmask == 0x1f))) { + if (sf->bytes_per_pixel == 4 && sf->Amask == 0xff000000 && sf->Gmask == 0xff00 && ((sf->Rmask == 0xff && df->Rmask == 0x1f) || (sf->Bmask == 0xff && df->Bmask == 0x1f))) { if (df->Gmask == 0x7e0) { return BlitARGBto565PixelAlpha; } else if (df->Gmask == 0x3e0) { @@ -1230,7 +1230,7 @@ SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface *surface) case 4: #if defined(SDL_SSE4_1_INTRINSICS) || defined(SDL_AVX2_INTRINSICS) - if (sf->BytesPerPixel == 4 && df->BytesPerPixel == 4 && (SDL_HasSSE41() || SDL_HasAVX2())) { + if (sf->bytes_per_pixel == 4 && df->bytes_per_pixel == 4 && (SDL_HasSSE41() || SDL_HasAVX2())) { return BlitNtoNPixelAlpha; } #endif diff --git a/src/video/SDL_fillrect.c b/src/video/SDL_fillrect.c index 04aa925fb..f47572032 100644 --- a/src/video/SDL_fillrect.c +++ b/src/video/SDL_fillrect.c @@ -292,7 +292,7 @@ int SDL_FillSurfaceRects(SDL_Surface *dst, const SDL_Rect *rects, int count, } if (fill_function == NULL) { - switch (dst->format->BytesPerPixel) { + switch (dst->format->bytes_per_pixel) { case 1: { color |= (color << 8);