Merge from branch 3.0

2011-02-07 23:40:11 +01:00
commit 6ad7d458c9
628 changed files with 131277 additions and 0 deletions
--- a/rtgui/iccfromwindows.txt
+++ b/rtgui/iccfromwindows.txt
@@ -0,0 +1,21 @@
+#elif defined G_OS_WIN32
+  if (config->display_profile_from_gdk)
+    {
+      HDC hdc = GetDC (NULL);
+
+      if (hdc)
+        {
+          gchar *path;
+          gint32 len = 0;
+
+          GetICMProfile (hdc, &len, NULL);
+          path = g_new (gchar, len);
+
+          if (GetICMProfile (hdc, &len, path))
+            profile = cmsOpenProfileFromFile (path, "r");
+
+          g_free (path);
+          ReleaseDC (NULL, hdc);
+        }
+    }
+ #endif