merge with dev

2018-11-09 18:50:41 +01:00
parent 9cc65909e9 a1d4acf72f
commit fd720007c2
10 changed files with 26 additions and 53 deletions
--- a/rtengine/rawimagesource.h
+++ b/rtengine/rawimagesource.h
@@ -168,10 +168,6 @@ public:
        return ri->get_rotateDegree();
    }

-    FrameData*  getImageData(unsigned int frameNum)
-    {
-        return idata->getFrameData(frameNum);
-    }
    ImageMatrices* getImageMatrices()
    {
        return &imatrices;