Fix pixel data size regressions (#5984)

GideonSerf · gideons · web-flow · commit a9a0c046f1f8 · 2026-07-16T12:07:19.000+02:00
Co-authored-by: gideons &lt;gse@newspacesystems.com&gt;
diff --git a/src/rlgl.h b/src/rlgl.h
@@ -5237,7 +5237,7 @@ static int rlGetPixelDataSize(int width, int height, int format)
         {
             int blockWidth = (width + 3)/4;
             int blockHeight = (height + 3)/4;
-            unsigned long long dataSizeBytes = blockWidth*blockHeight*8;
+            unsigned long long dataSizeBytes = (unsigned long long)blockWidth*blockHeight*8;
             if (dataSizeBytes < INT_MAX) dataSize = (int)dataSizeBytes;
             
         } break;
@@ -5248,15 +5248,15 @@ static int rlGetPixelDataSize(int width, int height, int format)
         {
             int blockWidth = (width + 3)/4;
             int blockHeight = (height + 3)/4;
-            unsigned long long dataSizeBytes = blockWidth*blockHeight*16;
+            unsigned long long dataSizeBytes = (unsigned long long)blockWidth*blockHeight*16;
             if (dataSizeBytes < INT_MAX) dataSize = (int)dataSizeBytes;
             
         } break;
         case RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA: // 4 bytes per each 4x4 block
         {
             int blockWidth = (width + 3)/4;
             int blockHeight = (height + 3)/4;
-            unsigned long long dataSizeBytes = blockWidth*blockHeight*4;
+            unsigned long long dataSizeBytes = (unsigned long long)blockWidth*blockHeight*4;
             if (dataSizeBytes < INT_MAX) dataSize = (int)dataSizeBytes;
             
         } break;
@@ -5267,7 +5267,7 @@ static int rlGetPixelDataSize(int width, int height, int format)
     if ((format >= RL_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE) &&
         (format <= RL_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16))
     {
-        unsigned long long dataSizeBytes = (width*height*bpp) >> 3;  // Get size in bytes (dividing by 8)
+        unsigned long long dataSizeBytes = ((unsigned long long)width*height*bpp) >> 3;  // Get size in bytes (dividing by 8)
         if (dataSizeBytes < INT_MAX) dataSize = (int)dataSizeBytes;
     }
     
diff --git a/src/rtextures.c b/src/rtextures.c
@@ -2693,8 +2693,9 @@ void ImageRotate(Image *image, int degrees)
         int width = (int)(fabsf(image->width*cosRadius) + fabsf(image->height*sinRadius));
         int height = (int)(fabsf(image->height*cosRadius) + fabsf(image->width*sinRadius));
 
-        int bytesPerPixel = GetPixelDataSize(width, height, image->format);
-        unsigned char *rotatedData = (unsigned char *)RL_CALLOC(bytesPerPixel, 1);
+        int dataSize = GetPixelDataSize(width, height, image->format);
+        int bytesPerPixel = GetPixelDataSize(1, 1, image->format);
+        unsigned char *rotatedData = (unsigned char *)RL_CALLOC(dataSize, 1);
 
         if (rotatedData != NULL)
         {
@@ -5514,7 +5515,7 @@ int GetPixelDataSize(int width, int height, int format)
         default: break;
     }
     
-    unsigned long long dataSizeBytes = (width*height*bpp) >> 3;  // Get size in bytes (dividing by 8)
+    unsigned long long dataSizeBytes = ((unsigned long long)width*height*bpp) >> 3;  // Get size in bytes (dividing by 8)
 
     if (dataSizeBytes < INT_MAX)
     {

Original file line number	Diff line number	Diff line change
`@@ -2693,8 +2693,9 @@ void ImageRotate(Image *image, int degrees)`
`2693`	`2693`	`int width = (int)(fabsf(image->widthcosRadius) + fabsf(image->heightsinRadius));`
`2694`	`2694`	`int height = (int)(fabsf(image->heightcosRadius) + fabsf(image->widthsinRadius));`
`2695`	`2695`
`2696`		`- int bytesPerPixel = GetPixelDataSize(width, height, image->format);`
`2697`		`- unsigned char rotatedData = (unsigned char )RL_CALLOC(bytesPerPixel, 1);`
	`2696`	`+ int dataSize = GetPixelDataSize(width, height, image->format);`
	`2697`	`+ int bytesPerPixel = GetPixelDataSize(1, 1, image->format);`
	`2698`	`+ unsigned char rotatedData = (unsigned char )RL_CALLOC(dataSize, 1);`
`2698`	`2699`
`2699`	`2700`	`if (rotatedData != NULL)`
`2700`	`2701`	`{`
`@@ -5514,7 +5515,7 @@ int GetPixelDataSize(int width, int height, int format)`
`5514`	`5515`	`default: break;`
`5515`	`5516`	`}`
`5516`	`5517`
`5517`		`- unsigned long long dataSizeBytes = (widthheightbpp) >> 3; // Get size in bytes (dividing by 8)`
	`5518`	`+ unsigned long long dataSizeBytes = ((unsigned long long)widthheightbpp) >> 3; // Get size in bytes (dividing by 8)`
`5518`	`5519`
`5519`	`5520`	`if (dataSizeBytes < INT_MAX)`
`5520`	`5521`	`{`