Basic support for some foveon cams (SD1, SD1 Merrill, DP1 Merrill, DP2 Merrill, DP3 Merrill, SD14), Issue 2729

This commit is contained in:
Ingo
2015-04-17 16:27:38 +02:00
parent c7162b9430
commit 16d0841f1e
21 changed files with 147 additions and 38 deletions

View File

@@ -115,7 +115,7 @@ void ffInfo::updateRawImage()
int H = ri->get_height();
int W = ri->get_width();
ri->compress_image();
int rSize = W*((ri->getSensorType()!=ST_NONE)?1:3);
int rSize = W*((ri->getSensorType()==ST_BAYER || ri->getSensorType()==ST_FUJI_XTRANS)?1:3);
acc_t **acc = new acc_t*[H];
for( int row=0; row<H;row++)
acc[row] = new acc_t[rSize ];
@@ -131,7 +131,7 @@ void ffInfo::updateRawImage()
if( !temp->loadRaw(true)){
temp->compress_image(); //\ TODO would be better working on original, because is temporary
nFiles++;
if( ri->getSensorType()!=ST_NONE ){
if( ri->getSensorType()==ST_BAYER || ri->getSensorType()==ST_FUJI_XTRANS ){
for( int row=0; row<H;row++){
for( int col=0; col < W;col++)
acc[row][col] += temp->data[row][col];