liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged with dev

Browse Source
This commit is contained in:
Alberto Griggio
2017-03-20 14:06:23 +01:00
parent 2d658257f2 2228159ff8
commit e533c9c91a
5 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtdata/themes/RawTherapee-GTK3-20_.css
View File

@@ -243,6 +243,13 @@ scale trough {
margin: 6px 6px; /* have to be half of "scale slider / min-width min-height" */
background-color: #2A2A2A;
}
scale.fine-tune trough {
margin: 5px;
padding: 1px;
}
scale.fine-tune trough highlight {
margin: -2px;
}
scale:disabled trough {
background-color: #444;
border-color: #282828;

18
rtengine/iccstore.cc
View File

@@ -1,12 +1,12 @@
/*
* This file is part of RawTherapee.
*
* Copyright(c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
* 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.
* (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
@@ -223,7 +223,7 @@ rtengine::ProfileContent::ProfileContent(const Glib::ustring& fileName)
d[length] = 0;
fclose(f);
data.assign(d, length + 1);
data.assign(d, length);
delete[] d;
}
@@ -236,7 +236,7 @@ rtengine::ProfileContent::ProfileContent(cmsHPROFILE hProfile)
if (bytesNeeded > 0) {
char* d = new char[bytesNeeded + 1];
cmsSaveProfileToMem(hProfile, d, &bytesNeeded);
data.assign(d, bytesNeeded + 1);
data.assign(d, bytesNeeded);
delete[] d;
}
}
@@ -247,7 +247,7 @@ cmsHPROFILE rtengine::ProfileContent::toProfile() const
return
!data.empty()
? cmsOpenProfileFromMem(data.data(), data.size())
? cmsOpenProfileFromMem(data.c_str(), data.size())
: nullptr;
}
@@ -690,7 +690,7 @@ cmsHPROFILE rtengine::ICCStore::getXYZProfile() const
cmsHPROFILE rtengine::ICCStore::getsRGBProfile() const
{
return implementation->getXYZProfile();
return implementation->getsRGBProfile();
}
std::vector<Glib::ustring> rtengine::ICCStore::getProfiles(ProfileType type) const
@@ -1025,7 +1025,8 @@ cmsHPROFILE rtengine::ICCStore::createFromMatrix(const double matrix[3][3], bool
return p;
}
cmsHPROFILE rtengine::ICCStore::createGammaProfile(const procparams::ColorManagementParams &icm, GammaValues &ga) {
cmsHPROFILE rtengine::ICCStore::createGammaProfile(const procparams::ColorManagementParams &icm, GammaValues &ga)
{
float p[6]; //primaries
ga[6] = 0.0;
@@ -1121,7 +1122,8 @@ cmsHPROFILE rtengine::ICCStore::createGammaProfile(const procparams::ColorManage
}
// WARNING: the caller must lock lcmsMutex
cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams::ColorManagementParams &icm, GammaValues &ga) {
cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams::ColorManagementParams &icm, GammaValues &ga)
{
bool pro = false;
Glib::ustring outProfile;
cmsHPROFILE outputProfile = nullptr;

4
rtengine/iccstore.h
View File

@@ -1,12 +1,12 @@
/*
* This file is part of RawTherapee.
*
* Copyright(c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
* 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.
* (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

4
rtengine/simpleprocess.cc
View File

@@ -1222,7 +1222,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
if (!useLCMS) {
// use corrected sRGB profile in order to apply a good TRC if present, otherwise use LCMS2 profile generated by lab2rgb16 w/ gamma
ProfileContent pc(jprof);
readyImg->setOutputProfile(pc.getData().data(), pc.getData().size());
readyImg->setOutputProfile(pc.getData().c_str(), pc.getData().size());
}
} else {
// use the selected output profile if present, otherwise use LCMS2 profile generate by lab2rgb16 w/ gamma
@@ -1242,7 +1242,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
}
ProfileContent pc = ICCStore::getInstance()->getContent (params.icm.output);
readyImg->setOutputProfile(pc.getData().data(), pc.getData().size());
readyImg->setOutputProfile(pc.getData().c_str(), pc.getData().size());
}
} else {
// No ICM

21
rtgui/main.cc
View File

@@ -204,8 +204,7 @@ int main(int argc, char **argv)
break;
}
if(Console) {
AllocConsole();
if(Console && AllocConsole()) {
AttachConsole( GetCurrentProcessId() ) ;
// Don't allow CTRL-C in console to terminate RT
SetConsoleCtrlHandler( NULL, true );
@@ -243,16 +242,18 @@ int main(int argc, char **argv)
}
}
int ret = processLineParams( argc, argv);
if(argc > 1) {
int ret = processLineParams( argc, argv);
if( ret <= 0 ) {
if(consoleOpened) {
printf("Press any key to exit RawTherapee\n");
FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE));
getch();
if( ret <= 0 ) {
if(consoleOpened) {
printf("Press any key to exit RawTherapee\n");
FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE));
getch();
}
return ret;
}
return ret;
}
}