Merge branch 'dev' into multiframe-handling, with some merge bugfix

2017-09-17 01:15:51 +02:00
parent ee0bff4124 10a4c5f1de
commit 0905294bda
197 changed files with 11535 additions and 5495 deletions
--- a/rtengine/rtlensfun.h
+++ b/rtengine/rtlensfun.h
@@ -0,0 +1,126 @@
+/* -*- C++ -*-
+ *
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2017 Alberto Griggio <alberto.griggio@gmail.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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <memory>
+#include <vector>
+
+#include <glibmm.h>
+
+#include <lensfun.h>
+
+#include "lcp.h"
+#include "noncopyable.h"
+#include "procparams.h"
+
+namespace rtengine {
+
+class LFModifier final :
+    public LensCorrection,
+    public NonCopyable
+{
+public:
+    ~LFModifier();
+
+    explicit operator bool() const;
+
+    void correctDistortion(double &x, double &y, int cx, int cy, double scale) const override;
+    bool isCACorrectionAvailable() const override;
+    void correctCA(double &x, double &y, int channel) const override;
+    void processVignetteLine(int width, int y, float *line) const override;
+    void processVignetteLine3Channels(int width, int y, float *line) const;
+
+    Glib::ustring getDisplayString() const;
+
+private:
+    LFModifier(lfModifier *m, bool swap_xy, int flags);
+
+    friend class LFDatabase;
+    lfModifier *data_;
+    bool swap_xy_;
+    int flags_;
+};
+
+class LFCamera final
+{
+public:
+    LFCamera();
+
+    explicit operator bool() const;
+
+    Glib::ustring getMake() const;
+    Glib::ustring getModel() const;
+    float getCropFactor() const;
+
+    Glib::ustring getDisplayString() const;
+
+private:
+    friend class LFDatabase;
+    const lfCamera *data_;
+};
+
+class LFLens final
+{
+public:
+    LFLens();
+
+    explicit operator bool() const;
+
+    Glib::ustring getMake() const;
+    Glib::ustring getLens() const;
+    Glib::ustring getDisplayString() const { return getLens(); }
+    float getCropFactor() const;
+    bool hasVignettingCorrection() const;
+    bool hasDistortionCorrection() const;
+
+private:
+    friend class LFDatabase;
+    const lfLens *data_;
+};
+
+class LFDatabase final :
+    public NonCopyable
+{
+public:
+    static bool init(const Glib::ustring &dbdir);
+    static const LFDatabase *getInstance();
+
+    ~LFDatabase();
+
+    std::vector<LFCamera> getCameras() const;
+    std::vector<LFLens> getLenses() const;
+    LFCamera findCamera(const Glib::ustring &make, const Glib::ustring &model) const;
+    LFLens findLens(const LFCamera &camera, const Glib::ustring &name) const;
+
+    static std::unique_ptr<LFModifier> findModifier(const LensProfParams &lensProf, const FramesMetaData *idata, int width, int height, const CoarseTransformParams &coarse, int rawRotationDeg);
+
+private:
+    std::unique_ptr<LFModifier> getModifier(const LFCamera &camera, const LFLens &lens,
+                                            float focalLen, float aperture, float focusDist,
+                                            int width, int height, bool swap_xy) const;
+    LFDatabase();
+    bool LoadDirectory(const char *dirname);
+    
+    static LFDatabase instance_;
+    lfDatabase *data_;
+};
+
+} // namespace rtengine