From 01ed6d62a228ce560c5ed0976b63609efb7076ac Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Fri, 29 Apr 2016 14:03:21 +0200
Subject: SVG 2 allows 'href' without 'xlink:'. For now just read plain 'href'.

(bzr r14863)
---
 src/color-profile.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/color-profile.cpp')

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index bcefe994a..99c62ecb3 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -271,6 +271,7 @@ void ColorProfile::build(SPDocument *document, Inkscape::XML::Node *repr) {
     SPObject::build(document, repr);
 
     this->readAttr( "xlink:href" );
+    this->readAttr( "href" );
     this->readAttr( "id" );
     this->readAttr( "local" );
     this->readAttr( "name" );
@@ -289,6 +290,7 @@ void ColorProfile::build(SPDocument *document, Inkscape::XML::Node *repr) {
 void ColorProfile::set(unsigned key, gchar const *value) {
     switch (key) {
         case SP_ATTR_XLINK_HREF:
+        case SP_ATTR_HREF:
             if ( this->href ) {
                 g_free( this->href );
                 this->href = 0;
-- 
cgit v1.2.3


From a6a6de5c06d3183329d73fa39ae0ba02bbd838e1 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Fri, 29 Apr 2016 18:12:37 +0200
Subject: Backout last commit as it introduced subtle errors.

(bzr r14864)
---
 src/color-profile.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/color-profile.cpp')

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index 99c62ecb3..bcefe994a 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -271,7 +271,6 @@ void ColorProfile::build(SPDocument *document, Inkscape::XML::Node *repr) {
     SPObject::build(document, repr);
 
     this->readAttr( "xlink:href" );
-    this->readAttr( "href" );
     this->readAttr( "id" );
     this->readAttr( "local" );
     this->readAttr( "name" );
@@ -290,7 +289,6 @@ void ColorProfile::build(SPDocument *document, Inkscape::XML::Node *repr) {
 void ColorProfile::set(unsigned key, gchar const *value) {
     switch (key) {
         case SP_ATTR_XLINK_HREF:
-        case SP_ATTR_HREF:
             if ( this->href ) {
                 g_free( this->href );
                 this->href = 0;
-- 
cgit v1.2.3


From 9e9ce2c30be9d6af144ff07f69c15c508d84e776 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sat, 21 May 2016 11:58:25 +0200
Subject: Fix regression: restore order in resources (e.g. pattern list)

(bzr r14907)
---
 src/color-profile.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/color-profile.cpp')

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index bcefe994a..523026aa5 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -489,8 +489,8 @@ static int getLcmsIntent( guint svgIntent )
 static SPObject* bruteFind( SPDocument* document, gchar const* name )
 {
     SPObject* result = 0;
-    std::set<SPObject *> current = document->getResourceList("iccprofile");
-    for (std::set<SPObject *>::const_iterator it = current.begin(); (!result) && (it != current.end()); ++it) {
+    std::vector<SPObject *> current = document->getResourceList("iccprofile");
+    for (std::vector<SPObject *>::const_iterator it = current.begin(); (!result) && (it != current.end()); ++it) {
         if ( IS_COLORPROFILE(*it) ) {
             ColorProfile* prof = COLORPROFILE(*it);
             if ( prof ) {
-- 
cgit v1.2.3