From be4cc858a23ddfe88c509b433e1002cce6ea7162 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Thu, 6 Apr 2017 23:51:36 +0200 Subject: [PATCH] Remove obsolete dcraw::scale_colors() --- rtengine/dcraw.cc | 2 ++ rtengine/dcraw.h | 13 ------------- rtengine/rawimage.h | 14 -------------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index e55c0256b..eca373337 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -4526,6 +4526,7 @@ void CLASS colorcheck() // free (fimg); //} +/* void CLASS scale_colors() { unsigned bottom, right, size, row, col, ur, uc, i, x, y, c, sum[8]; @@ -4641,6 +4642,7 @@ skip_block: ; } } +*/ void CLASS pre_interpolate() { ushort (*img)[4]; diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h index c0502ae5d..6a1a83391 100644 --- a/rtengine/dcraw.h +++ b/rtengine/dcraw.h @@ -410,23 +410,10 @@ void foveon_make_curves(short **curvep, float dq[3], float div[3], float filt); int foveon_apply_curve (short *curve, int i); void foveon_interpolate(); -//void xtrans_interpolate (int passes); -//void cielab (ushort rgb[3], short lab[3]); - -//void remove_zeroes(); -//void bad_pixels (const char *cfname); -//void subtract (const char *fname); void gamma_curve (double pwr, double ts, int mode, int imax); void pseudoinverse (double (*in)[3], double (*out)[3], int size); void cam_xyz_coeff (float rgb_cam[3][4], double cam_xyz[4][3]); -//void hat_transform (float *temp, float *base, int st, int size, int sc); -//void wavelet_denoise(); -void scale_colors(); void pre_interpolate(); -//void border_interpolate (int border); -//void median_filter(); -//void blend_highlights(); -//void recover_highlights(); void crop_masked_pixels(); void tiff_get (unsigned base, unsigned *tag, unsigned *type, unsigned *len, unsigned *save); diff --git a/rtengine/rawimage.h b/rtengine/rawimage.h index cc6dccb67..62752b59c 100644 --- a/rtengine/rawimage.h +++ b/rtengine/rawimage.h @@ -173,12 +173,6 @@ public: void getRgbCam (float rgbcam[3][4]); void getXtransMatrix ( int xtransMatrix[6][6]); - void clearXtransCblack( ) - { - for(int c = 0; c < 4; c++) { - cblack[c] = 0; - } - } unsigned get_filters() const { return filters; @@ -312,14 +306,6 @@ public: public: // dcraw functions - void scale_colors() - { - if(isXtrans()) { - clearXtransCblack( ); - } - - DCraw::scale_colors(); - } void pre_interpolate() { DCraw::pre_interpolate();