UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

REVIEW: GetImageData() and GetImageAlphaBorder()

Browse source
This commit is contained in:
raysan5 2019-11-04 13:30:55 +01:00
parent 5d9df629d7
commit e8b89b5ecf
1 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/textures.c
View file

@ -171,7 +171,7 @@ static Image LoadDDS(const char *fileName); // Load DDS file
static Image LoadPKM(const char *fileName); // Load PKM file static Image LoadPKM(const char *fileName); // Load PKM file
#endif #endif
#if defined(SUPPORT_FILEFORMAT_KTX) #if defined(SUPPORT_FILEFORMAT_KTX)
static Image LoadKTX(const char *fileName); // Load KTX file static Image LoadKTX(const char *fileName); // Load KTX file
static int SaveKTX(Image image, const char *fileName); // Save image data as KTX file static int SaveKTX(Image image, const char *fileName); // Save image data as KTX file
#endif #endif
#if defined(SUPPORT_FILEFORMAT_PVR) #if defined(SUPPORT_FILEFORMAT_PVR)
@ -459,6 +459,8 @@ Color *GetImageData(Image image)
{ {
Color *pixels = (Color *)RL_MALLOC(image.width*image.height*sizeof(Color)); Color *pixels = (Color *)RL_MALLOC(image.width*image.height*sizeof(Color));
if (pixels == NULL) return pixels;
if (image.format >= COMPRESSED_DXT1_RGB) TraceLog(LOG_WARNING, "Pixel data retrieval not supported for compressed image formats"); if (image.format >= COMPRESSED_DXT1_RGB) TraceLog(LOG_WARNING, "Pixel data retrieval not supported for compressed image formats");
else else
{ {
@ -683,31 +685,36 @@ Vector4 *GetImageDataNormalized(Image image)
// Get image alpha border rectangle // Get image alpha border rectangle
Rectangle GetImageAlphaBorder(Image image, float threshold) Rectangle GetImageAlphaBorder(Image image, float threshold)
{ {
Rectangle crop = { 0 };
Color *pixels = GetImageData(image); Color *pixels = GetImageData(image);
int xMin = 65536; // Define a big enough number if (pixels != NULL)
int xMax = 0;
int yMin = 65536;
int yMax = 0;
for (int y = 0; y < image.height; y++)
{ {
for (int x = 0; x < image.width; x++) int xMin = 65536; // Define a big enough number
int xMax = 0;
int yMin = 65536;
int yMax = 0;
for (int y = 0; y < image.height; y++)
{ {
if (pixels[y*image.width + x].a > (unsigned char)(threshold*255.0f)) for (int x = 0; x < image.width; x++)
{ {
if (x < xMin) xMin = x; if (pixels[y*image.width + x].a > (unsigned char)(threshold*255.0f))
if (x > xMax) xMax = x; {
if (y < yMin) yMin = y; if (x < xMin) xMin = x;
if (y > yMax) yMax = y; if (x > xMax) xMax = x;
if (y < yMin) yMin = y;
if (y > yMax) yMax = y;
}
} }
} }
crop = (Rectangle){ xMin, yMin, (xMax + 1) - xMin, (yMax + 1) - yMin };
RL_FREE(pixels);
} }
Rectangle crop = { xMin, yMin, (xMax + 1) - xMin, (yMax + 1) - yMin };
RL_FREE(pixels);
return crop; return crop;
} }