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

Backed out changeset: 159f9e7014f8

Browse Source
This commit is contained in:
Oliver Duis
2012-05-06 23:04:47 +02:00
parent 1483ecb47c
commit 05226a2875
125 changed files with 747 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/stdimagesource.cc
View File

@@ -117,7 +117,7 @@ int StdImageSource::load (Glib::ustring fname, bool batch) {
return 0;
}
void StdImageSource::transform (PreviewProps pp, int tran, int &sx1, int &sy1, int &sx2, int &sy2) const {
void StdImageSource::transform (PreviewProps pp, int tran, int &sx1, int &sy1, int &sx2, int &sy2) {
int W = img->width;
int H = img->height;
@@ -313,7 +313,7 @@ void StdImageSource::colorSpaceConversion (Imagefloat* im, ColorManagementParams
cmsHPROFILE in;
cmsHPROFILE out = iccStore->workingSpace (cmp.working);
if (cmp.input=="(embedded)" || cmp.input.empty() || cmp.input=="(camera)") {
if (cmp.input=="(embedded)" || cmp.input=="" || cmp.input=="(camera)") {
if (embedded)
in = embedded;
else
@@ -345,7 +345,7 @@ void StdImageSource::colorSpaceConversion16 (Image16* im, ColorManagementParams
cmsHPROFILE in;
cmsHPROFILE out = iccStore->workingSpace (cmp.working);
if (cmp.input=="(embedded)" || cmp.input.empty() || cmp.input=="(camera)") {
if (cmp.input=="(embedded)" || cmp.input=="" || cmp.input=="(camera)") {
if (embedded)
in = embedded;
else
@@ -409,7 +409,7 @@ void StdImageSource::hflip (Imagefloat* image) {
delete [] rowb;
}
void StdImageSource::vflip (Imagefloat* image) const {
void StdImageSource::vflip (Imagefloat* image) {
int width = image->width;
int height = image->height;
@@ -468,7 +468,7 @@ ColorTemp StdImageSource::getAutoWB () {
//return ColorTemp (pow(avg_r/n, 1.0/p), pow(avg_g/n, 1.0/p), pow(avg_b/n, 1.0/p));
}
void StdImageSource::transformPixel (int x, int y, int tran, int& tx, int& ty) const {
void StdImageSource::transformPixel (int x, int y, int tran, int& tx, int& ty) {
int W = img->width;
int H = img->height;