diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-04 06:19:46 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-04 06:19:46 +0000 |
| commit | e0728cfe3dcf882045af5295ffd7c2725b6a430f (patch) | |
| tree | 3289217df16f6f73a2950cd3d40d24a9c856cae1 /src/color-profile.cpp | |
| parent | Add functionality to add and delete CSS property in CSS panel (diff) | |
| parent | Add legacy verb SP_VERB_SELECTION_OUTLINE_LEGACY as pointed in bug 1556592#14 (diff) | |
| download | inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.tar.gz inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.zip | |
Merge changes from trunk
(bzr r14949.1.62)
Diffstat (limited to 'src/color-profile.cpp')
| -rw-r--r-- | src/color-profile.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index aea9ccab0..e60fa8440 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -10,7 +10,6 @@ # include <gdkmm/color.h> #endif -#include <glibmm/checksum.h> #include <glib/gstdio.h> #include <fcntl.h> #include <glib/gi18n.h> @@ -21,7 +20,6 @@ #include <unistd.h> #include <cstring> -#include <string> #include <io/sys.h> #ifdef WIN32 @@ -46,15 +44,14 @@ #include "inkscape.h" #include "document.h" #include "preferences.h" - +#include <glibmm/checksum.h> +#include <glibmm/convert.h> #include "uri.h" #ifdef WIN32 #include <icm.h> #endif // WIN32 -#include <glibmm/convert.h> - using Inkscape::ColorProfile; using Inkscape::ColorProfileImpl; @@ -589,9 +586,9 @@ bool ColorProfile::GamutCheck(SPColor color) static_cast<guchar>(SP_RGBA32_B_U(val)), 255}; - cmsHTRANSFORM gamutCheck = ColorProfile::getTransfGamutCheck();
- if (gamutCheck) {
- cmsDoTransform(gamutCheck, &check_color, &outofgamut, 1);
+ cmsHTRANSFORM gamutCheck = ColorProfile::getTransfGamutCheck(); + if (gamutCheck) { + cmsDoTransform(gamutCheck, &check_color, &outofgamut, 1); } #if HAVE_LIBLCMS1 @@ -620,8 +617,6 @@ private: cmsProfileClassSignature _profileClass; }; -#include <iostream> - ProfileInfo::ProfileInfo( cmsHPROFILE prof, Glib::ustring const & path ) : _path( path ), _name( getNameFromProfile(prof) ), |