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

Support for Fuji X-Trans-Sensor, Issue 2415 (thanks to Hombre for the changes to gui); Clip Control for Flat Field correction, Issue 2441; Update to dcraw 9.22 1.467

Browse Source
This commit is contained in:
Ingo
2014-07-10 00:33:33 +02:00
parent 3cf0da217a
commit 617b888fa0
65 changed files with 3832 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
rtengine/rtthumbnail.cc
View File

@@ -283,8 +283,9 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
unsigned filter = ri->get_filters();
int firstgreen = 1;
// locate first green location in the first row
while (!FISGREEN(filter,1,firstgreen))
firstgreen++;
if(ri->getSensorType()!=ST_FUJI_XTRANS)
while (!FISGREEN(filter,1,firstgreen))
firstgreen++;
int skip = 1;
if (ri->get_FujiWidth() != 0){
@@ -314,7 +315,7 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
DCraw::dcrawImage_t image = ri->get_image();
Imagefloat* tmpImg = new Imagefloat(tmpw, tmph);
if (ri->isBayer()) {
if (ri->getSensorType()==ST_BAYER) {
// demosaicing! (sort of)
for (int row = 1, y = 0; row < height - 1 && y < tmph; row += vskip, y++) {
rofs = row * width;
@@ -344,14 +345,37 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
}
}
} else {
for (int row = 1, y = 0; row < height - 1 && y < tmph; row += vskip, y++) {
rofs = row * width;
for (int col = firstgreen, x = 0; col < width - 1 && x < tmpw; col
+= hskip, x++) {
int ofs = rofs + col;
tmpImg->r(y,x) = image[ofs][0];
tmpImg->g(y,x) = image[ofs][1];
tmpImg->b(y,x) = image[ofs][2];
if(ri->getSensorType()==ST_FUJI_XTRANS) {
for( int row=1, y = 0; row < height-1 && y < tmph; row+=vskip, y++) {
rofs = row * width;
for( int col=1, x = 0; col < width-1 && x < tmpw; col+=hskip, x++ ) {
int ofs = rofs + col;
float sum[3] = {};
int c;
for(int v=-1;v<=1;v++) {
for(int h=-1;h<=1;h++) {
c = ri->XTRANSFC(row+v,col+h);
sum[c] += image[ofs + v*width + h][c];
}
}
c = ri->XTRANSFC(row,col);
switch (c) {
case 0: tmpImg->r(y,x) = image[ofs][0]; tmpImg->g(y,x) = sum[1] / 5.f; tmpImg->b(y,x) = sum[2] / 3.f; break;
case 1: tmpImg->r(y,x) = sum[0] / 2.f; tmpImg->g(y,x) = image[ofs][1]; tmpImg->b(y,x) = sum[2] / 2.f; break;
case 2: tmpImg->r(y,x) = sum[0] / 3.f; tmpImg->g(y,x) = sum[1] / 5.f; tmpImg->b(y,x) = image[ofs][2]; break;
}
}
}
} else {
for (int row = 1, y = 0; row < height - 1 && y < tmph; row += vskip, y++) {
rofs = row * width;
for (int col = firstgreen, x = 0; col < width - 1 && x < tmpw; col += hskip, x++) {
int ofs = rofs + col;
tmpImg->r(y,x) = image[ofs][0];
tmpImg->g(y,x) = image[ofs][1];
tmpImg->b(y,x) = image[ofs][2];
}
}
}
}
@@ -422,7 +446,7 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
tpp->aeHistogram[((int)(image[i* width+j][0]))>>tpp->aeHistCompression]+=gadd;
tpp->aeHistogram[((int)(image[i* width+j][0]))>>tpp->aeHistCompression]+=badd;
}
} else {
} else if(ri->getSensorType()!=ST_FUJI_XTRANS) {
for (int j = start; j < end; j++)
if (FISGREEN(filter,i,j))
tpp->aeHistogram[((int)(tpp->camwbGreen*image[i* width+j][1]))>>tpp->aeHistCompression]+=gadd;
@@ -430,6 +454,14 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
tpp->aeHistogram[((int)(tpp->camwbRed * image[i* width+j][0]))>>tpp->aeHistCompression]+=radd;
else if (FISBLUE(filter,i,j))
tpp->aeHistogram[((int)(tpp->camwbBlue *image[i* width+j][2]))>>tpp->aeHistCompression]+=badd;
} else {
for (int j = start; j < end; j++)
if (ri->ISXTRANSGREEN(i,j))
tpp->aeHistogram[((int)(tpp->camwbGreen*image[i* width+j][1]))>>tpp->aeHistCompression]+=gadd;
else if (ri->ISXTRANSRED(i,j))
tpp->aeHistogram[((int)(tpp->camwbRed * image[i* width+j][0]))>>tpp->aeHistCompression]+=radd;
else if (ri->ISXTRANSBLUE(i,j))
tpp->aeHistogram[((int)(tpp->camwbBlue *image[i* width+j][2]))>>tpp->aeHistCompression]+=badd;
}
}
@@ -451,33 +483,59 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
start = 32;
end = width - 32;
}
for (int j = start; j < end; j++) {
if (!filter) {
double d = tpp->defGain * image[i * width + j][0];
if (d > 64000.)
continue;
avg_g += d; avg_r += d; avg_b += d;
rn++; gn++; bn++;
} else if (FISGREEN(filter,i,j)) {
double d = tpp->defGain * image[i * width + j][1];
if (d > 64000.)
continue;
avg_g += d;
gn++;
if(ri->getSensorType()!=ST_FUJI_XTRANS) {
for (int j = start; j < end; j++) {
if (!filter) {
double d = tpp->defGain * image[i * width + j][0];
if (d > 64000.)
continue;
avg_g += d; avg_r += d; avg_b += d;
rn++; gn++; bn++;
} else if (FISGREEN(filter,i,j)) {
double d = tpp->defGain * image[i * width + j][1];
if (d > 64000.)
continue;
avg_g += d;
gn++;
}
else if (FISRED(filter,i,j)) {
double d = tpp->defGain * image[i * width + j][0];
if (d > 64000.)
continue;
avg_r += d;
rn++;
}
else if (FISBLUE(filter,i,j)) {
double d = tpp->defGain * image[i * width + j][2];
if (d > 64000.)
continue;
avg_b += d;
bn++;
}
}
else if (FISRED(filter,i,j)) {
double d = tpp->defGain * image[i * width + j][0];
if (d > 64000.)
continue;
avg_r += d;
rn++;
}
else if (FISBLUE(filter,i,j)) {
double d = tpp->defGain * image[i * width + j][2];
if (d > 64000.)
continue;
avg_b += d;
bn++;
} else {
for (int j = start; j < end; j++) {
if (ri->ISXTRANSGREEN(i,j)) {
double d = tpp->defGain * image[i * width + j][1];
if (d > 64000.)
continue;
avg_g += d;
gn++;
}
else if (ri->ISXTRANSRED(i,j)) {
double d = tpp->defGain * image[i * width + j][0];
if (d > 64000.)
continue;
avg_r += d;
rn++;
}
else if (ri->ISXTRANSBLUE(i,j)) {
double d = tpp->defGain * image[i * width + j][2];
if (d > 64000.)
continue;
avg_b += d;
bn++;
}
}
}
}