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

fixes to rasters and images

Browse Source
This commit is contained in:
aap
2020-07-23 22:35:58 +02:00
parent 49ca300b88
commit fa6277be34
4 changed files with 115 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/d3d/d3d.cpp
View File

@@ -907,14 +907,14 @@ rasterToImage(Raster *raster)
}
}
out = image->pixels;
uint8 *dst = image->pixels;
in = raster->lock(0, Raster::LOCKREAD);
if(pallength)
memcpy(out, in, raster->width*raster->height);
else
// TODO: stride
for(int32 y = 0; y < image->height; y++)
for(int32 x = 0; x < image->width; x++)
memcpy(dst, in, raster->width*raster->height);
else{
for(int32 y = 0; y < image->height; y++){
out = dst;
for(int32 x = 0; x < image->width; x++){
switch(raster->format & 0xF00){
case Raster::C8888:
out[0] = in[2];
@@ -922,30 +922,33 @@ rasterToImage(Raster *raster)
out[2] = in[0];
out[3] = in[3];
in += 4;
out += 4;
break;
case Raster::C888:
out[0] = in[2];
out[1] = in[1];
out[2] = in[0];
in += 4;
out += 3;
break;
case Raster::C1555:
out[0] = in[0];
out[1] = in[1];
in += 2;
out += 2;
break;
case Raster::C555:
out[0] = in[0];
out[1] = in[1] | 0x80;
in += 2;
out += 2;
break;
}
out += image->bpp;
}
dst += image->stride;
}
}
raster->unlock(0);
image->compressPalette();
return image;
}