evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix border for font

Browse Source
This commit is contained in:
Kae 2023-06-21 23:32:28 +10:00
parent 92ef4dba0f
commit 643ae5d1b8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/core/StarImageProcessing.cpp
View File

@ -495,18 +495,19 @@ Image processImageOperations(List<ImageOperation> const& operations, Image image
if (dist < std::numeric_limits<int>::max()) { if (dist < std::numeric_limits<int>::max()) {
float percent = (dist - 1) / (2.0f * pixels - 1); float percent = (dist - 1) / (2.0f * pixels - 1);
Color color = Color::rgbaf((Vec4F(op->startColor) * ((1.0f - percent) / 255.0f)) + (Vec4F(op->endColor) * (percent / 255.0f))); Color color = Color::rgba(op->startColor).mix(Color::rgba(op->endColor), percent);
if (pixel[3] != 0) { if (pixel[3] != 0) {
if (op->outlineOnly) if (op->outlineOnly) {
color.setAlphaF(1.0f - byteToFloat(pixel[3])); float pixelA = byteToFloat(pixel[3]);
color.setAlphaF((1.0f - pixelA) * fminf(pixelA, 0.5f) * 2.0f);
}
else { else {
Color pixelCol = Color::rgba(pixel); Color pixelF = Color::rgba(pixel);
float pixelA = pixelCol.alphaF(); float pixelA = pixelF.alphaF(), colorA = color.alphaF();
float colorA = color.alphaF();
colorA += pixelA * (1.0f - colorA); colorA += pixelA * (1.0f - colorA);
pixelCol.convertToLinear(); pixelF.convertToLinear(); //Mix in linear color space as it is more perceptually accurate
color.convertToLinear(); color.convertToLinear();
color.mix(pixelCol, pixelA); color = color.mix(pixelF, pixelA);
color.convertToSRGB(); color.convertToSRGB();
color.setAlphaF(colorA); color.setAlphaF(colorA);
} }