Changes to black compression and saturation controls. Black compression from 0-50 acts the same as 0-100 on the previous version, compressing dark tones without crushing blacks. 50-100 then starts crushing blacks until by 100 on the slider, all tones up to the set black point are sent to zero. In the new saturation control, negative values of the slider set a linear curve rather than an inverted S curve, and smoothly decrease saturation to zero across the board.

2010-10-26 22:59:18 -05:00
commit 926056c2c2
620 changed files with 130476 additions and 0 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -0,0 +1,132 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// generated 2004/6/3 19:15:32 CEST by gabor@darkstar.(none)
+// using glademm V2.5.0
+//
+// newer (non customized) versions of this file go to raw.cc_new
+
+// This file is for your program, I won't touch it again!
+
+//#include <config.h>
+#include <gtkmm.h>
+#include <giomm.h>
+#include <iostream>
+#include <rtwindow.h>
+#include <string.h>
+#include <stdlib.h>
+#include <options.h>
+
+#ifndef WIN32
+#include <config.h>
+#include <glibmm/fileutils.h>
+#include <glib.h>
+#include <glib/gstdio.h>
+#endif
+
+#include <safegtk.h>
+
+extern Options options;
+
+//#ifdef WIN32
+//#include <windows.h> // included for WinMain
+//#endif
+
+// stores path to data files
+Glib::ustring argv0;
+Glib::ustring argv1;
+
+int main(int argc, char **argv)
+{  
+
+   std::string argv0_, argv1_;
+   
+#ifdef WIN32
+   char exname[512];
+   GetModuleFileName (NULL, exname, 512);
+   argv0_ = exname;
+   // get the path where the rawtherapee is stored
+   int i;
+   for (i=argv0_.size()-1; (argv0_[i]!='/' && argv0_[i]!='\\') && i>0; i--);
+   if (argv0_[i]=='/' || argv0_[i]=='\\')
+     argv0_ = argv0_.substr(0,i);
+#else
+   // get the path to data (defined in config.h which is generated by cmake)
+   argv0_ = DATA_SEARCH_PATH;
+   // check if path exists, otherwise revert back to behavior similar to windows
+   try {
+      Glib::Dir dir(DATA_SEARCH_PATH);
+   } catch (Glib::FileError) {
+       argv0_ = argv[0];
+       int i;
+       for (i=argv0_.size()-1; (argv0_[i]!='/' && argv0_[i]!='\\') && i>0; i--);
+       if (argv0_[i]=='/' || argv0_[i]=='\\')
+           argv0_ = argv0_.substr(0,i);
+   }
+#endif
+   
+
+    if (argc>1)
+        argv1_ = argv[1];
+    else
+        argv1_ = "";
+  
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+   argv0 = Glib::filename_to_utf8 (argv0_);
+   argv1 = Glib::filename_to_utf8 (argv1_);
+#else
+   std::auto_ptr<Glib::Error> error;
+   argv0 = Glib::filename_to_utf8 (argv0_, error);
+   argv1 = Glib::filename_to_utf8 (argv1_, error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
+   Glib::thread_init();
+   gdk_threads_init();
+   Gio::init ();
+
+   Options::load ();
+
+#ifndef _WIN32
+   // Move the old path to the new one if the new does not exist
+   if (Glib::file_test(Glib::build_filename(options.rtdir,"cache"), Glib::FILE_TEST_IS_DIR) && !Glib::file_test(options.cacheBaseDir, Glib::FILE_TEST_IS_DIR))
+       ::g_rename(Glib::build_filename(options.rtdir,"cache").c_str(), options.cacheBaseDir.c_str());
+#endif
+
+//   Gtk::RC::add_default_file (argv0+"/themes/"+options.theme);
+   if (!options.useSystemTheme)
+   {
+       std::vector<std::string> rcfiles;
+       rcfiles.push_back (argv0+"/themes/"+options.theme);
+       // Set the font face and size
+       Gtk::RC::parse_string (Glib::ustring::compose(
+          "style \"clearlooks-default\" { font_name = \"%1\" }", options.font));
+       Gtk::RC::set_default_files (rcfiles);
+   }
+   Gtk::Main m(&argc, &argv);
+//   MainWindow *MainWindow = new class MainWindow();
+   RTWindow *rtWindow = new class RTWindow();
+   gdk_threads_enter ();
+   m.run(*rtWindow);
+   gdk_threads_leave ();
+   delete rtWindow;
+   return 0;
+}
+
+
+
+