From c5cad52b3f67c029bfbde954998c78b4ba79e364 Mon Sep 17 00:00:00 2001 From: Marko Mattila Date: Wed, 20 Nov 2013 09:54:41 +0200 Subject: [PATCH] Review fixes --- lib/imageoperation.cpp | 36 ++++++++++++++++++------------------ lib/imageoperation.h | 2 +- tests/ut_imageoperation.cpp | 20 ++++++++++---------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lib/imageoperation.cpp b/lib/imageoperation.cpp index 8c92f27..3f28e4b 100644 --- a/lib/imageoperation.cpp +++ b/lib/imageoperation.cpp @@ -186,7 +186,7 @@ QString ImageOperation::scaleImage(const QString &sourceFile, qreal scaleFactor, // performance bottlenecks here. QImageReader ir(sourceFile); if (!ir.canRead()) { - qWarning() << Q_FUNC_INFO << "Couldn't' source image!"; + qWarning() << Q_FUNC_INFO << "Couldn't read source image!"; return QString(); } @@ -197,10 +197,10 @@ QString ImageOperation::scaleImage(const QString &sourceFile, qreal scaleFactor, int angle; bool mirrored; - imageOrientation(sourceFile, angle, &mirrored); + imageOrientation(sourceFile, &angle, &mirrored); if (mirrored) { - image.mirrored(true, false); + image = image.mirrored(true, false); } if (angle != 0) { @@ -297,10 +297,10 @@ QString ImageOperation::scaleImageToSize(const QString &sourceFile, quint64 targ // Make sure orientation is right. int angle; bool mirrored; - imageOrientation(sourceFile, angle, &mirrored); + imageOrientation(sourceFile, &angle, &mirrored); if (mirrored) { - image.mirrored(true, false); + image = image.mirrored(true, false); } if (angle != 0) { @@ -319,32 +319,32 @@ QString ImageOperation::scaleImageToSize(const QString &sourceFile, quint64 targ return tmpFile; } -void ImageOperation::imageOrientation(const QString &sourceFile, int &angle, bool *mirror) +void ImageOperation::imageOrientation(const QString &sourceFile, int *angle, bool *mirror) { if(!QuillMetadata::canRead(sourceFile)) { qWarning() << Q_FUNC_INFO << "Can't read metadata"; - angle = 0; - mirror = false; + *angle = 0; + *mirror = false; return; } QuillMetadata md(sourceFile); if (!md.hasExif()) { qWarning() << "Metadata invalid"; - angle = 0; - mirror = false; + *angle = 0; + *mirror = false; return; } int exifOrientation = md.entry(QuillMetadata::Tag_Orientation).toInt(); switch (exifOrientation) { - case 1: angle = 0 ; *mirror = false; break; - case 2: angle = 0 ; *mirror = true ; break; - case 3: angle = 180; *mirror = false; break; - case 4: angle = 180; *mirror = true ; break; - case 5: angle = 90 ; *mirror = true ; break; - case 6: angle = 90 ; *mirror = false; break; - case 7: angle = 270; *mirror = true ; break; - case 8: angle = 270; *mirror = false; break; + case 1: *angle = 0 ; *mirror = false; break; + case 2: *angle = 0 ; *mirror = true ; break; + case 3: *angle = 180; *mirror = false; break; + case 4: *angle = 180; *mirror = true ; break; + case 5: *angle = 90 ; *mirror = true ; break; + case 6: *angle = 90 ; *mirror = false; break; + case 7: *angle = 270; *mirror = true ; break; + case 8: *angle = 270; *mirror = false; break; default: break; } } diff --git a/lib/imageoperation.h b/lib/imageoperation.h index c2f770b..b65680c 100644 --- a/lib/imageoperation.h +++ b/lib/imageoperation.h @@ -37,7 +37,7 @@ class ImageOperation static QString removeImageMetadata(const QString &sourceFile); static QString scaleImage(const QString &sourceFile, qreal scaleFactor, const QString &targetFile=QString()); static QString scaleImageToSize(const QString &sourceFile, quint64 targetSize, const QString &targetFile=QString()); - static void imageOrientation(const QString &sourceFile, int &angle, bool *mirror); + static void imageOrientation(const QString &sourceFile, int *angle, bool *mirror); }; #endif // IMAGEOPERATION_H diff --git a/tests/ut_imageoperation.cpp b/tests/ut_imageoperation.cpp index 2580a51..91b8875 100644 --- a/tests/ut_imageoperation.cpp +++ b/tests/ut_imageoperation.cpp @@ -116,7 +116,7 @@ void ut_imageoperation::testScale() int angle; bool mirror; - ImageOperation::imageOrientation(filePath, angle, &mirror); + ImageOperation::imageOrientation(filePath, &angle, &mirror); QCOMPARE(angle, 90); QCOMPARE(mirror, false); @@ -157,7 +157,7 @@ void ut_imageoperation::testScaleToSize() int angle; bool mirror; - ImageOperation::imageOrientation(filePath, angle, &mirror); + ImageOperation::imageOrientation(filePath, &angle, &mirror); QCOMPARE(angle, 90); QCOMPARE(mirror, false); @@ -245,35 +245,35 @@ void ut_imageoperation::testOrientation() { int angle; bool mirrored; - ImageOperation::imageOrientation("images/testimage-0.jpg", angle, &mirrored); + ImageOperation::imageOrientation("images/testimage-0.jpg", &angle, &mirrored); QCOMPARE(angle, 0); QCOMPARE(mirrored, false); - ImageOperation::imageOrientation("images/testimage-0-mirrored.jpg", angle, &mirrored); + ImageOperation::imageOrientation("images/testimage-0-mirrored.jpg", &angle, &mirrored); QCOMPARE(angle, 0); QCOMPARE(mirrored, true); - ImageOperation::imageOrientation("images/testimage-90.jpg", angle, &mirrored); + ImageOperation::imageOrientation("images/testimage-90.jpg", &angle, &mirrored); QCOMPARE(angle, 90); QCOMPARE(mirrored, false); - ImageOperation::imageOrientation("images/testimage-90-mirrored.jpg", angle, &mirrored); + ImageOperation::imageOrientation("images/testimage-90-mirrored.jpg", &angle, &mirrored); QCOMPARE(angle, 90); QCOMPARE(mirrored, true); - ImageOperation::imageOrientation("images/testimage-180.jpg", angle, &mirrored); + ImageOperation::imageOrientation("images/testimage-180.jpg", &angle, &mirrored); QCOMPARE(angle, 180); QCOMPARE(mirrored, false); - ImageOperation::imageOrientation("images/testimage-180-mirrored.jpg", angle, &mirrored); + ImageOperation::imageOrientation("images/testimage-180-mirrored.jpg", &angle, &mirrored); QCOMPARE(angle, 180); QCOMPARE(mirrored, true); - ImageOperation::imageOrientation("images/testimage-270.jpg", angle, &mirrored); + ImageOperation::imageOrientation("images/testimage-270.jpg", &angle, &mirrored); QCOMPARE(angle, 270); QCOMPARE(mirrored, false); - ImageOperation::imageOrientation("images/testimage-270-mirrored.jpg", angle, &mirrored); + ImageOperation::imageOrientation("images/testimage-270-mirrored.jpg", &angle, &mirrored); QCOMPARE(angle, 270); QCOMPARE(mirrored, true); }