pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

convert to raster swapRGB fix

Browse Source
This commit is contained in:
SalnikovDE
2021-09-24 16:02:49 +03:00
parent 5142761c85
commit 8fda6f48ce
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
DesktopEditor/agg-2.4/include/test_grads/custom_gradients.h
View File

@ -550,6 +550,7 @@ namespace agg
float ymin, ymax;
color_type m_color_table[MaxColorIndex + 1];
bool m_valid_table[MaxColorIndex + 1];
bool m_bSwapRGB;
private:
@ -678,19 +679,19 @@ namespace agg
_x = _x * m_oGradientInfo.shading.inv_map[0] + _y * m_oGradientInfo.shading.inv_map[2];
_y = _x * m_oGradientInfo.shading.inv_map[1] + _y * m_oGradientInfo.shading.inv_map[3];
*span++ = m_oGradientInfo.shading.function.get_color(_x, _y); //m_color_table[index];
*span++ = ifswapRGB(m_oGradientInfo.shading.function.get_color(_x, _y)); //m_color_table[index];
}
else if (m_oGradientInfo.shading.shading_type == NSStructures::ShadingInfo::TriangleInterpolation)
{
*span++ = this->triangle(x, y);
*span++ = ifswapRGB(this->triangle(x, y));
}
else if (m_oGradientInfo.shading.shading_type == NSStructures::ShadingInfo::CurveInterpolation)
{
*span++ = this->curve_eval(x, y);
*span++ = ifswapRGB(this->curve_eval(x, y));
}
else if (m_oGradientInfo.shading.shading_type == NSStructures::ShadingInfo::TensorCurveInterpolation)
{
*span++ = this->curve_eval(x, y);
*span++ = ifswapRGB(this->curve_eval(x, y));
}
else if (m_oGradientInfo.shading.shading_type == NSStructures::ShadingInfo::Parametric)
{
@ -701,14 +702,14 @@ namespace agg
}
else if (m_oGradientInfo.shading.f_type == NSStructures::ShadingInfo::UseNew)
{
*span++ = m_oGradientInfo.shading.function.get_color(t);
*span++ = ifswapRGB(m_oGradientInfo.shading.function.get_color(t));
}
else if (m_oGradientInfo.shading.f_type == NSStructures::ShadingInfo::UseOld)
{
int index = int(t * MaxColorIndex + 0.5);
if (!m_valid_table[index])
CalcColor(index);
*span++ = m_color_table[index];
*span++ = ifswapRGB(m_color_table[index]);
}
}
}
@ -717,8 +718,9 @@ namespace agg
/**
* Выставляем всякую инфу про наш градиент.
*/
void SetDirection(const agg::rect_d &bounds, const agg::trans_affine &trans)
void SetDirection(const agg::rect_d &bounds, const agg::trans_affine &trans, bool bSwapRGB)
{
m_bSwapRGB = bSwapRGB;
m_trans = trans;
xmax = std::max(bounds.x1, bounds.x2);
@ -953,7 +955,20 @@ namespace agg
u += delta;
}
}
ColorT ifswapRGB(const ColorT &c)
{
if (m_bSwapRGB) {
return c;
}
ColorT newC;
newC.r = c.b;
newC.g = c.g;
newC.b = c.r;
newC.a = c.a;
return newC;
}
ColorT curve_eval(float x, float y)
{
auto i = get_index_curve(x, y);