Skip to content
This repository has been archived by the owner on Jan 14, 2023. It is now read-only.

enforce no raw flip #26

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

enforce no raw flip #26

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67a8cd7
enforce no raw flip
servantftechnicolor Nov 14, 2022
5bcc77c
Make sure orientation is took into account correctly
servantftechnicolor Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/imageIOHandler/QtOIIOHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ bool QtOIIOHandler::read(QImage *image)
// assert(nchannels == 1 || nchannels >= 3);

oiio::ImageSpec configSpec;

// libRAW configuration
//configSpec.attribute("raw:user_flip", 0);
configSpec.attribute("raw:user_flip", 1);
configSpec.attribute("raw:auto_bright", 0); // don't want exposure correction
configSpec.attribute("raw:use_camera_wb", 1); // want white balance correction
#if OIIO_VERSION <= (10000 * 2 + 100 * 0 + 8) // OIIO_VERSION <= 2.0.8
Expand Down Expand Up @@ -407,7 +408,11 @@ QVariant QtOIIOHandler::option(ImageOption option) const
return std::unique_ptr<oiio::ImageInput>(nullptr);
}
std::string path = d->fileName().toStdString();
return std::unique_ptr<oiio::ImageInput>(oiio::ImageInput::open(path));

oiio::ImageSpec configSpec;
configSpec.attribute("raw:user_flip", 1);

return std::unique_ptr<oiio::ImageInput>(oiio::ImageInput::open(path, &configSpec));
};

if (option == Size)
Expand All @@ -425,16 +430,17 @@ QVariant QtOIIOHandler::option(ImageOption option) const
{
return QImageIOHandler::TransformationNone;
}

// Translate OIIO transformations to QImageIOHandler::ImageTransformation
switch(oiio::ImageBuf(imageInput->spec()).orientation())
{
case 1: return QImageIOHandler::TransformationNone; break;
case 2: return QImageIOHandler::TransformationMirror; break;
case 3: return QImageIOHandler::TransformationRotate180; break;
case 4: return QImageIOHandler::TransformationFlip; break;
case 5: return QImageIOHandler::TransformationMirrorAndRotate90; break;
case 5: return QImageIOHandler::TransformationFlipAndRotate90; break;
case 6: return QImageIOHandler::TransformationRotate90; break;
case 7: return QImageIOHandler::TransformationFlipAndRotate90; break;
case 7: return QImageIOHandler::TransformationMirrorAndRotate90; break;
case 8: return QImageIOHandler::TransformationRotate270; break;
}
}
Expand Down