e635030650
* Added support for non-raw files to the film negative tool. The tool is now under the "Color" tab. Moved the entire filmneg code downstream, right after input profile conversion. Usage changes a bit: White Balance must be set to the _backlight_ color temperature. Added two more sliders to color-balance the picture after negative inversion. Legacy inversion method kept for compatibility with processing profiles saved by RT v5.7 or 5.8 (only if Film Negative was enabled). Should be removed in a future version. There is still an issue with DCP profiles that need the look table to be active to work properly. Using a simple matrix input profile (or just camera standard) is recommended for now. * The user can now choose to perform inversion before or after input colorspace conversion. Seamless backwards compatibility with previous processing profiles; upgrading from a previous version now gives an (almost) identical output as before. Generalised the concept of film base values: the processing profile now contains a pair of RGB triplets, "reference input" and "reference output", which makes it much more straightforward to compute the output multipliers. * Added support for `RGB` data type to putToKeyFile, removed the now unused `RGB::toVector()` method. Some cleanup. * Spot balance picker now stays active indefinitely. Can be disabled by right-clicking, too. * Removed film negative from `filterRawRefresh` condition, since the new version does not require raw rendering anymore. * The Output Level slider is now exponential, so it should feel more familiar to use (similar to the exposure compensation slider). * Removed old `RedBase`, `GreenBase`, `BlueBase` keys from the PP3 file after params upgrade. Keys are only kept if the file only undergoes batch edit (hence no params upgrade was done). * Made the balance sliders exponential and centered at zero. Now they should be a bit smoother and possibly more user-friendly. * Changed adjusters' step to more useful values, they were too fine-grained and hard to adjust using the +/- spinbutton. Increased max ratio value from 3 to 5, as i found an old negative needing a very high blue channel exponent. * Added an initial processing profile for film negative inversion, to be provided as a bundled profile. * Removed Output Level and balance sliders when in batch mode: since the effect of these sliders is dependent on the reference input values, those values needed to be copied as well. And, touching any of the sliders needed to flag all three as dirty. All this felt more confusing than useful. It should be sufficient (and clearer) to copy/paste the params, and then fine-tune the balance on individual pictures when needed. * Set bayer demosaic method to RCD in the bundled "Film Negative" processing profile. RCD seems to play a bit better with Capture Sharpening in the presence of film grain, compared to Amaze. This will favor new users starting with all-defaults settings, hence having Capture Sharpening enabled by default. * Removed incorrect "contrast" term from the "Reference exponent" label. This parameter adjusts the image _gamma_, not its contrast.
127 lines
4.8 KiB
C++
127 lines
4.8 KiB
C++
/*
|
|
* This file is part of RawTherapee.
|
|
*
|
|
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
|
|
*
|
|
* RawTherapee is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* RawTherapee is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
#pragma once
|
|
|
|
#include "colortemp.h"
|
|
#include "imagesource.h"
|
|
#include "procparams.h"
|
|
|
|
namespace rtengine
|
|
{
|
|
|
|
class ImageIO;
|
|
|
|
namespace procparams
|
|
{
|
|
|
|
class ProcParams;
|
|
|
|
struct ToneCurveParams;
|
|
struct RAWParams;
|
|
struct ColorManagementParams;
|
|
|
|
}
|
|
|
|
class StdImageSource : public ImageSource
|
|
{
|
|
|
|
protected:
|
|
ImageIO* img;
|
|
ColorTemp wb;
|
|
ProgressListener* plistener;
|
|
bool full;
|
|
int max[3];
|
|
bool rgbSourceModified;
|
|
|
|
//void transformPixel (int x, int y, int tran, int& tx, int& ty);
|
|
void getSampleFormat (const Glib::ustring &fname, IIOSampleFormat &sFormat, IIOSampleArrangement &sArrangement);
|
|
|
|
public:
|
|
StdImageSource ();
|
|
~StdImageSource () override;
|
|
|
|
int load (const Glib::ustring &fname) override;
|
|
void getWBMults (const ColorTemp &ctemp, const procparams::RAWParams &raw, std::array<float, 4>& scale_mul, float &autoGainComp, float &rm, float &gm, float &bm) const override {};
|
|
void getImage (const ColorTemp &ctemp, int tran, Imagefloat* image, const PreviewProps &pp, const procparams::ToneCurveParams &hrp, const procparams::RAWParams &raw) override;
|
|
void getrgbloc (int begx, int begy, int yEn, int xEn, int cx, int cy, int bf_h, int bf_w) override {};
|
|
ColorTemp getWB () const override
|
|
{
|
|
return wb;
|
|
}
|
|
void getAutoWBMultipliers (double &rm, double &gm, double &bm) override;
|
|
ColorTemp getSpotWB (std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, int tran, double equal) override;
|
|
void WBauto(double &tempref, double &greenref, array2D<float> &redloc, array2D<float> &greenloc, array2D<float> &blueloc, int bfw, int bfh, double &avg_rm, double &avg_gm, double &avg_bm, double &tempitc, double &greenitc, float &studgood, bool &twotimes, const procparams::WBParams & wbpar, int begx, int begy, int yEn, int xEn, int cx, int cy, const procparams::ColorManagementParams &cmp, const procparams::RAWParams &raw) override;
|
|
void getAutoWBMultipliersitc(double &tempref, double &greenref, double &tempitc, double &greenitc, float &studgood, int begx, int begy, int yEn, int xEn, int cx, int cy, int bf_h, int bf_w, double &rm, double &gm, double &bm, const procparams::WBParams & wbpar, const procparams::ColorManagementParams &cmp, const procparams::RAWParams &raw) override;
|
|
|
|
eSensorType getSensorType() const override {return ST_NONE;}
|
|
bool isMono() const override {return false;}
|
|
|
|
bool isWBProviderReady () override
|
|
{
|
|
return true;
|
|
};
|
|
|
|
void getAutoExpHistogram (LUTu &histogram, int& histcompr) override;
|
|
|
|
double getDefGain () const override
|
|
{
|
|
return 0.0;
|
|
}
|
|
|
|
void getFullSize (int& w, int& h, int tr = TR_NONE) override;
|
|
void getSize (const PreviewProps &pp, int& w, int& h) override;
|
|
|
|
ImageIO* getImageIO ()
|
|
{
|
|
return img;
|
|
}
|
|
ImageMatrices* getImageMatrices () override
|
|
{
|
|
return (ImageMatrices*)nullptr;
|
|
}
|
|
bool isRAW() const override
|
|
{
|
|
return false;
|
|
}
|
|
|
|
void setProgressListener (ProgressListener* pl) override
|
|
{
|
|
plistener = pl;
|
|
}
|
|
|
|
void convertColorSpace(Imagefloat* image, const procparams::ColorManagementParams &cmp, const ColorTemp &wb) override;// RAWParams raw will not be used for non-raw files (see imagesource.h)
|
|
static void colorSpaceConversion (Imagefloat* im, const procparams::ColorManagementParams &cmp, cmsHPROFILE embedded, IIOSampleFormat sampleFormat);
|
|
|
|
bool isRGBSourceModified() const override
|
|
{
|
|
return rgbSourceModified;
|
|
}
|
|
void setCurrentFrame(unsigned int frameNum) override {}
|
|
int getFrameCount() override {return 1;}
|
|
int getFlatFieldAutoClipValue() override {return 0;}
|
|
|
|
|
|
void getRawValues(int x, int y, int rotate, int &R, int &G, int &B) override { R = G = B = 0;}
|
|
|
|
void flush () override;
|
|
void captureSharpening(const procparams::CaptureSharpeningParams &sharpeningParams, bool showMask, double &conrastThreshold, double &radius) override {};
|
|
};
|
|
|
|
}
|