Skip to content

Commit b02b24f

Browse files
committed
SDL3: image: fix bits -> loss conversion
1 parent 1a73b32 commit b02b24f

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

src_c/image.c

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -454,17 +454,10 @@ tobytes_surf_32bpp(SDL_Surface *surf, SDL_PixelFormat *format_details,
454454
{
455455
int w, h;
456456

457-
#if SDL_VERSION_ATLEAST(3, 0, 0)
458-
Uint32 Rloss = format_details->Rbits;
459-
Uint32 Gloss = format_details->Gbits;
460-
Uint32 Bloss = format_details->Bbits;
461-
Uint32 Aloss = format_details->Abits;
462-
#else
463-
Uint32 Rloss = format_details->Rloss;
464-
Uint32 Gloss = format_details->Gloss;
465-
Uint32 Bloss = format_details->Bloss;
466-
Uint32 Aloss = format_details->Aloss;
467-
#endif
457+
Uint32 Rloss = PG_FORMAT_R_LOSS(format_details);
458+
Uint32 Gloss = PG_FORMAT_G_LOSS(format_details);
459+
Uint32 Bloss = PG_FORMAT_B_LOSS(format_details);
460+
Uint32 Aloss = PG_FORMAT_A_LOSS(format_details);
468461
Uint32 Rmask = format_details->Rmask;
469462
Uint32 Gmask = format_details->Gmask;
470463
Uint32 Bmask = format_details->Bmask;
@@ -566,18 +559,14 @@ image_tobytes(PyObject *self, PyObject *arg, PyObject *kwarg)
566559
return RAISE(pgExc_SDLError, SDL_GetError());
567560
}
568561
SDL_Palette *surf_palette = PG_GetSurfacePalette(surf);
569-
Rloss = format_details->Rbits;
570-
Gloss = format_details->Gbits;
571-
Bloss = format_details->Bbits;
572-
Aloss = format_details->Abits;
573562
#else
574563
SDL_PixelFormat *format_details = surf->format;
575564
SDL_Palette *surf_palette = surf->format->palette;
576-
Rloss = format_details->Rloss;
577-
Gloss = format_details->Gloss;
578-
Bloss = format_details->Bloss;
579-
Aloss = format_details->Aloss;
580565
#endif
566+
Rloss = PG_FORMAT_R_LOSS(format_details);
567+
Gloss = PG_FORMAT_G_LOSS(format_details);
568+
Bloss = PG_FORMAT_B_LOSS(format_details);
569+
Aloss = PG_FORMAT_A_LOSS(format_details);
581570
Rmask = format_details->Rmask;
582571
Gmask = format_details->Gmask;
583572
Bmask = format_details->Bmask;

0 commit comments

Comments
 (0)