merge with dev

This commit is contained in:
Desmis
2019-06-26 07:37:29 +02:00
18 changed files with 883 additions and 728 deletions

View File

@@ -28,6 +28,7 @@
#include "dcp.h"
#include "iimage.h"
#include "imagesource.h"
#include "pixelsmap.h"
#define HR_SCALE 2
@@ -101,7 +102,7 @@ protected:
void transformRect(const PreviewProps &pp, int tran, int &sx1, int &sy1, int &width, int &height, int &fw);
void transformPosition(int x, int y, int tran, int& tx, int& ty);
unsigned FC(int row, int col)
unsigned FC(int row, int col) const
{
return ri->FC(row, col);
}
@@ -258,11 +259,11 @@ protected:
);
void ddct8x8s(int isgn, float a[8][8]);
int interpolateBadPixelsBayer(PixelsMap &bitmapBads, array2D<float> &rawData);
int interpolateBadPixelsNColours(PixelsMap &bitmapBads, const int colours);
int interpolateBadPixelsXtrans(PixelsMap &bitmapBads);
int findHotDeadPixels(PixelsMap &bpMap, float thresh, bool findHotPixels, bool findDeadPixels);
int interpolateBadPixelsBayer(const PixelsMap &bitmapBads, array2D<float> &rawData);
int interpolateBadPixelsNColours(const PixelsMap &bitmapBads, int colours);
int interpolateBadPixelsXtrans(const PixelsMap &bitmapBads);
int findHotDeadPixels(PixelsMap &bpMap, float thresh, bool findHotPixels, bool findDeadPixels) const;
int findZeroPixels(PixelsMap &bpMap) const;
void cfa_linedn (float linenoiselevel, bool horizontal, bool vertical, const CFALineDenoiseRowBlender &rowblender);//Emil's line denoise
void green_equilibrate_global(array2D<float> &rawData);