git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-15 12:34:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

loader/png: revert force colorspace conversion.

Browse source 
We have a base color space conversion in the renderer,
so there's no need to forcefully align with BGRA.
This commit is contained in:
Hermet Park 2023-08-11 19:12:54 +09:00 • committed by Hermet Park
parent 7057dc594d
commit 3601d3db3a
2 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/loaders/png/tvgLodePng.cpp
View file

@ -1762,11 +1762,7 @@ static void getPixelColorsRGBA8(unsigned char* LODEPNG_RESTRICT buffer, size_t n
} else if (mode->colortype == LCT_RGB) { } else if (mode->colortype == LCT_RGB) {
if (mode->bitdepth == 8) { if (mode->bitdepth == 8) {
for (i = 0; i != numpixels; ++i, buffer += num_channels) { for (i = 0; i != numpixels; ++i, buffer += num_channels) {
//lodepng_memcpy(buffer, &in[i * 3], 3); lodepng_memcpy(buffer, &in[i * 3], 3);
//Convert colortype to LCT_BGR?
buffer[0] = in[i * 3 + 2];
buffer[1] = in[i * 3 + 1];
buffer[2] = in[i * 3 + 0];
buffer[3] = 255; buffer[3] = 255;
} }
if (mode->key_defined) { if (mode->key_defined) {
@ -2089,44 +2085,30 @@ static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scan
size_t i; size_t i;
switch (filterType) { switch (filterType) {
case 0: { case 0:
if (bytewidth == 4) { for (i = 0; i != length; ++i) recon[i] = scanline[i];
for (i = 0; i < length; i += 4) {
//RGBA -> BGRA
recon[i + 0] = scanline[i + 2];
recon[i + 1] = scanline[i + 1];
recon[i + 2] = scanline[i + 0];
recon[i + 3] = scanline[i + 3];
}
} else {
for (i = 0; i != length; ++i) recon[i] = scanline[i];
}
break; break;
} case 1:
case 1: {
for (i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; for (i = 0; i != bytewidth; ++i) recon[i] = scanline[i];
for (i = bytewidth; i < length; ++i) recon[i] = scanline[i] + recon[i - bytewidth]; for (i = bytewidth; i < length; ++i) recon[i] = scanline[i] + recon[i - bytewidth];
break; break;
} case 2:
case 2: {
if (precon) { if (precon) {
for (i = 0; i != length; ++i) recon[i] = scanline[i] + precon[i]; for(i = 0; i != length; ++i) recon[i] = scanline[i] + precon[i];
} else { } else {
for (i = 0; i != length; ++i) recon[i] = scanline[i]; for(i = 0; i != length; ++i) recon[i] = scanline[i];
} }
break; break;
} case 3:
case 3: { if (precon) {
if (precon) { for (i = 0; i != bytewidth; ++i) recon[i] = scanline[i] + (precon[i] >> 1u);
for (i = 0; i != bytewidth; ++i) recon[i] = scanline[i] + (precon[i] >> 1u); for (i = bytewidth; i < length; ++i) recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) >> 1u);
for (i = bytewidth; i < length; ++i) recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) >> 1u); } else {
} else { for (i = 0; i != bytewidth; ++i) recon[i] = scanline[i];
for (i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; for (i = bytewidth; i < length; ++i) recon[i] = scanline[i] + (recon[i - bytewidth] >> 1u);
for (i = bytewidth; i < length; ++i) recon[i] = scanline[i] + (recon[i - bytewidth] >> 1u); }
} break;
break; case 4:
}
case 4: {
if (precon) { if (precon) {
for (i = 0; i != bytewidth; ++i) { for (i = 0; i != bytewidth; ++i) {
recon[i] = (scanline[i] + precon[i]); /*paethPredictor(0, precon[i], 0) is always precon[i]*/ recon[i] = (scanline[i] + precon[i]); /*paethPredictor(0, precon[i], 0) is always precon[i]*/
@ -2182,7 +2164,6 @@ static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scan
} }
} }
break; break;
}
default: return 36; /* error: invalid filter type given */ default: return 36; /* error: invalid filter type given */
} }
return 0; return 0;

9
src/loaders/png/tvgPngLoader.cpp
View file

@ -125,8 +125,7 @@ bool PngLoader::open(const char* data, uint32_t size, bool copy)
h = static_cast<float>(height); h = static_cast<float>(height);
this->size = size; this->size = size;
if (state.info_png.color.colortype == LCT_RGBA) cs = ColorSpace::ABGR8888; cs = ColorSpace::ABGR8888;
else cs = ColorSpace::ARGB8888;
return true; return true;
} }
@ -154,6 +153,8 @@ unique_ptr<Surface> PngLoader::bitmap()
{ {
this->done(); this->done();
if (!image) return nullptr;
//TODO: It's better to keep this surface instance in the loader side //TODO: It's better to keep this surface instance in the loader side
auto surface = new Surface; auto surface = new Surface;
surface->buf8 = image; surface->buf8 = image;
@ -178,5 +179,7 @@ void PngLoader::run(unsigned tid)
auto width = static_cast<unsigned>(w); auto width = static_cast<unsigned>(w);
auto height = static_cast<unsigned>(h); auto height = static_cast<unsigned>(h);
lodepng_decode(&image, &width, &height, &state, data, size); if (lodepng_decode(&image, &width, &height, &state, data, size)) {
TVGERR("PNG", "Failed to decode image");
}
} }