Merge branch 'fix-undefined-references-without-lcms' of gitlab.com:libiquity/inkscape

2 files changed, 33 insertions, 33 deletions

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 96835c65b..7b1025e2b 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -410,6 +410,30 @@ void DocumentProperties::build_snap()
     attach_all(_page_snap->table(), array, G_N_ELEMENTS(array));
  }
 
+void DocumentProperties::create_guides_around_page()
+{
+    SPDesktop *dt = getDesktop();
+    Verb *verb = Verb::get( SP_VERB_EDIT_GUIDES_AROUND_PAGE );
+    if (verb) {
+        SPAction *action = verb->get_action(Inkscape::ActionContext(dt));
+        if (action) {
+            sp_action_perform(action, NULL);
+        }
+    }
+}
+
+void DocumentProperties::delete_all_guides()
+{
+    SPDesktop *dt = getDesktop();
+    Verb *verb = Verb::get( SP_VERB_EDIT_DELETE_ALL_GUIDES );
+    if (verb) {
+        SPAction *action = verb->get_action(Inkscape::ActionContext(dt));
+        if (action) {
+            sp_action_perform(action, NULL);
+        }
+    }
+}
+
 #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 /// Populates the available color profiles combo box
 void DocumentProperties::populate_available_profiles(){
@@ -472,30 +496,6 @@ static void sanitizeName( Glib::ustring& str )
     }
 }
 
-void DocumentProperties::create_guides_around_page()
-{
-    SPDesktop *dt = getDesktop();
-    Verb *verb = Verb::get( SP_VERB_EDIT_GUIDES_AROUND_PAGE );
-    if (verb) {
-        SPAction *action = verb->get_action(Inkscape::ActionContext(dt));
-        if (action) {
-            sp_action_perform(action, NULL);
-        }
-    }
-}
-
-void DocumentProperties::delete_all_guides()
-{
-    SPDesktop *dt = getDesktop();
-    Verb *verb = Verb::get( SP_VERB_EDIT_DELETE_ALL_GUIDES );
-    if (verb) {
-        SPAction *action = verb->get_action(Inkscape::ActionContext(dt));
-        if (action) {
-            sp_action_perform(action, NULL);
-        }
-    }
-}
-
 /// Links the selected color profile in the combo box to the document
 void DocumentProperties::linkSelectedProfile()
 {
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index 32f99747a..c6f5b799f 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -108,15 +108,6 @@ icSigCmyData
 #define SPACE_ID_CMYK 2
 
 
-#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
-static cmsUInt16Number *getScratch()
-{
-    // bytes per pixel * input channels * width
-    static cmsUInt16Number *scritch = static_cast<cmsUInt16Number *>(g_new(cmsUInt16Number, 4 * 1024));
-
-    return scritch;
-}
-
 colorspace::Component::Component()
     : name()
     , tip()
@@ -131,6 +122,15 @@ colorspace::Component::Component(std::string const &name, std::string const &tip
 {
 }
 
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
+static cmsUInt16Number *getScratch()
+{
+    // bytes per pixel * input channels * width
+    static cmsUInt16Number *scritch = static_cast<cmsUInt16Number *>(g_new(cmsUInt16Number, 4 * 1024));
+
+    return scritch;
+}
+
 std::vector<colorspace::Component> colorspace::getColorSpaceInfo(uint32_t space)
 {
     static std::map<cmsUInt32Number, std::vector<Component> > sets;