Expose bitdepth to ImProcCoordinator

Beep6581 · Jun 12, 2021 · a11dffd · a11dffd
1 parent df60590
commit a11dffd
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 1 deletion.
diff --git a/rtengine/imagesource.h b/rtengine/imagesource.h
@@ -124,6 +124,11 @@ class ImageSource : public InitialImage
     virtual 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) = 0;
     virtual void        getrgbloc(int begx, int begy, int yEn, int xEn, int cx, int cy, int bf_h, int bf_w) = 0;
 
+    virtual unsigned int getBitDepth() const
+    {
+        return 0;
+    }
+
     virtual double      getDefGain  () const
     {
         return 1.0;

diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
@@ -105,7 +105,6 @@ ImProcCoordinator::ImProcCoordinator() :
     histGreen(65536), histGreenRaw(65536),
     histBlue(65536), histBlueRaw(65536),
     histLuma(65536),
-    histChroma(65536),
 
     histToneCurve(256),
     histToneCurveBW(256),
@@ -117,6 +116,7 @@ ImProcCoordinator::ImProcCoordinator() :
     histCCAM(256),
     histClad(256),
     bcabhist(256),
+    histChroma(65536),
 
     histLRETI(256),
 
@@ -1810,6 +1810,8 @@ void ImProcCoordinator::notifyHistogramChanged()
 bool ImProcCoordinator::updateLRGBHistograms()
 {
 
+    printf("%u bit image - update histogram\n",imgsrc->getBitDepth());
+
     if (!hist_lrgb_dirty) {
         return false;
     }

diff --git a/rtengine/rawimage.h b/rtengine/rawimage.h
@@ -108,6 +108,11 @@ class RawImage: public DCraw
     {
         return fuji_width;
     }
+
+    unsigned int get_bitdepth() const
+    {
+        return tiff_bps;
+    }
 
     float const * get_FloatRawImage() const
     {

diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
@@ -517,6 +517,11 @@ int RawImageSource::getRotateDegree() const
     return ri->get_rotateDegree();
 }
 
+unsigned int RawImageSource::getBitDepth() const
+{
+    return ri->get_bitdepth();
+}
+
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 void RawImageSource::transformRect (const PreviewProps &pp, int tran, int &ssx1, int &ssy1, int &width, int &height, int &fw)

diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h
@@ -168,6 +168,8 @@ class RawImageSource final : public ImageSource
     void        getSize     (const PreviewProps &pp, int& w, int& h) override;
     int         getRotateDegree() const override;
 
+    unsigned int getBitDepth() const override;
+
     ImageMatrices* getImageMatrices () override
     {
         return &imatrices;

diff --git a/rtengine/stdimagesource.cc b/rtengine/stdimagesource.cc
@@ -297,6 +297,11 @@ void StdImageSource::getSize (const PreviewProps &pp, int& w, int& h)
     h = pp.getHeight() / pp.getSkip() + (pp.getHeight() % pp.getSkip() > 0);
 }
 
+unsigned int StdImageSource::getBitDepth() const
+{
+    return img->getBPS();
+}
+
 void StdImageSource::getAutoExpHistogram (LUTu & histogram, int& histcompr)
 {
     if (img->getType() == sImage8) {

diff --git a/rtengine/stdimagesource.h b/rtengine/stdimagesource.h
@@ -87,6 +87,8 @@ class StdImageSource : public ImageSource
     void        getFullSize (int& w, int& h, int tr = TR_NONE) override;
     void        getSize     (const PreviewProps &pp, int& w, int& h) override;
 
+    unsigned int getBitDepth() const override;
+
     ImageIO*    getImageIO   ()
     {
         return img;