random-mirrors/librw
1
0
Fork 0
mirror of https://github.com/aap/librw.git synced 2025-12-19 17:09:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

image masks and raster fixes

Browse Source
This commit is contained in:
aap
2020-07-22 13:56:03 +02:00
parent 853fa44982
commit 4883b03f2b
10 changed files with 569 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gl/gl3raster.cpp
View File

@@ -371,7 +371,7 @@ rasterFromImage(Raster *raster, Image *image)
truecolimg->pixels = image->pixels;
truecolimg->stride = image->stride;
truecolimg->palette = image->palette;
truecolimg->unindex();
truecolimg->unpalettize();
image = truecolimg;
}
@@ -379,34 +379,34 @@ rasterFromImage(Raster *raster, Image *image)
switch(image->depth){
case 32:
#ifdef RW_GLES
conv = conv_RGBA8888_to_RGBA8888;
conv = conv_RGBA8888_from_RGBA8888;
#else
if(raster->format == Raster::C8888)
conv = conv_RGBA8888_to_RGBA8888;
conv = conv_RGBA8888_from_RGBA8888;
else if(raster->format == Raster::C888)
conv = conv_RGB888_to_RGB888;
conv = conv_RGB888_from_RGB888;
else
goto err;
#endif
break;
case 24:
#ifdef RW_GLES
conv = conv_RGB888_to_RGBA8888;
conv = conv_RGB888_from_RGBA8888;
#else
if(raster->format == Raster::C8888)
conv = conv_RGB888_to_RGBA8888;
conv = conv_RGBA8888_from_RGB888;
else if(raster->format == Raster::C888)
conv = conv_RGB888_to_RGB888;
conv = conv_RGB888_from_RGB888;
else
goto err;
#endif
break;
case 16:
#ifdef RW_GLES
conv = conv_RGBA1555_to_RGBA8888;
conv = conv_RGBA8888_from_ARGB1555;
#else
if(raster->format == Raster::C1555)
conv = conv_RGBA1555_to_RGBA5551;
conv = conv_RGBA5551_from_ARGB1555;
else
goto err;
#endif

2
src/gl/gl3shader.cpp
View File

@@ -80,7 +80,7 @@ Shader *currentShader;
static void
printShaderSource(const char **src)
{
int f, l;
int f;
const char *file;
bool printline;
int line = 1;