summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/extension/internal/cairo-render-context.cpp1
-rw-r--r--src/extension/param/color.cpp2
-rw-r--r--src/ui/widget/color-entry.cpp5
-rw-r--r--src/ui/widget/color-icc-selector.cpp45
-rw-r--r--src/ui/widget/color-scales.cpp67
-rw-r--r--src/ui/widget/color-scales.h2
6 files changed, 47 insertions, 75 deletions
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 7162ca658..abfdd9f1c 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -1018,7 +1018,6 @@ CairoRenderContext::_createPatternPainter(SPPaintServer const *const paintserver
TRACE(("%f x %f pattern\n", width, height));
if (pbox && pat->get_pattern_units() == SPPattern::UNITS_OBJECTBOUNDINGBOX) {
- //Geom::Affine bbox2user (pbox->x1 - pbox->x0, 0.0, 0.0, pbox->y1 - pbox->y0, pbox->x0, pbox->y0);
bbox_width_scaler = pbox->width();
bbox_height_scaler = pbox->height();
ps2user[4] = x * bbox_width_scaler + pbox->left();
diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index e68dbf8bf..3162e8a40 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -78,7 +78,7 @@ ParamColor::ParamColor (const gchar * name, const gchar * guitext, const gchar *
void ParamColor::string(std::string &string) const
{
char str[16];
- sprintf(str, "%i", _color.value());
+ snprintf(str, 16, "%i", _color.value());
string += str;
}
diff --git a/src/ui/widget/color-entry.cpp b/src/ui/widget/color-entry.cpp
index 89a63c6d0..a1fabf181 100644
--- a/src/ui/widget/color-entry.cpp
+++ b/src/ui/widget/color-entry.cpp
@@ -49,9 +49,8 @@ void ColorEntry::on_changed() {
text.erase(0, 1);
if (text.size() == 6) {
// it was a standard RGB hex
- unsigned int alph = SP_COLOR_F_TO_U(_color.alpha());
- Glib::ustring tmp = Glib::ustring::format(std::hex, std::setw(2), std::setfill(L'0'), alph);
- text += tmp;
+ unsigned int alpha = SP_COLOR_F_TO_U(_color.alpha());
+ text += Glib::ustring::format(std::hex, std::setw(2), std::setfill(L'0'), alpha);
}
}
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index e8d5be8a7..48c098604 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -236,23 +236,6 @@ std::vector<colorspace::Component> colorspace::getColorSpaceInfo( Inkscape::Colo
#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
namespace Inkscape {
namespace UI {
namespace Widget {
@@ -263,23 +246,23 @@ namespace Widget {
class ComponentUI
{
public:
- ComponentUI() :
- _component(),
- _adj(0),
- _slider(0),
- _btn(0),
- _label(0),
- _map(0)
+ ComponentUI()
+ : _component()
+ , _adj(0)
+ , _slider(0)
+ , _btn(0)
+ , _label(0)
+ , _map(0)
{
}
- ComponentUI(colorspace::Component const &component) :
- _component(component),
- _adj(0),
- _slider(0),
- _btn(0),
- _label(0),
- _map(0)
+ ComponentUI(colorspace::Component const &component)
+ : _component(component)
+ , _adj(0)
+ , _slider(0)
+ , _btn(0)
+ , _label(0)
+ , _map(0)
{
}
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index e9931e938..9f18b2d96 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -176,43 +176,36 @@ void ColorScales::_initUI(SPColorScalesMode mode)
setMode(mode);
}
-void ColorScales::_recalcColor( gboolean changing )
+void ColorScales::_recalcColor()
{
- if ( changing )
+ SPColor color;
+ gfloat alpha = 1.0;
+ gfloat c[5];
+
+ switch (_mode) {
+ case SP_COLOR_SCALES_MODE_RGB:
+ case SP_COLOR_SCALES_MODE_HSV:
+ _getRgbaFloatv(c);
+ color.set( c[0], c[1], c[2] );
+ alpha = c[3];
+ break;
+ case SP_COLOR_SCALES_MODE_CMYK:
{
- SPColor color;
- gfloat alpha = 1.0;
- gfloat c[5];
-
- switch (_mode) {
- case SP_COLOR_SCALES_MODE_RGB:
- case SP_COLOR_SCALES_MODE_HSV:
- _getRgbaFloatv(c);
- color.set( c[0], c[1], c[2] );
- alpha = c[3];
- break;
- case SP_COLOR_SCALES_MODE_CMYK:
- {
- _getCmykaFloatv( c );
-
- float rgb[3];
- sp_color_cmyk_to_rgb_floatv( rgb, c[0], c[1], c[2], c[3] );
- color.set( rgb[0], rgb[1], rgb[2] );
- alpha = c[4];
- break;
- }
- default:
- g_warning ("file %s: line %d: Illegal color selector mode %d", __FILE__, __LINE__, _mode);
- break;
- }
-
- _color.preserveICC();
- _color.setColorAlpha(color, alpha);
+ _getCmykaFloatv( c );
+
+ float rgb[3];
+ sp_color_cmyk_to_rgb_floatv( rgb, c[0], c[1], c[2], c[3] );
+ color.set( rgb[0], rgb[1], rgb[2] );
+ alpha = c[4];
+ break;
}
- else
- {
- // _updateInternals( _color, _alpha, _dragging );
+ default:
+ g_warning ("file %s: line %d: Illegal color selector mode %d", __FILE__, __LINE__, _mode);
+ break;
}
+
+ _color.preserveICC();
+ _color.setColorAlpha(color, alpha);
}
/* Helpers for setting color value */
@@ -479,7 +472,6 @@ void ColorScales::_sliderAnyGrabbed()
if (!_dragging) {
_dragging = TRUE;
_color.setHeld(true);
- _recalcColor( FALSE );
}
}
@@ -491,7 +483,6 @@ void ColorScales::_sliderAnyReleased()
if (_dragging) {
_dragging = FALSE;
_color.setHeld(false);
- _recalcColor( FALSE );
}
}
@@ -500,7 +491,7 @@ void ColorScales::_sliderAnyChanged()
if (_updating) {
return;
}
- _recalcColor( TRUE );
+ _recalcColor();
}
void ColorScales::_adjustmentChanged( ColorScales *scales, guint channel )
@@ -510,7 +501,7 @@ void ColorScales::_adjustmentChanged( ColorScales *scales, guint channel )
}
scales->_updateSliders( (1 << channel) );
- scales->_recalcColor (TRUE);
+ scales->_recalcColor();
}
void ColorScales::_updateSliders( guint channels )
@@ -627,7 +618,7 @@ void ColorScales::_updateSliders( guint channels )
// Force the internal color to be updated
if ( !_updating )
{
- _recalcColor( TRUE );
+ _recalcColor();
}
#ifdef SPCS_PREVIEW
diff --git a/src/ui/widget/color-scales.h b/src/ui/widget/color-scales.h
index af7f726f1..0744a645c 100644
--- a/src/ui/widget/color-scales.h
+++ b/src/ui/widget/color-scales.h
@@ -63,7 +63,7 @@ protected:
void _getCmykaFloatv(gfloat *cmyka);
guint32 _getRgba32();
void _updateSliders(guint channels);
- void _recalcColor(gboolean changing);
+ void _recalcColor();
void _setRangeLimit( gdouble upper );
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-27 06:22:28 +0000