Merge from default branch
This commit is contained in:
@@ -69,7 +69,9 @@ class RawImageSource : public ImageSource {
|
||||
char** needhr; // for color propagation
|
||||
int max[3];
|
||||
double defGain;
|
||||
|
||||
int blcode[16][16][32];
|
||||
bool full;
|
||||
Glib::ustring oldmethod;
|
||||
cmsHPROFILE camProfile;
|
||||
cmsHPROFILE embProfile;
|
||||
|
||||
@@ -146,16 +148,16 @@ class RawImageSource : public ImageSource {
|
||||
inline void interpolate_row_rb_mul_pp (unsigned short* ar, unsigned short* ab, unsigned short* pg, unsigned short* cg, unsigned short* ng, int i, double r_mul, double g_mul, double b_mul, int x1, int width, int skip);
|
||||
|
||||
int LinEqSolve( int nDim, float* pfMatr, float* pfVect, float* pfSolution);//Emil's CA auto correction
|
||||
void CA_correct_RT ();
|
||||
void CA_correct_RT (); //Emil's pre-demosaic CA correction
|
||||
int cfaCleanFromMap( BYTE* bitmapBads );
|
||||
int findHotDeadPixel( BYTE *bpMap, float thresh);
|
||||
void ddct8x8s(int isgn, float **a);
|
||||
|
||||
void cfa_linedn (float linenoiselevel);//Emil's line denoise
|
||||
void cfa_linedn (float linenoiselevel); //Emil's line denoise
|
||||
|
||||
void green_equilibrate (float greenthresh);//Emil's green equilibration
|
||||
void green_equilibrate (float greenthresh);//Emil's green equilibration
|
||||
|
||||
void nodemosaic();
|
||||
void nodemosaic();
|
||||
void eahd_demosaic();
|
||||
void hphd_demosaic();
|
||||
void vng4_demosaic();
|
||||
@@ -164,7 +166,9 @@ class RawImageSource : public ImageSource {
|
||||
void fast_demo();//Emil's code for fast demosaicing
|
||||
void dcb_demosaic(int iterations, int dcb_enhance);
|
||||
void ahd_demosaic();
|
||||
void border_interpolate(int border, ushort (*image)[4]);
|
||||
void bilinear_demosaic();
|
||||
void bilinear_interpolate_block(ushort (*image)[4], int start, int end);
|
||||
void border_interpolate(int border, ushort (*image)[4], int start = 0, int end = 0);
|
||||
void dcb_initTileLimits(int &colMin, int &rowMin, int &colMax, int &rowMax, int x0, int y0, int border);
|
||||
void fill_raw( ushort (*cache )[4], int x0, int y0, ushort** rawData);
|
||||
void fill_border( ushort (*cache )[4], int border, int x0, int y0);
|
||||
|
Reference in New Issue
Block a user