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

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-11-06 08:30:51 +01:00
parent 4a46aeac13 9ddd2a2a9b
commit e4f94f9f33
18 changed files with 181 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/rawimagesource.h
View File

@@ -26,12 +26,12 @@
#include "colortemp.h"
#include "iimage.h"
#include "imagesource.h"
#include "pixelsmap.h"
#define HR_SCALE 2
namespace rtengine
{
class PixelsMap;
class RawImage;
class DiagonalCurve;
class RetinextransmissionCurve;
@@ -266,8 +266,6 @@ protected:
void eahd_demosaic();
void hphd_demosaic();
void vng4_demosaic(const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue);
void ppg_demosaic();
void jdl_interpolate_omp();
void igv_interpolate(int winw, int winh);
void lmmse_interpolate_omp(int winw, int winh, array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue, int iterations);
void amaze_demosaic_RT(int winx, int winy, int winw, int winh, const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue, size_t chunkSize = 1, bool measure = false);//Emil's code for AMaZE
@@ -276,8 +274,7 @@ protected:
void dcb_demosaic(int iterations, bool dcb_enhance);
void ahd_demosaic();
void rcd_demosaic(size_t chunkSize = 1, bool measure = false);
void border_interpolate(unsigned int border, float (*image)[4], unsigned int start = 0, unsigned int end = 0);
void border_interpolate2(int winw, int winh, int lborders, const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue);
void border_interpolate(int winw, int winh, int lborders, const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue);
void dcb_initTileLimits(int &colMin, int &rowMin, int &colMax, int &rowMax, int x0, int y0, int border);
void fill_raw(float (*cache)[3], int x0, int y0, float** rawData);
void fill_border(float (*cache)[3], int border, int x0, int y0);