RafDecoder: extract applyCorrections() out of decodeMetaDataInternal()

Author: LebedevRI

src/librawspeed/decoders/RafDecoder.cpp

@@ -189,21 +189,7 @@ void RafDecoder::checkSupportInternal(const CameraMetaData* meta) {
   }
 }
 
-void RafDecoder::decodeMetaDataInternal(const CameraMetaData* meta) {
-  int iso = 0;
-  if (mRootIFD->hasEntryRecursive(TiffTag::ISOSPEEDRATINGS))
-    iso = mRootIFD->getEntryRecursive(TiffTag::ISOSPEEDRATINGS)->getU32();
-  mRaw->metadata.isoSpeed = iso;
-
-  // This is where we'd normally call setMetaData but since we may still need
-  // to rotate the image for SuperCCD cameras we do everything ourselves
-  auto id = mRootIFD->getID();
-  const Camera* cam = meta->getCamera(id.make, id.model, mRaw->metadata.mode);
-  if (!cam)
-    ThrowRDE("Couldn't find camera");
-
-  assert(cam != nullptr);
-
+void RafDecoder::applyCorrections(const Camera* cam) {
   iPoint2D new_size(mRaw->dim);
   iPoint2D crop_offset(0, 0);
 
@@ -267,6 +253,24 @@ void RafDecoder::decodeMetaDataInternal(const CameraMetaData* meta) {
   } else if (applyCrop) {
     mRaw->subFrame(iRectangle2D(crop_offset, new_size));
   }
+}
+
+void RafDecoder::decodeMetaDataInternal(const CameraMetaData* meta) {
+  int iso = 0;
+  if (mRootIFD->hasEntryRecursive(TiffTag::ISOSPEEDRATINGS))
+    iso = mRootIFD->getEntryRecursive(TiffTag::ISOSPEEDRATINGS)->getU32();
+  mRaw->metadata.isoSpeed = iso;
+
+  // This is where we'd normally call setMetaData but since we may still need
+  // to rotate the image for SuperCCD cameras we do everything ourselves
+  auto id = mRootIFD->getID();
+  const Camera* cam = meta->getCamera(id.make, id.model, mRaw->metadata.mode);
+  if (!cam)
+    ThrowRDE("Couldn't find camera");
+
+  assert(cam != nullptr);
+
+  applyCorrections(cam);
 
   const CameraSensorInfo *sensor = cam->getSensorInfo(iso);
   mRaw->blackLevel = sensor->mBlackLevel;

src/librawspeed/decoders/RafDecoder.h

@@ -42,6 +42,7 @@ class RafDecoder final : public AbstractTiffDecoder
       : AbstractTiffDecoder(move(root), file) {}
 
   RawImage decodeRawInternal() override;
+  void applyCorrections(const Camera* cam);
   void decodeMetaDataInternal(const CameraMetaData* meta) override;
   void checkSupportInternal(const CameraMetaData* meta) override;
   static bool isRAF(const Buffer& input);