diff --git a/src/color.cpp b/src/color.cpp
index 07c15ff15d9cb8d3ab16bb6119420b56b0955e12..54af89ae5d5c92665b458a5cf5666d11179a7d5b 100644 (file)
--- a/src/color.cpp
+++ b/src/color.cpp
#include <math.h>
#include "color.h"
#include "svg/svg-icc-color.h"
-#include "svg/svg-device-color.h"
#include "svg/svg-color.h"
#include "svg/css-ostringstream.h"
#define PROFILE_EPSILON 0.00000001
SPColor::SPColor() :
- icc(0),
- device(0)
+ icc(0)
{
v.c[0] = 0;
v.c[1] = 0;
}
SPColor::SPColor( SPColor const& other ) :
- icc(0),
- device(0)
+ icc(0)
{
*this = other;
}
SPColor::SPColor( float r, float g, float b ) :
- icc(0),
- device(0)
+ icc(0)
{
set( r, g, b );
}
SPColor::SPColor( guint32 value ) :
- icc(0),
- device(0)
+ icc(0)
{
set( value );
}
SPColor::~SPColor()
{
delete icc;
- delete device;
icc = 0;
- device = 0;
}
SPColor& SPColor::operator= (SPColor const& other)
{
SVGICCColor* tmp_icc = other.icc ? new SVGICCColor(*other.icc) : 0;
- SVGDeviceColor* tmp_device = other.device ? new SVGDeviceColor(*other.device) : 0;
v.c[0] = other.v.c[0];
v.c[1] = other.v.c[1];
}
icc = tmp_icc;
- if ( device ) {
- delete device;
- }
- device = tmp_device;
-
return *this;
}
&& (v.c[2] != other.v.c[2]);
match &= profileMatches( icc, other.icc );
-//TODO?: match &= devicecolorMatches( device, other.device );
return match;
}
css << ')';
}
- if ( device && device->type != DEVICE_COLOR_INVALID) {
- if ( !css.str().empty() ) {
- css << " ";
- }
-
- switch(device->type){
- case DEVICE_GRAY:
- css << "device-gray(";
- break;
- case DEVICE_RGB:
- css << "device-rgb(";
- break;
- case DEVICE_CMYK:
- css << "device-cmyk(";
- break;
- case DEVICE_NCHANNEL:
- css << "device-nchannel(";
- break;
- case DEVICE_COLOR_INVALID:
- //should not be reached
- break;
- }
-
- for (vector<double>::const_iterator i(device->colors.begin()),
- iEnd(device->colors.end());
- i != iEnd; ++i) {
- if (i!=device->colors.begin()) css << ", ";
- css << *i;
- }
- css << ')';
- }
-
return css.str();
}
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :