Skip to content

Fixed photo orientation bug #4378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabriel-bolbotina wants to merge 2 commits into
base: master
Choose a base branch
from
+44 −11
Open

Fixed photo orientation bug #4378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfc7b71
Fixed android clear orientation function
gabriel-bolbotina Mar 3, 2026
12324c9
Implemented code findings
gabriel-bolbotina Mar 10, 2026
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
35 changes: 26 additions & 9 deletions app/imageutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,24 +150,41 @@ bool ImageUtils::clearOrientationMetadata( const QString &sourceImage )
return false;

srcImage->readMetadata();
bool metadataModified = false;

Exiv2::ExifData &exifData = srcImage->exifData();
if ( exifData.empty() )
if ( !exifData.empty() )
{
return true;
const auto exifIt = exifData.findKey( Exiv2::ExifKey( "Exif.Image.Orientation" ) );
if ( exifIt != exifData.end() )
{
exifIt->setValue( "1" ); // 1 = no rotation
metadataModified = true;
}
}

Exiv2::XmpData &xmpData = srcImage->xmpData();
if ( !xmpData.empty() )
{
const auto xmpIt = xmpData.findKey( Exiv2::XmpKey( "Xmp.tiff.Orientation" ) );
if ( xmpIt != xmpData.end() )
{
xmpIt->setValue( "1" );
metadataModified = true;
}
}

const auto iterator = exifData.findKey( Exiv2::ExifKey( "Exif.Image.Orientation" ) );
if ( iterator != exifData.end() )
// Only write to disk if we actually changed something
if ( metadataModified )
{
exifData.erase( iterator );
srcImage->writeMetadata();
}
srcImage->setExifData( exifData );
srcImage->writeMetadata();

return true;
}
catch ( ... )
catch ( const Exiv2::Error &e )
{
CoreUtils::log( "Editing EXIF", QStringLiteral( "Failed to clear orientation EXIF metadata" ) );
CoreUtils::log( "Editing EXIF", QStringLiteral( "Failed to clear orientation: " ).arg( e.what() ) );
return false;
}
}
20 changes: 18 additions & 2 deletions app/test/testimageutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,29 @@ void TestImageUtils::testClearOrientationMetadata()
const QString testPhotoName = QStringLiteral( "photo.jpg" );
QFile::copy( TestUtils::testDataDir() + '/' + testPhotoName, dir.filePath( testPhotoName ) );

// Set XMP orientation so the XMP code path is checked as well
{
const std::unique_ptr setupImage( Exiv2::ImageFactory::open( dir.filePath( testPhotoName ).toStdString() ) );
setupImage->readMetadata();
Exiv2::XmpData &xmpSetup = setupImage->xmpData();
xmpSetup["Xmp.tiff.Orientation"] = uint16_t( 6 ); // 6 = 90° CW rotation
setupImage->setXmpData( xmpSetup );
setupImage->writeMetadata();
}

QVERIFY( ImageUtils::clearOrientationMetadata( dir.filePath( testPhotoName ) ) );

const std::unique_ptr image( Exiv2::ImageFactory::open( dir.filePath( testPhotoName ).toStdString() ) );
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();
QVERIFY( !exifData.empty() );

const auto iterator = exifData.findKey( Exiv2::ExifKey( "Exif.Image.Orientation" ) );
QVERIFY( iterator == exifData.end() );
const auto exifIterator = exifData.findKey( Exiv2::ExifKey( "Exif.Image.Orientation" ) );
QVERIFY( exifIterator != exifData.end() ); // key should be preserved, just reset to 1
QCOMPARE( QString::fromStdString( exifIterator->toString() ), QStringLiteral( "1" ) );

Exiv2::XmpData &xmpData = image->xmpData();
const auto xmpIterator = xmpData.findKey( Exiv2::XmpKey( "Xmp.tiff.Orientation" ) );
QVERIFY( xmpIterator != xmpData.end() ); // key should be preserved, just reset to 1
QCOMPARE( QString::fromStdString( xmpIterator->toString() ), QStringLiteral( "1" ) );
}
Loading