From 5d1aadd5eb3b196e24fab560a61cce9338b739e1 Mon Sep 17 00:00:00 2001 From: Kulikova Svetlana Date: Wed, 3 Mar 2021 11:55:02 +0300 Subject: [PATCH] fix put_BrushGradient isUndefined didn't work --- DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp | 9 ++------- DesktopEditor/doctrenderer/graphics.cpp | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp b/DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp index 7b099c6b56..27c4443f57 100644 --- a/DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp +++ b/DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp @@ -495,13 +495,8 @@ JSSmart CGraphicsEmbed::put_BrushGradient(JSSmart colors, JS double _y0 = y0->toDouble() / 100000.0; double _x1 = x1->toDouble() / 100000.0; double _y1 = y1->toDouble() / 100000.0; - double _r0 = -1; - double _r1 = -1; - if(!r0->isUndefined()) - { - _r0 = r0->toDouble() / 100000.0; - _r1 = r1->toDouble() / 100000.0; - } + double _r0 = r0->toDouble() / 100000.0; + double _r1 = r1->toDouble() / 100000.0; m_pInternal->put_BrushGradient(color, pos, length, _x0, _y0, _x1, _y1, _r0, _r1); diff --git a/DesktopEditor/doctrenderer/graphics.cpp b/DesktopEditor/doctrenderer/graphics.cpp index 19eda0b04e..62877d0246 100644 --- a/DesktopEditor/doctrenderer/graphics.cpp +++ b/DesktopEditor/doctrenderer/graphics.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #ifndef M_PI #define M_PI 3.14159265358979323846 @@ -1230,9 +1230,9 @@ void CGraphics::put_BrushTextureAlpha(int a) void CGraphics::put_BrushGradient(LONG* pColors, double* pPositions, size_t nCount, double x0, double y0, double x1, double y1, double r0, double r1) { #ifdef _DEBUG - std::cout << "put_BrushGradient " << std::endl; + std::cout << "put_BrushGradient " << x0 << " " << y0 << " " << x1 << " " << y1 << " " << r0 << " " << r1 << std::endl; #endif - if(r0 < 0) + if (std::isnan(r0)) { // линейный double dX = x1 - x0, dY = y1 - y0;