summaryrefslogtreecommitdiffstats
path: root/src/svg
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-10-14 03:01:31 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-10-14 03:01:31 +0000
commit1d2cec18d1038150b6511454a2fbb2b3cb6d36f8 (patch)
tree38aeab42635a7ebfa0b87394e42d8bebbcdc7ce6 /src/svg
parentupdate to trunk (r13586) (diff)
parent2geom: Re-fix IS_NAN and IS_FINITE for solaris (diff)
downloadinkscape-1d2cec18d1038150b6511454a2fbb2b3cb6d36f8.tar.gz
inkscape-1d2cec18d1038150b6511454a2fbb2b3cb6d36f8.zip
update to trunk (r13610)
(bzr r13506.1.112)
Diffstat (limited to 'src/svg')
-rw-r--r--src/svg/svg-color.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index 5108b7702..c9f22f8a4 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -511,18 +511,18 @@ sp_svg_create_color_hash()
void icc_color_to_sRGB(SVGICCColor* icc, guchar* r, guchar* g, guchar* b)
{
- guchar color_out[4];
- guchar color_in[4];
if (icc) {
g_message("profile name: %s", icc->colorProfile.c_str());
Inkscape::ColorProfile* prof = SP_ACTIVE_DOCUMENT->profileManager->find(icc->colorProfile.c_str());
if ( prof ) {
+ guchar color_out[4] = {0,0,0,0};
cmsHTRANSFORM trans = prof->getTransfToSRGB8();
if ( trans ) {
std::vector<colorspace::Component> comps = colorspace::getColorSpaceInfo( prof );
size_t count = CMSSystem::getChannelCount( prof );
size_t cap = std::min(count, comps.size());
+ guchar color_in[4];
for (size_t i = 0; i < cap; i++) {
color_in[i] = static_cast<guchar>((((gdouble)icc->colors[i]) * 256.0) * (gdouble)comps[i].scale);
g_message("input[%d]: %d", (int)i, (int)color_in[i]);