@@ -454,17 +454,10 @@ tobytes_surf_32bpp(SDL_Surface *surf, SDL_PixelFormat *format_details,
454
454
{
455
455
int w , h ;
456
456
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 );
468
461
Uint32 Rmask = format_details -> Rmask ;
469
462
Uint32 Gmask = format_details -> Gmask ;
470
463
Uint32 Bmask = format_details -> Bmask ;
@@ -566,18 +559,14 @@ image_tobytes(PyObject *self, PyObject *arg, PyObject *kwarg)
566
559
return RAISE (pgExc_SDLError , SDL_GetError ());
567
560
}
568
561
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 ;
573
562
#else
574
563
SDL_PixelFormat * format_details = surf -> format ;
575
564
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 ;
580
565
#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 );
581
570
Rmask = format_details -> Rmask ;
582
571
Gmask = format_details -> Gmask ;
583
572
Bmask = format_details -> Bmask ;
0 commit comments