opensourcemirror
/
RawTherapee
mirror of https://github.com/Beep6581/RawTherapee.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Misc. typos 

Found via `codespell` 
+ removed rtengine/dcraw.patch per discussion in https://github.com/Beep6581/RawTherapee/pull/4395
This commit is contained in:
luz.paz 2018-02-14 14:03:38 -05:00
parent c4068444a8
commit c3c3ceac79
60 changed files with 107 additions and 4325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS.txt
View File

@ -3,7 +3,7 @@ Project initiator:
Gábor Horváth <hgabor@rawtherapee.com>
Developement contributors, in last name alphabetical order:
Development contributors, in last name alphabetical order:
Martin Burri
Javier Celaya

2
rtdata/options/options.lin
View File

@ -6,7 +6,7 @@
[General]
# Setting MultiUser to false will use the application's installation directory as cache directory,
# which can be usefull if you want to keep the application and all the cache datas in a single place,
# which can be useful if you want to keep the application and all the cache datas in a single place,
# an external HD for example
MultiUser=true

4
rtdata/options/options.osx
View File

@ -2,11 +2,11 @@
# After the first run, all the parameters will be available in this global option file
# or in a new local option file, depending on the MultiUser value below
# Most ot the options are modifiable through the Preference window
# Most of the options are modifiable through the Preference window
[General]
# Setting MultiUser to false will use the application's installation directory as cache directory,
# which can be usefull if you want to keep the application and all the cache datas in a single place,
# which can be useful if you want to keep the application and all the cache datas in a single place,
# an external HD for example
MultiUser=true

4
rtdata/options/options.win
View File

@ -2,11 +2,11 @@
# After the first run, all the parameters will be available in this global option file
# or in a new local option file, depending on the MultiUser value below
# Most ot the options are modifiable through the Preference window
# Most of the options are modifiable through the Preference window
[General]
# Setting MultiUser to false will use the application's installation directory as cache directory,
# which can be usefull if you want to keep the application and all the cache datas in a single place,
# which can be useful if you want to keep the application and all the cache datas in a single place,
# an external HD for example
MultiUser=true
# Windows users should not use the system theme : some composed widget won't be usable

2
rtengine/CA_correct_RT.cc
View File

@ -38,7 +38,7 @@ bool LinEqSolve(int nDim, double* pfMatr, double* pfVect, double* pfSolution)
// pfMatr - matrix with coefficients
// pfVect - vector with free members
// pfSolution - vector with system solution
// pfMatr becames trianglular after function call
// pfMatr becomes triangular after function call
// pfVect changes after function call
//
// Developer: Henry Guennadi Levkin

2
rtengine/EdgePreservingDecomposition.cc
View File

@ -789,7 +789,7 @@ float *EdgePreservingDecomposition::CreateBlur(float *Source, float Scale, float
// checked for race condition here
// a0[] is read and write but adressed by i only
// a0[] is read and write but addressed by i only
// a[] is read only
// a_w_1 is write only
// a_w is write only

4
rtengine/EdgePreservingDecomposition.h
View File

@ -11,7 +11,7 @@ Anyway. Basically, this is an implementation of what's presented in the
following papers:
- Edge-Preserving Decompositions for Multi-Scale Tone and Detail Manipulation
- An Iterative Solution Method for Linear Systems of Which the Coefficient
Matrix is a Symetric M-Matrix
Matrix is a Symmetric M-Matrix
- Color correction for tone mapping
- Wikipedia, the free encyclopedia
@ -89,7 +89,7 @@ public:
and StartRows must strictly increase with its index. The main diagonal for example has start row 0, its subdiagonal has 1, etc.
Then, Diagonal[j] is the matrix entry on the diagonal at column j. For efficiency, you're expected to learn this and fill in
public Diagonals manually. Symmetric matrices are represented by this class, and all symmetry is handled internally, you
only every worry or think about the lower trianglular (including main diagonal) part of the matrix.
only every worry or think about the lower triangular (including main diagonal) part of the matrix.
*/
float **Diagonals;
char *buffer;

2
rtengine/amaze_demosaic_RT.cc
View File

@ -105,7 +105,7 @@ void RawImageSource::amaze_demosaic_RT(int winx, int winy, int winw, int winh, a
};
//gaussian on 5x5 alt quincunx, sigma=1.5
constexpr float gausseven[2] = {0.13719494435797422f, 0.05640252782101291f};
//guassian on quincunx grid
//gaussian on quincunx grid
constexpr float gquinc[4] = {0.169917f, 0.108947f, 0.069855f, 0.0287182f};
typedef struct {

2
rtengine/cJSON.h
View File

@ -104,7 +104,7 @@ extern void cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item
extern void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
extern void cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
/* Remove/Detatch items from Arrays/Objects. */
/* Remove/Detach items from Arrays/Objects. */
extern cJSON *cJSON_DetachItemFromArray(cJSON *array, int which);
extern void cJSON_DeleteItemFromArray(cJSON *array, int which);
extern cJSON *cJSON_DetachItemFromObject(cJSON *object, const char *string);

8
rtengine/camconst.json
View File

@ -512,7 +512,7 @@ Camera constants:
{ // Quality B, some missing scaling factors are safely guessed
"make_model": "Canon EOS 6D Mark II",
"dcraw_matrix": [ 6875,-970,-932,-4691,12459,2501,-874,1953,5809 ], // DNG v_9.12 D65
"raw_crop": [ 120, 44, 6264, 4180 ], // fullraw size 6384x4224 usefull 120,44,6264x4180
"raw_crop": [ 120, 44, 6264, 4180 ], // fullraw size 6384x4224 useful 120,44,6264x4180
// "raw_crop": [ 128, 52, 6248, 4168 ], // official jpeg crop 120+12,44+12,6240x4160
"masked_areas": [ 44, 4, 4220, 116 ],
"ranges": {
@ -1209,7 +1209,7 @@ Camera constants:
"make_model": "FUJIFILM GFX 50S",
"dcraw_matrix": [ 11756,-4754,-874,-3056,11045,2305,-381,1457,6006 ], // DNGv9.9 D65
//"dcraw_matrix": [ 12407,-5222,-1086,-2971,11116,2120,-294,1029,5284 ], // copy from X-A3 DNGv9.8 D65
"raw_crop": [ 0, 0, 8280, 6208 ], // full raw 9216X6210 - usefull 8280x6208
"raw_crop": [ 0, 0, 8280, 6208 ], // full raw 9216X6210 - useful 8280x6208
//"raw_crop": [ 6, 6, 8264, 6200 ], // fuji official JPEG 8256X6192 10,11,9,8 - experimental crop to match with official
"ranges": { "white": 16000 }
},
@ -1996,7 +1996,7 @@ Camera constants:
"make_model": [ "RICOH PENTAX K-70", "PENTAX K-70" ],
//"dcraw_matrix": [ 8050,-2061,-1264,-4359,12953,1515,-1096,1965,6075 ], // PENTAX DNG D65
"dcraw_matrix": [ 8766,-3149,-747,-3976,11943,2292,-517,1259,5552 ], // Adobe DNGv9.8 D65
"raw_crop": [ 58, 28, 6022, 4020 ], // full frame 6080x4064, usefull raw frame 56,28,6080,4049, official DNG raw_crop 58,28,6080,4052, official jpeg crop 58+8,28+4 6000x4000
"raw_crop": [ 58, 28, 6022, 4020 ], // full frame 6080x4064, useful raw frame 56,28,6080,4049, official DNG raw_crop 58,28,6080,4052, official jpeg crop 58+8,28+4 6000x4000
//"raw_crop": [ 62, 28, 6000, 4000 ], // matched to official jpeg crop 58+8,28+4 6000x4000
"ranges": {
"white": [
@ -2015,7 +2015,7 @@ Camera constants:
{ // Quality B, Intemediate ISO samples missing. Pentax_DNG WLtags are after BL sutraction and not valid
"make_model": [ "RICOH PENTAX KP", "PENTAX KP" ],
"dcraw_matrix": [ 7357,-2031,-1320,-4842,13555,1349,-1538,2416,5736 ], // Adobe DNGv9.12 D65
"raw_crop": [ 52, 28, 6032, 4030 ], // full frame 6112x4060, usefull raw frame 52,28,6084,4049, official DNG raw_crop 54,28,6082,4060
"raw_crop": [ 52, 28, 6032, 4030 ], // full frame 6112x4060, useful raw frame 52,28,6084,4049, official DNG raw_crop 54,28,6082,4060
"ranges": {
"white": [
{ "iso": 100, "levels": 16300 }, // 16383

4
rtengine/color.h
View File

@ -1372,7 +1372,7 @@ public:
* @param CC chroma before [0 ; 180]
* @param corectionHuechroma hue correction depending on chromaticity (saturation), in radians [0 ; 0.45] (return value)
* @param correctlum hue correction depending on luminance (brightness, contrast,...), in radians [0 ; 0.45] (return value)
* @param munsDbgInfo (Debug target only) object to collect informations
* @param munsDbgInfo (Debug target only) object to collect information
*/
#ifdef _DEBUG
@ -1772,7 +1772,7 @@ public:
//hr=translate Hue Lab value (-Pi +Pi) in approximative hr (hsv values) (0 1) [red 1/6 yellow 1/6 green 1/6 cyan 1/6 blue 1/6 magenta 1/6 ]
// with multi linear correspondances (I expect there is no error !!)
double hr = 0.0;
//allways put h between 0 and 1
//always put h between 0 and 1
if (HH >= 0.f && HH < 0.6f ) {
hr = 0.11666 * double(HH) + 0.93; //hr 0.93 1.00 full red

6
rtengine/colortemp.cc
View File

@ -967,12 +967,12 @@ void ColorTemp::cieCAT02(double Xw, double Yw, double Zw, double &CAM02BB00, dou
double D = adap;
//white destination Wd : RT use always D50
cam_dest[0] = CAT02[0][0] * whiteD50p[0] + CAT02[0][1] * whiteD50p[1] + CAT02[0][2] * whiteD50p[2]; //Cone reponse RoD
cam_dest[0] = CAT02[0][0] * whiteD50p[0] + CAT02[0][1] * whiteD50p[1] + CAT02[0][2] * whiteD50p[2]; //Cone response RoD
cam_dest[1] = CAT02[1][0] * whiteD50p[0] + CAT02[1][1] * whiteD50p[1] + CAT02[1][2] * whiteD50p[2]; //GaD
cam_dest[2] = CAT02[2][0] * whiteD50p[0] + CAT02[2][1] * whiteD50p[1] + CAT02[2][2] * whiteD50p[2]; //BeD
//origin white Ws : A, D65, custom, etc.
cam_orig[0] = CAT02[0][0] * Xw + CAT02[0][1] * Yw + CAT02[0][2] * Zw; //Cone reponse RoS
cam_orig[0] = CAT02[0][0] * Xw + CAT02[0][1] * Yw + CAT02[0][2] * Zw; //Cone response RoS
cam_orig[1] = CAT02[1][0] * Xw + CAT02[1][1] * Yw + CAT02[1][2] * Zw;
cam_orig[2] = CAT02[2][0] * Xw + CAT02[2][1] * Yw + CAT02[2][2] * Zw;
@ -1373,7 +1373,7 @@ void ColorTemp::temp2mul (double temp, double green, double equal, double& rmul,
bbb[i] = 200.*(fy[i] - fz[i]);
}
//display value to verify calculs
//display value to verify calculus
if(settings->CRI_color != 0) {
printf("Color Number %i\n", numero_color);
printf("L_refer=%2.2f a=%2.2f b=%2.2f\n", Lbb[numero_color], abb[numero_color], bbb[numero_color]);

4
rtengine/curves.cc
View File

@ -118,7 +118,7 @@ void Curve::fillHash()
hash.at(hashSize + 1).higherValue = poly_x.size();
/*
* Uncoment the code below to dump the polygon points and the hash table in files
* Uncomment the code below to dump the polygon points and the hash table in files
if (poly_x.size() > 500) {
printf("Files generated (%d points)\n", poly_x.size());
FILE* f = fopen ("hash.txt", "wt");
@ -1905,7 +1905,7 @@ void PerceptualToneCurve::BatchApply(const size_t start, const size_t end, float
// depending on color, the chroma scaling factor can be fine-tuned below
{
// decrease chroma scaling sligthly of extremely saturated colors
// decrease chroma scaling slightly of extremely saturated colors
float saturated_scale_factor = 0.95f;
constexpr float lolim = 35.f; // lower limit, below this chroma all colors will keep original chroma scaling factor
constexpr float hilim = 60.f; // high limit, above this chroma the chroma scaling factor is multiplied with the saturated scale factor value above

6
rtengine/dcraw.cc
View File

@ -1951,7 +1951,7 @@ void CLASS parse_hasselblad_gain()
Data block format. Seems to differ depending on sensor type. For tested H4D-50
and H3D-31: 10 16 bit signed values per row
value 0: a correction factor (k) used on even columns, where the new pixel value is
calulated as follows:
calculated as follows:
new_value = old_value + (2 * ((k * (old_value_on_row_above-256)) / 32767) - 2)
note the connection to the value on the row above, seems to be some sort of signal
leakage correction.
@ -2023,7 +2023,7 @@ void CLASS hasselblad_correct()
TODO:
- Support all gain tag formats
- The 0x19 tag varies a bit between models. We don't have parsers for all models.
- The reference model used was during inital reverse-engineering was a H4D-50,
- The reference model used was during initial reverse-engineering was a H4D-50,
we probably support the Hasselblads with Kodak 31, 39, 40 and 50 megapixels
well, but more work is needed for Kodak 16 and 22, Dalsa 60 and Sony 50.
- Apply bad column(?) data (hbd.unknown1)
@ -4378,7 +4378,7 @@ mask_set:
//}
/*
Seach from the current directory up to the root looking for
Search from the current directory up to the root looking for
a ".badpixels" file, and fix those pixels now.
*/
//void CLASS bad_pixels (const char *cfname)

4218
rtengine/dcraw.patch
View File

File diff suppressed because it is too large Load Diff

6
rtengine/dcrop.cc
View File

@ -434,7 +434,7 @@ void Crop::update (int todo)
Imagefloat *origCropPart = new Imagefloat (crW, crH);//allocate memory
Imagefloat *provicalc = new Imagefloat ((crW + 1) / 2, (crH + 1) / 2); //for denoise curves
int coordW[3];//coordonate of part of image to mesure noise
int coordW[3];//coordinate of part of image to measure noise
int coordH[3];
int begW = 50;
int begH = 50;
@ -507,7 +507,7 @@ void Crop::update (int todo)
float multip = 1.f;
if (!parent->imgsrc->isRAW()) {
multip = 2.f; //take into account gamma for TIF / JPG approximate value...not good fot gamma=1
multip = 2.f; //take into account gamma for TIF / JPG approximate value...not good for gamma=1
}
float adjustr = 1.f;
@ -1037,7 +1037,7 @@ void Crop::update (int todo)
dummy, dummy, parent->CAMBrightCurveJ, parent->CAMBrightCurveQ, parent->CAMMean, 5, skip, execsharp, dd, dj, 1);
}
} else {
// CIECAM is disbaled, we free up its image buffer to save some space
// CIECAM is disabled, we free up its image buffer to save some space
if (cieCrop) {
delete cieCrop;
}

4
rtengine/dfmanager.cc
View File

@ -136,7 +136,7 @@ void dfInfo::updateRawImage()
if( !pathNames.empty() ) {
std::list<Glib::ustring>::iterator iName = pathNames.begin();
ri = new RawImage(*iName); // First file used also for extra pixels informations (width,height, shutter, filters etc.. )
ri = new RawImage(*iName); // First file used also for extra pixels information (width,height, shutter, filters etc.. )
if( ri->loadRaw(true)) {
delete ri;
@ -363,7 +363,7 @@ dfInfo* DFManager::addFileInfo (const Glib::ustring& filename, bool pool)
}
RawImage ri(filename);
int res = ri.loadRaw(false); // Read informations about shot
int res = ri.loadRaw(false); // Read information about shot
if (res != 0) {
return nullptr;

4
rtengine/diagonalcurves.cc
View File

@ -35,11 +35,11 @@ DiagonalCurve::DiagonalCurve (const std::vector<double>& p, int poly_pn)
ppn = poly_pn > 65500 ? 65500 : poly_pn;
if (ppn < 500) {
hashSize = 100; // Arbitrary cut-off value, but mutliple of 10
hashSize = 100; // Arbitrary cut-off value, but multiple of 10
}
if (ppn < 50) {
hashSize = 10; // Arbitrary cut-off value, but mutliple of 10
hashSize = 10; // Arbitrary cut-off value, but multiple of 10
}
if (p.size() < 3) {

2
rtengine/ex1simple.cc
View File

@ -77,7 +77,7 @@ int main (int argc, char* argv[])
rtengine::procparams::ProcParams params;
params.load (argv[2]);
/* First, simplest scenario. Develope image and save it in a file */
/* First, simplest scenario. Develop image and save it in a file */
// create a processing job with the loaded image and the current processing parameters
rtengine::ProcessingJob* job = ProcessingJob::create (i, params);
// process image. The error is given back in errorcode.

2
rtengine/fast_demo.cc
View File

@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////
//
// Fast demosaicing algorythm
// Fast demosaicing algorithm
//
// copyright (c) 2008-2010 Emil Martinec <ejmartin@uchicago.edu>
//

4
rtengine/ffmanager.cc
View File

@ -130,7 +130,7 @@ void ffInfo::updateRawImage()
// this may not be necessary, as flatfield is further blurred before being applied to the processed image.
if( !pathNames.empty() ) {
std::list<Glib::ustring>::iterator iName = pathNames.begin();
ri = new RawImage(*iName); // First file used also for extra pixels informations (width,height, shutter, filters etc.. )
ri = new RawImage(*iName); // First file used also for extra pixels information (width, height, shutter, filters etc.. )
if( ri->loadRaw(true)) {
delete ri;
ri = nullptr;
@ -318,7 +318,7 @@ ffInfo* FFManager::addFileInfo (const Glib::ustring& filename, bool pool)
}
RawImage ri(filename);
int res = ri.loadRaw(false); // Read informations about shot
int res = ri.loadRaw(false); // Read information about shot
if (res != 0) {
return nullptr;

2
rtengine/image16.cc
View File

@ -330,7 +330,7 @@ Image16::tofloat()
return imgfloat;
}
// // Parallized transformation; create transform with cmsFLAGS_NOCACHE!
// // Parallelized transformation; create transform with cmsFLAGS_NOCACHE!
// void Image16::ExecCMSTransform(cmsHTRANSFORM hTransform, const LabImage &labImage, int cx, int cy)
// {
// // LittleCMS cannot parallelize planar Lab float images

2
rtengine/imagedata.cc
View File

@ -207,7 +207,7 @@ FrameData::FrameData (rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
// Focus distance from EXIF or XMP. MakerNote ones are scattered and partly encrypted
int num = -3, denom = -3;
// First try, offical EXIF. Set by Adobe on some DNGs
// First try, official EXIF. Set by Adobe on some DNGs
tag = exif->getTag("SubjectDistance");
if (tag) {

2
rtengine/imagefloat.cc
View File

@ -534,7 +534,7 @@ void Imagefloat::ExecCMSTransform(cmsHTRANSFORM hTransform)
}
}
// Parallized transformation; create transform with cmsFLAGS_NOCACHE!
// Parallelized transformation; create transform with cmsFLAGS_NOCACHE!
void Imagefloat::ExecCMSTransform(cmsHTRANSFORM hTransform, const LabImage &labImage, int cx, int cy)
{
// LittleCMS cannot parallelize planar Lab float images

2
rtengine/imageio.cc
View File

@ -789,7 +789,7 @@ int ImageIO::loadTIFF (Glib::ustring fname)
* effective minimum and maximum values
*/
if (options.rtSettings.verbose) {
printf("Informations of \"%s\":\n", fname.c_str());
printf("Information of \"%s\":\n", fname.c_str());
uint16 tiffDefaultScale, tiffBaselineExposure, tiffLinearResponseLimit;
if (TIFFGetField(in, TIFFTAG_DEFAULTSCALE, &tiffDefaultScale)) {
printf(" DefaultScale: %d\n", tiffDefaultScale);

2
rtengine/improccoordinator.cc
View File

@ -359,7 +359,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
calclum->b(ii>>1,jj>>1) = orig_prev->b(ii,jj);
}
}
imgsrc->convertColorSpace(calclum, params.icm, currWB);//claculate values after colorspace conversion
imgsrc->convertColorSpace(calclum, params.icm, currWB);//calculate values after colorspace conversion
}
int kall=1;

28
rtengine/improcfun.cc
View File

@ -723,7 +723,7 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int pW, int pwb, L
hist16Q[CLIP ((int) (32768.f * sqrt ((koef * (lab->L[i][j])) / 32768.f)))]++; //for brightness Q : approximation for Q=wh*sqrt(J/100) J not equal L
}
sum += koef * lab->L[i][j]; //evaluate mean J to calcualte Yb
sum += koef * lab->L[i][j]; //evaluate mean J to calculate Yb
}
//mean=(sum/((endh-begh)*width))/327.68f;//for Yb for all image...if one day "pipette" we can adapt Yb for each zone
@ -885,7 +885,7 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int pW, int pwb, L
c_ = c;
f_l = fl;
// we cannot have all algoritms with all chroma curves
// we cannot have all algorithms with all chroma curves
if (alg == 1) {
// Lightness saturation
if (Jpro > 99.9f) {
@ -1063,7 +1063,7 @@ void ImProcFunctions::ciecam_02 (CieImage* ncie, double adap, int pW, int pwb, L
t1L = true;
} else if (curveMode == ColorAppearanceParams::TcMode::BRIGHT) {
//attention! Brightness curves are open - unlike Lightness or Lab or RGB==> rendering and algoritms will be different
//attention! Brightness curves are open - unlike Lightness or Lab or RGB==> rendering and algorithms will be different
float coef = ((aw + 4.f) * (4.f / c)) / 100.f;
float Qanc = Qpro;
float Qq = (float) Qpro * 327.68f * (1.f / coef);
@ -2467,7 +2467,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int pW, int pw
Jpro = 1.f;
}
} else if (curveMode == ColorAppearanceParams::TcMode::BRIGHT) {
//attention! Brightness curves are open - unlike Lightness or Lab or RGB==> rendering and algoritms will be different
//attention! Brightness curves are open - unlike Lightness or Lab or RGB==> rendering and algorithms will be different
float coef = ((aw + 4.f) * (4.f / c)) / 100.f;
float Qanc = Qpro;
float Qq = (float) Qpro * 327.68f * (1.f / coef);
@ -2905,7 +2905,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int pW, int pw
//all this treatments reduce artefacts, but can leed to slighty different results
//all this treatments reduce artifacts, but can lead to slighty different results
if (params->defringe.enabled)
if (execsharp) {
@ -3996,7 +3996,7 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
valparam *= (1.f - SQR (SQR (1.f - min (s, 1.0f))));
if (valparam > 0.00001f) {
v = (1.f - valparam) * v + valparam * (1.f - SQR (1.f - min (v, 1.0f))); // SQR (SQR to increase action and avoid artefacts
v = (1.f - valparam) * v + valparam * (1.f - SQR (1.f - min (v, 1.0f))); // SQR (SQR to increase action and avoid artifacts
if (v < 0) {
v = 0;
@ -4137,7 +4137,7 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
float b = btemp[ti * TS + tj];
float ro, go, bo;
labtoning (r, g, b, ro, go, bo, algm, metchrom, twoc, satLimit, satLimitOpacity, ctColorCurve, ctOpacityCurve, clToningcurve, cl2Toningcurve, iplow, iphigh, wp, wip);
rtemp[ti * TS + tj] = CLIP (ro); //I used CLIP because there is a little bug in gamutLchonly that return 65536.ii intead of 65535 ==> crash
rtemp[ti * TS + tj] = CLIP (ro); //I used CLIP because there is a little bug in gamutLchonly that return 65536.ii instead of 65535 ==> crash
gtemp[ti * TS + tj] = CLIP (go);
btemp[ti * TS + tj] = CLIP (bo);
}
@ -4286,7 +4286,7 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
#endif
}
} else if (algm == 1) { //Luminance mixer in Lab mode to avoid artefacts
} else if (algm == 1) { //Luminance mixer in Lab mode to avoid artifacts
for (int i = istart, ti = 0; i < tH; i++, ti++) {
for (int j = jstart, tj = 0; j < tW; j++, tj++) {
//rgb => xyz
@ -4682,7 +4682,7 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
const float lumbefore = 0.299f * r + 0.587f * g + 0.114f * b;
if (lumbefore < 65000.f && lumbefore > 500.f) { //reduce artefacts for highlights and extreme shadows
if (lumbefore < 65000.f && lumbefore > 500.f) { //reduce artifacts for highlights and extreme shadows
float ro, go, bo;
toningsmh(r, g, b, ro, go, bo, RedLow, GreenLow, BlueLow, RedMed, GreenMed, BlueMed, RedHigh, GreenHigh, BlueHigh, reducac, mode, strProtect);
@ -5230,7 +5230,7 @@ void ImProcFunctions::toning2col (float r, float g, float b, float &ro, float &g
const float lumbefore = 0.299f * r + 0.587f * g + 0.114f * b;
const float v = max(r, g, b) / 65535.f;
const float rlo = strProtect; //0.5 ==> 0.75 transfered value for more action
const float rlo = strProtect; //0.5 ==> 0.75 transferred value for more action
const float rlh = 2.2f * strProtect;
//low tones
@ -5785,7 +5785,7 @@ void ImProcFunctions::chromiLuminanceCurve (PipetteBuffer *pipetteBuffer, int pW
Lprov1 = l_r * 100.f;
float Chprov2 = sqrt (SQR (atmp) + SQR (btmp)) / 327.68f;
//Gamut control especialy fot negative values slightly different of gamutlchonly
//Gamut control especially for negative values slightly different from gamutlchonly
bool inRGB;
do {
@ -6412,7 +6412,7 @@ void ImProcFunctions::EPDToneMapCIE (CieImage *ncie, float a_w, float c_, int Wi
for (int i=heir; i<Hei; i++)
for (int j=0; j<Wid; j++) { Qpr2[(i-heir)*Wid+j]=ncie->Q_p[i][j];}
if(minQ>0.0) minQ=0.0;//normaly minQ always > 0...
if(minQ>0.0) minQ=0.0;//normally minQ always > 0...
// EdgePreservingDecomposition epd = EdgePreservingDecomposition(Wid, Hei);
//EdgePreservingDecomposition epd = EdgePreservingDecomposition(Wid, Hei/2);
for(i = N2; i != N; i++)
@ -6787,7 +6787,7 @@ void ImProcFunctions::getAutoExp (const LUTu &histogram, int histcompr, double
gavg /= sum;
if (black < gavg) {
int maxwhiteclip = (gavg - black) * 4 / 3 + black; // dont let whiteclip be such large that the histogram average goes above 3/4
int maxwhiteclip = (gavg - black) * 4 / 3 + black; // don't let whiteclip be such large that the histogram average goes above 3/4
if (whiteclipg < maxwhiteclip) {
whiteclipg = maxwhiteclip;
@ -6833,7 +6833,7 @@ void ImProcFunctions::getAutoExp (const LUTu &histogram, int histcompr, double
gavg += histogram[i] * CurveFactory::gamma2((int)(corr*(i<<histcompr)<65535 ? corr*(i<<histcompr) : 65535)) / sum;
if (black < gavg) {
int maxwhiteclip = (gavg - black) * 4 / 3 + black; // dont let whiteclip be such large that the histogram average goes above 3/4
int maxwhiteclip = (gavg - black) * 4 / 3 + black; // don't let whiteclip be such large that the histogram average goes above 3/4
//double mavg = 65536.0 / (whiteclipg-black) * (gavg - black);
if (whiteclipg < maxwhiteclip)
whiteclipg = maxwhiteclip;

2
rtengine/iplab2rgb.cc
View File

@ -252,7 +252,7 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch,
* Used in processImage (rtengine/simpleprocess.cc)
*
* Provide a pointer to a 7 floats array for "ga" (uninitialized ; this array will be filled with the gamma values) if you want
* to use the custom gamma scenario. Thoses gamma values will correspond to the ones of the chosen standard output profile
* to use the custom gamma scenario. Those gamma values will correspond to the ones of the chosen standard output profile
* (Prophoto if non standard output profile given)
*
* If "ga" is NULL, then we're considering standard gamma with the chosen output profile.

4
rtengine/ipsharpen.cc
View File

@ -324,7 +324,7 @@ void ImProcFunctions::sharpenHaloCtrl (float** luminance, float** blurmap, float
// Thanks to Manuel for this excellent job (Jacques Desmis JDC or frej83)
void ImProcFunctions::MLsharpen (LabImage* lab)
{
// JD: this algorithm maximize clarity of images; it does not play on accutance. It can remove (partialy) the effects of the AA filter)
// JD: this algorithm maximize clarity of images; it does not play on accutance. It can remove (partially) the effects of the AA filter)
// I think we can use this algorithm alone in most cases, or first to clarify image and if you want a very little USM (unsharp mask sharpening) after...
if (!params->sharpenEdge.enabled) {
return;
@ -574,7 +574,7 @@ void ImProcFunctions::MLmicrocontrast(float** luminance, int W, int H)
const int width = W, height = H;
const float uniform = params->sharpenMicro.uniformity; //between 0 to 100
const int unif = (int)(uniform / 10.0f); //put unif between 0 to 10
float amount = params->sharpenMicro.amount / 1500.0f; //amount 2000.0 quasi no artefacts ==> 1500 = maximum, after artefacts
float amount = params->sharpenMicro.amount / 1500.0f; //amount 2000.0 quasi no artifacts ==> 1500 = maximum, after artifacts
if (amount < 0.000001f) {
return;

6
rtengine/ipwavelet.cc
View File

@ -1875,7 +1875,7 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
// I was inspired by the principle of Canny and Lipschitz (continuity and derivability)
// I adapted the principle but have profoundly changed the algorithm
// One can 1) change all parameters and found good parameters;
//one can also chnage in calckoe
//one can also change in calckoe
float edd = 3.f;
float eddlow = 15.f;
float eddlipinfl = 0.005f * cp.edgsens + 0.4f;
@ -1920,7 +1920,7 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
float interm = 0.f;
if(cp.lip3 && cp.lipp) {
// comparaison between pixel and neighbours
// comparison between pixel and neighbours
const auto neigh = cp.neigh == 1;
const auto kneigh = neigh ? 28.f : 38.f;
const auto somm = neigh ? 40.f : 50.f;
@ -1987,7 +1987,7 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
kampli = AmpLip / aamp;
}
// comparaison betwwen pixel and neighbours to do ==> I think 3 dir above is better
// comparison betwwen pixel and neighbours to do ==> I think 3 dir above is better
/* if(cp.lip3){
koeLi[lvl*3][i*W_L + j] = (koeLi[lvl*3][i*W_L + j] + koeLi[lvl*3][(i-1)*W_L + j] + koeLi[lvl*3][(i+1)*W_L + j]
+ koeLi[lvl*3][i*W_L + j+1] + koeLi[lvl*3][i*W_L + j-1] + koeLi[lvl*3][(i-1)*W_L + j-1]

2
rtengine/procparams.cc
View File

@ -3491,7 +3491,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
if (keyFile.has_group ("Exposure")) {
if (ppVersion < PPVERSION_AEXP) {
toneCurve.autoexp = false; // prevent execution of autoexp when opening file created with earlier verions of autoexp algorithm
toneCurve.autoexp = false; // prevent execution of autoexp when opening file created with earlier versions of autoexp algorithm
} else {
assignFromKeyfile(keyFile, "Exposure", "Auto", pedited, toneCurve.autoexp, pedited->toneCurve.autoexp);
}

2
rtengine/procparams.h
View File

@ -1487,7 +1487,7 @@ private:
* saving too)
*
* PartialProfile is not responsible of ProcParams and ParamsEdited object creation
* and hence is not responsible of their destructions. The function that instanciate
* and hence is not responsible of their destructions. The function that instantiate
* PartialProfile object has to handle all this itself.
*/
class PartialProfile :

2
rtengine/rawimagesource.cc
View File

@ -1698,7 +1698,7 @@ int RawImageSource::load (const Glib::ustring &fname)
}
// Load complete Exif informations
// Load complete Exif information
std::unique_ptr<RawMetaDataLocation> rml(new RawMetaDataLocation (ri->get_exifBase(), ri->get_ciffBase(), ri->get_ciffLen()));
idata = new FramesData (fname, std::move(rml));
idata->setDCRawFrameCount (numFrames);

10
rtengine/rtengine.h
View File

@ -399,8 +399,8 @@ class StagedImageProcessor
{
public:
/** Returns the inital image corresponding to the image processor.
* @return the inital image corresponding to the image processor */
/** Returns the initial image corresponding to the image processor.
* @return the initial image corresponding to the image processor */
virtual InitialImage* getInitialImage () = 0;
/** Returns the current processing parameters.
* @param dst is the location where the image processing parameters are copied (it is assumed that the memory is allocated by the caller) */
@ -501,7 +501,7 @@ int init (const Settings* s, Glib::ustring baseDir, Glib::ustring userSettingsDi
/** Cleanup the RT engine (static variables) */
void cleanup ();
/** This class holds all the necessary informations to accomplish the full processing of the image */
/** This class holds all the necessary information to accomplish the full processing of the image */
class ProcessingJob
{
@ -526,7 +526,7 @@ public:
static ProcessingJob* create (InitialImage* initialImage, const procparams::ProcParams& pparams, bool fast = false);
/** Cancels and destroys a processing job. The reference count of the corresponding initialImage (if any) is decreased. After the call of this function the ProcessingJob instance
* gets invalid, you must not use it any more. Dont call this function while the job is being processed.
* gets invalid, you must not use it any more. Don't call this function while the job is being processed.
* @param job is the job to destroy */
static void destroy (ProcessingJob* job);
@ -536,7 +536,7 @@ public:
/** This function performs all the image processinf steps corresponding to the given ProcessingJob. It returns when it is ready, so it can be slow.
* The ProcessingJob passed becomes invalid, you can not use it any more.
* @param job the ProcessingJob to cancel.
* @param errorCode is the error code if an error occured (e.g. the input image could not be loaded etc.)
* @param errorCode is the error code if an error occurred (e.g. the input image could not be loaded etc.)
* @param pl is an optional ProgressListener if you want to keep track of the progress
* @return the resulting image, with the output profile applied, exif and iptc data set. You have to save it or you can access the pixel data directly. */
IImagefloat* processImage (ProcessingJob* job, int& errorCode, ProgressListener* pl = nullptr, bool flush = false);

6
rtengine/simpleprocess.cc
View File

@ -386,7 +386,7 @@ private:
}
if (!imgsrc->isRAW()) {
multip = 2.f; //take into account gamma for TIF / JPG approximate value...not good fot gamma=1
multip = 2.f; //take into account gamma for TIF / JPG approximate value...not good for gamma=1
}
float maxmax = max (maxredaut, maxblueaut);
@ -537,7 +537,7 @@ private:
float gam, gamthresh, gamslope;
ipf.RGB_denoise_infoGamCurve (params.dirpyrDenoise, imgsrc->isRAW(), gamcurve, gam, gamthresh, gamslope);
int Nb[9];
int coordW[3];//coordonate of part of image to mesure noise
int coordW[3];//coordinate of part of image to measure noise
int coordH[3];
int begW = 50;
int begH = 50;
@ -629,7 +629,7 @@ private:
}
if (!imgsrc->isRAW()) {
multip = 2.f; //take into account gamma for TIF / JPG approximate value...not good fot gamma=1
multip = 2.f; //take into account gamma for TIF / JPG approximate value...not good for gamma=1
}
float delta[9];

4
rtengine/tmo_fattal02.cc
View File

@ -153,7 +153,7 @@ void downSample (const Array2Df& A, Array2Df& B)
const int height = B.getRows();
// Note, I've uncommented all omp directives. They are all ok but are
// applied to too small problems and in total don't lead to noticable
// applied to too small problems and in total don't lead to noticeable
// speed improvements. The main issue is the pde solver and in case of the
// fft solver uses optimised threaded fftw routines.
//#pragma omp parallel for
@ -293,7 +293,7 @@ float calculateGradients (Array2Df* H, Array2Df* G, int k, bool multithread)
gx = ((*H) (w, y) - (*H) (e, y));
gy = ((*H) (x, s) - (*H) (x, n));
// note this implicitely assumes that H(-1)=H(0)
// note this implicitly assumes that H(-1)=H(0)
// for the fft-pde slover this would need adjustment as H(-1)=H(1)
// is assumed, which means gx=0.0, gy=0.0 at the boundaries
// however, the impact is not visible so we ignore this here

2
rtexif/rtexif.h
View File

@ -78,7 +78,7 @@ struct TIFFHeader {
class Tag;
class Interpreter;
/// Structure of informations describing an Exif tag
/// Structure of information describing an Exif tag
struct TagAttrib {
int ignore; // =0: never ignore, =1: always ignore, =2: ignore if the subdir type is reduced image, =-1: end of table
ActionCode action;

2
rtgui/batchqueuepanel.cc
View File

@ -192,7 +192,7 @@ void BatchQueuePanel::init (RTWindow *parent)
saveFormatPanel->init (options.saveFormatBatch);
}
// it is expected to have a non null forceOrientation value on Preferences update only. In this case, qsize is ingored and computed automatically
// it is expected to have a non null forceOrientation value on Preferences update only. In this case, qsize is ignored and computed automatically
void BatchQueuePanel::updateTab (int qsize, int forceOrientation)
{
Gtk::Notebook *nb = (Gtk::Notebook *)(this->get_parent());

2
rtgui/batchtoolpanelcoord.cc
View File

@ -390,7 +390,7 @@ void BatchToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const G
}
// If only a single item is selected, we emulate the behaviour of the editor tool panel coordinator,
// otherwise we adjust the inital parameters on a per-image basis.
// otherwise we adjust the initial parameters on a per-image basis.
if (selected.size() == 1) {
// Compensate rotation on flip
if (event == rtengine::EvCTHFlip || event == rtengine::EvCTVFlip) {

2
rtgui/cacheimagedata.h
View File

@ -29,7 +29,7 @@ class CacheImageData: public rtengine::FramesMetaData
public:
// basic informations
// basic information
Glib::ustring md5;
Glib::ustring version;
bool supported;

2
rtgui/edit.h
View File

@ -148,7 +148,7 @@ class EditSubscriber;
*
* When the Edit process stops, the Subscriber is removed from the DataProvider, so buffers can be freed up.
* A new ToolPanelListener::panelChanged event is also thrown to update the preview again, without the tool's
* graphical objects. The Edit button is also toggled off (by the user or programatically).
* graphical objects. The Edit button is also toggled off (by the user or programmatically).
*
* It means that each Edit buttons toggled on will start an update of the preview which might or might not create
* a new History entry, depending on the ProcEvent used.

6
rtgui/filecatalog.cc
View File

@ -674,7 +674,7 @@ void FileCatalog::_refreshProgressBar ()
// Also mention that this progress bar only measures the FIRST pass (quick thumbnails)
// The second, usually longer pass is done multithreaded down in the single entries and is NOT measured by this
if (!inTabMode) {
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
Gtk::Notebook *nb = (Gtk::Notebook *)(filepanel->get_parent());
Gtk::Grid* grid = Gtk::manage (new Gtk::Grid ());
@ -790,7 +790,7 @@ void FileCatalog::previewsFinishedUI ()
{
{
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
redrawAll ();
previewsToLoad = 0;
@ -872,7 +872,7 @@ void FileCatalog::refreshHeight ()
{
int newHeight = fileBrowser->getEffectiveHeight();
if (newHeight < 5) { // This may occure if there's no thumbnail.
if (newHeight < 5) { // This may occur if there's no thumbnail.
int w, h;
get_size_request(w, h);
newHeight = h;

2
rtgui/filepanel.cc
View File

@ -411,7 +411,7 @@ bool FilePanel::handleShortcutKey (GdkEventKey* event)
void FilePanel::loadingThumbs(Glib::ustring str, double rate)
{
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
if( !str.empty()) {
parent->setProgressStr(str);

2
rtgui/filepanel.h
View File

@ -58,7 +58,7 @@ public:
{
parent = p;
}
void init (); // dont call it directly, the constructor calls it as idle source
void init (); // don't call it directly, the constructor calls it as idle source
void on_realize ();
void setAspect();
void open (const Glib::ustring& d); // open a file or a directory

2
rtgui/guiutils.cc
View File

@ -336,7 +336,7 @@ void drawCrop (Cairo::RefPtr<Cairo::Context> cr, int imx, int imy, int imw, int
}
} else if (cparams.guide == "ePassport") {
/* Official measurements do not specify exact ratios, just min/max measurements within which the eyes and chin-crown distance must lie. I averaged those measurements to produce these guides.
* The first horizontal guide is for the crown, the second is rougly for the nostrils, the third is for the chin.
* The first horizontal guide is for the crown, the second is roughly for the nostrils, the third is for the chin.
* http://www.homeoffice.gov.uk/agencies-public-bodies/ips/passports/information-photographers/
* "(...) the measurement of the face from the bottom of the chin to the crown (ie the top of the head, not the top of the hair) is between 29mm and 34mm."
*/

2
rtgui/histogrampanel.cc
View File

@ -483,7 +483,7 @@ void HistogramRGBArea::updateBackBuffer (int r, int g, int b, const Glib::ustrin
}
// Mostly not necessary, but should be in some case
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
Glib::RefPtr<Gdk::Window> window = get_window();
int winx, winy, winw, winh;

2
rtgui/lensprofile.cc
View File

@ -272,7 +272,7 @@ void LensProfilePanel::setRawMeta(bool raw, const rtengine::FramesMetaData* pMet
if (!raw || pMeta->getFocusDist() <= 0) {
disableListener();
// CA is very focus layer dependend, otherwise it might even worsen things
// CA is very focus layer dependent, otherwise it might even worsen things
allowFocusDep = false;
ckbUseCA->set_active(false);
ckbUseCA->set_sensitive(false);

2
rtgui/lwbutton.cc
View File

@ -178,7 +178,7 @@ bool LWButton::releaseNotify (int x, int y)
void LWButton::redraw (Cairo::RefPtr<Cairo::Context> context)
{
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
context->set_line_width (1.0);
context->set_antialias (Cairo::ANTIALIAS_SUBPIXEL);
context->rectangle (xpos + 0.5, ypos + 0.5, w - 1.0, h - 1.0);

4
rtgui/mydiagonalcurve.cc
View File

@ -1280,7 +1280,7 @@ void MyDiagonalCurve::pipetteDrag(EditDataProvider *provider, int modifierKey)
void MyDiagonalCurve::getCursorPositionFromCurve(float x)
{
// the graph is refreshed only if a new point is created (snaped to a pixel)
// the graph is refreshed only if a new point is created (snapped to a pixel)
clampedX = x;
clampedY = point.getVal01(x);
@ -1292,7 +1292,7 @@ void MyDiagonalCurve::getCursorPositionFromCurve(float x)
void MyDiagonalCurve::getCursorPositionFromCurve(int x)
{
// the graph is refreshed only if a new point is created (snaped to a pixel)
// the graph is refreshed only if a new point is created (snapped to a pixel)
cursorX = x - graphX;
clampedX = (float(cursorX) - 1.5) / float(graphW - 3);
clampedY = point.getVal01(clampedX);

2
rtgui/options.cc
View File

@ -556,7 +556,7 @@ void Options::setDefaults ()
rtSettings.verbose = false;
rtSettings.gamutICC = true;
rtSettings.gamutLch = true;
rtSettings.amchroma = 40;//between 20 and 140 low values increase effect..and also artefacts, high values reduces
rtSettings.amchroma = 40;//between 20 and 140 low values increase effect..and also artifacts, high values reduces
rtSettings.artifact_cbdl = 4.;
rtSettings.level0_cbdl = 0;
rtSettings.level123_cbdl = 30;

2
rtgui/ppversion.h
View File

@ -25,7 +25,7 @@
321 2014-08-17
[Film Simulation] new tool using HALDCLUT files
320 2014-07-02 (yes, same version number... this is an error due to a wrong version number set in comment of previous change)
New [RAW Bayer] and [RAW X-Trans] sections, with some parameters transfered from [RAW] to [RAW Bayer]
New [RAW Bayer] and [RAW X-Trans] sections, with some parameters transferred from [RAW] to [RAW Bayer]
320 2014-03-29
[ColorToning] new tool for color toning
319 2014-02-11

2
rtgui/soundman.cc
View File

@ -40,7 +40,7 @@ void SoundManager::init()
// Unfortunately MinGW does not support this yet. If audioclient.h is available, add an Init
// called once on program start.
//
// This mitigation plays an empty file on start, so RT is immidiately avaible in the Windows mixer at least
// This mitigation plays an empty file on start, so RT is immediately available in the Windows mixer at least
playSoundAsync(Glib::ustring("sounds\\Empty.wav"));
#endif
}

2
rtgui/splash.cc
View File

@ -116,7 +116,7 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
nb->append_page (*splashImage, M("ABOUT_TAB_SPLASH"));
splashImage->show ();
// Tab 2: the informations about the current version
// Tab 2: the information about the current version
std::string buildFileName = Glib::build_filename (creditsPath, "AboutThisBuild.txt");
if ( Glib::file_test(buildFileName, (Glib::FILE_TEST_EXISTS)) ) {

2
rtgui/thumbimageupdater.cc
View File

@ -208,7 +208,7 @@ ThumbImageUpdater::add(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade,
}
// create a new job and append to queue
DEBUG("queing job %s", tbe->shortname.c_str());
DEBUG("queueing job %s", tbe->shortname.c_str());
impl_->jobs_.push_back(Impl::Job(tbe, priority, upgrade, l));
DEBUG("adding run request %s", tbe->shortname.c_str());

2
rtgui/tonecurve.cc
View File

@ -803,7 +803,7 @@ void ToneCurve::enableAll ()
bool ToneCurve::autoExpComputed_ ()
{
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
disableListener ();
enableAll ();
expcomp->setValue (nextExpcomp);

6
rtgui/toolpanelcoord.cc
View File

@ -845,7 +845,7 @@ bool ToolPanelCoordinator::handleShortcutKey (GdkEventKey* event)
void ToolPanelCoordinator::updateVScrollbars (bool hide)
{
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
Gtk::PolicyType policy = hide ? Gtk::POLICY_NEVER : Gtk::POLICY_AUTOMATIC;
exposurePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy);
detailsPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy);
@ -861,7 +861,7 @@ void ToolPanelCoordinator::updateVScrollbars (bool hide)
void ToolPanelCoordinator::updateTabsHeader (bool useIcons)
{
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
TOITypes type = useIcons ? TOI_ICON : TOI_TEXT;
toiE->switchTo (type);
@ -887,7 +887,7 @@ void ToolPanelCoordinator::updateTabsUsesIcons (bool useIcons)
void ToolPanelCoordinator::toolSelected (ToolMode tool)
{
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
switch (tool) {
case TMCropSelect:

2
rtgui/wavelet.cc
View File

@ -890,7 +890,7 @@ void Wavelet::wavChanged (double nlevel)
nextnlevel = nlevel;
const auto func = [](gpointer data) -> gboolean {
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
static_cast<Wavelet*>(data)->wavComputed_();
return FALSE;

4
tools/RTProfileBuilderSample.cs
View File

@ -115,7 +115,7 @@ namespace RTProfilerBuilder {
} // end if camera=xxx
// This is for camera independend settings
// This is for camera independent settings
switch (sectionEntry) {
// These are parsed from EXIFTOOL and XMP in DNG (see http://en.wikipedia.org/wiki/Extensible_Metadata_Platform)
case "IPTC/City":
@ -262,7 +262,7 @@ namespace RTProfilerBuilder {
/// <param name="correct">Correction factors</param>
public DistortionCorrectProf(double[] focLen, double[] correct) {
if (focLen == null || correct == null || focLen.Length != correct.Length || focLen.Length < 2)
throw new Exception("DistortionCorrectProf inputs must be valid and of the same lenghts, at least 2 points");
throw new Exception("DistortionCorrectProf inputs must be valid and of the same lengths, at least 2 points");
adFocLen = focLen; adCorrect = correct;

6
tools/benchmarkRT
View File

@ -31,7 +31,7 @@ download () {
wget --progress=dot:binary --continue --trust-server-names --tries=1 --timestamping "$1" 2>&1 | sed "s/^/\t/"
return=${PIPESTATUS[0]}
((retries--))
if [[ $return -eq 0 ]]; then # I don't trust wget to only exit with 0 if it downloaded the file succesfully, so I check.
if [[ $return -eq 0 ]]; then # I don't trust wget to only exit with 0 if it downloaded the file successfully, so I check.
if [[ -f "$(basename "$1")" ]]; then
break
fi
@ -145,7 +145,7 @@ if [[ ${inFile} = http* ]]; then # if inFile is a url and if we haven't download
echo
}
else # otherwise if inFile is not a url, check if it exists
[[ ! -e "${inFile}" ]] && { # if it doesnt exist, choke
[[ ! -e "${inFile}" ]] && { # if it doesn't exist, choke
printf "%s\n" "You specified" "-i ${inFile}" "but that file does not exist."
exit 1
}
@ -242,7 +242,7 @@ for s in "${!sidecarFinal[@]}"; do
## t="$(( $RANDOM %20 )).$(( $RANDOM %999 ))"
# benchmark stores time array of each run, gets reset after each PP3
benchmark+=("$t")
# total stores time array of each run, doesnt get reset, adds up total afterwards
# total stores time array of each run, doesn't get reset, adds up total afterwards
total+=("$t")
i="$(printf "%02d\n" "$i")"
if [[ $testAllTools -eq 1 ]]; then

2
tools/win/readme.txt
View File

@ -8,7 +8,7 @@ As requested in issue 1904 ( http://code.google.com/p/rawtherapee/issues/detail?
the preferred choice of setup mechanism is Wix widgets. However an InnoSetup script has been
created before the definitive choice and has been added to the source tree, for convenience.
Once the Wix setup mechanism will be operational, the InnoSetup can be supressed from the source
Once the Wix setup mechanism will be operational, the InnoSetup can be suppressed from the source
tree.
All discussion about the present document and the setup scripts has to be done in issue 1904.