Commit e249bc3e authored by Wescoeur's avatar Wescoeur

fix(QExifImageHeader): use app indentation

parent 8d46bcb1
This diff is collapsed.
...@@ -51,19 +51,14 @@ ...@@ -51,19 +51,14 @@
#include <QSysInfo> #include <QSysInfo>
#include <QIODevice> #include <QIODevice>
typedef QPair< quint32, quint32 > QExifURational; typedef QPair<quint32, quint32> QExifURational;
typedef QPair< qint32, qint32 > QExifSRational; typedef QPair<qint32, qint32> QExifSRational;
//Q_DECLARE_METATYPE(QExifURational)
//Q_DECLARE_METATYPE(QExifSRational)
class QExifValuePrivate; class QExifValuePrivate;
class QExifValue class QExifValue {
{
public: public:
enum Type enum Type {
{
Byte = 1, Byte = 1,
Ascii = 2, Ascii = 2,
Short = 3, Short = 3,
...@@ -74,8 +69,7 @@ public: ...@@ -74,8 +69,7 @@ public:
SignedRational = 10 SignedRational = 10
}; };
enum TextEncoding enum TextEncoding {
{
NoEncoding, NoEncoding,
AsciiEncoding, AsciiEncoding,
JisEncoding, JisEncoding,
...@@ -83,66 +77,64 @@ public: ...@@ -83,66 +77,64 @@ public:
UndefinedEncoding UndefinedEncoding
}; };
QExifValue(); QExifValue ();
QExifValue( quint8 value ); QExifValue (quint8 value);
QExifValue( const QVector< quint8 > &value ); QExifValue (const QVector<quint8> &value);
QExifValue( const QString &value, TextEncoding encoding = NoEncoding ); QExifValue (const QString &value, TextEncoding encoding = NoEncoding);
QExifValue( quint16 value ); QExifValue (quint16 value);
QExifValue( const QVector< quint16 > &value ); QExifValue (const QVector<quint16> &value);
QExifValue( quint32 value ); QExifValue (quint32 value);
QExifValue( const QVector< quint32 > &value ); QExifValue (const QVector<quint32> &value);
QExifValue( const QExifURational &value ); QExifValue (const QExifURational &value);
QExifValue( const QVector< QExifURational > &value ); QExifValue (const QVector<QExifURational> &value);
QExifValue( const QByteArray &value ); QExifValue (const QByteArray &value);
QExifValue( qint32 value ); QExifValue (qint32 value);
QExifValue( const QVector< qint32 > &value ); QExifValue (const QVector<qint32> &value);
QExifValue( const QExifSRational &value ); QExifValue (const QExifSRational &value);
QExifValue( const QVector< QExifSRational > &value ); QExifValue (const QVector<QExifSRational> &value);
QExifValue( const QDateTime &value ); QExifValue (const QDateTime &value);
QExifValue( const QExifValue &other ); QExifValue (const QExifValue &other);
QExifValue &operator =( const QExifValue &other ); QExifValue &operator= (const QExifValue &other);
~QExifValue(); ~QExifValue ();
bool operator ==( const QExifValue &other ) const; bool operator== (const QExifValue &other) const;
bool isNull() const; bool isNull () const;
int type() const; int type () const;
int count() const; int count () const;
TextEncoding encoding() const; TextEncoding encoding () const;
quint8 toByte() const; quint8 toByte () const;
QVector< quint8 > toByteVector() const; QVector<quint8> toByteVector () const;
QString toString() const; QString toString () const;
quint16 toShort() const; quint16 toShort () const;
QVector< quint16 > toShortVector() const; QVector<quint16> toShortVector () const;
quint32 toLong() const; quint32 toLong () const;
QVector< quint32 > toLongVector() const; QVector<quint32> toLongVector () const;
QExifURational toRational() const; QExifURational toRational () const;
QVector< QExifURational > toRationalVector() const; QVector<QExifURational> toRationalVector () const;
QByteArray toByteArray() const; QByteArray toByteArray () const;
qint32 toSignedLong() const; qint32 toSignedLong () const;
QVector< qint32 > toSignedLongVector() const; QVector<qint32> toSignedLongVector () const;
QExifSRational toSignedRational() const; QExifSRational toSignedRational () const;
QVector< QExifSRational > toSignedRationalVector() const; QVector<QExifSRational> toSignedRationalVector () const;
QDateTime toDateTime() const; QDateTime toDateTime () const;
private: private:
QExplicitlySharedDataPointer< QExifValuePrivate > d; QExplicitlySharedDataPointer<QExifValuePrivate> d;
}; };
struct ExifIfdHeader; struct ExifIfdHeader;
class QExifImageHeaderPrivate; class QExifImageHeaderPrivate;
class QExifImageHeader class QExifImageHeader {
{
Q_DISABLE_COPY(QExifImageHeader) Q_DISABLE_COPY(QExifImageHeader)
public:
enum ImageTag
{
public:
enum ImageTag {
ImageWidth = 0x0100, ImageWidth = 0x0100,
ImageLength = 0x0101, ImageLength = 0x0101,
BitsPerSample = 0x0102, BitsPerSample = 0x0102,
...@@ -172,8 +164,7 @@ public: ...@@ -172,8 +164,7 @@ public:
Copyright = 0x8298 Copyright = 0x8298
}; };
enum ExifExtendedTag enum ExifExtendedTag {
{
ExifVersion = 0x9000, ExifVersion = 0x9000,
FlashPixVersion = 0xA000, FlashPixVersion = 0xA000,
ColorSpace = 0xA001, ColorSpace = 0xA001,
...@@ -190,7 +181,6 @@ public: ...@@ -190,7 +181,6 @@ public:
SubSecTimeOriginal = 0x9291, SubSecTimeOriginal = 0x9291,
SubSecTimeDigitized = 0x9292, SubSecTimeDigitized = 0x9292,
ImageUniqueId = 0xA420, ImageUniqueId = 0xA420,
ExposureTime = 0x829A, ExposureTime = 0x829A,
FNumber = 0x829D, FNumber = 0x829D,
ExposureProgram = 0x8822, ExposureProgram = 0x8822,
...@@ -233,8 +223,7 @@ public: ...@@ -233,8 +223,7 @@ public:
SubjectDistanceRange = 0x40C SubjectDistanceRange = 0x40C
}; };
enum GpsTag enum GpsTag {
{
GpsVersionId = 0x0000, GpsVersionId = 0x0000,
GpsLatitudeRef = 0x0001, GpsLatitudeRef = 0x0001,
GpsLatitude = 0x0002, GpsLatitude = 0x0002,
...@@ -268,50 +257,49 @@ public: ...@@ -268,50 +257,49 @@ public:
GpsDifferential = 0x001E GpsDifferential = 0x001E
}; };
QExifImageHeader(); QExifImageHeader ();
explicit QExifImageHeader(const QString &fileName); explicit QExifImageHeader (const QString &fileName);
~QExifImageHeader(); ~QExifImageHeader ();
bool loadFromJpeg(const QString &fileName); bool loadFromJpeg (const QString &fileName);
bool loadFromJpeg(QIODevice *device); bool loadFromJpeg (QIODevice *device);
bool saveToJpeg(const QString &fileName) const; bool saveToJpeg (const QString &fileName) const;
bool saveToJpeg(QIODevice *device) const; bool saveToJpeg (QIODevice *device) const;
bool read(QIODevice *device); bool read (QIODevice *device);
qint64 write(QIODevice *device) const; qint64 write (QIODevice *device) const;
qint64 size() const; qint64 size () const;
QSysInfo::Endian byteOrder() const; QSysInfo::Endian byteOrder () const;
void clear(); void clear ();
QList<ImageTag> imageTags() const; QList<ImageTag> imageTags () const;
QList<ExifExtendedTag> extendedTags() const; QList<ExifExtendedTag> extendedTags () const;
QList<GpsTag> gpsTags() const; QList<GpsTag> gpsTags () const;
bool contains(ImageTag tag) const; bool contains (ImageTag tag) const;
bool contains(ExifExtendedTag tag) const; bool contains (ExifExtendedTag tag) const;
bool contains(GpsTag tag) const; bool contains (GpsTag tag) const;
void remove(ImageTag tag); void remove (ImageTag tag);
void remove(ExifExtendedTag tag); void remove (ExifExtendedTag tag);
void remove(GpsTag tag); void remove (GpsTag tag);
QExifValue value(ImageTag tag) const; QExifValue value (ImageTag tag) const;
QExifValue value(ExifExtendedTag tag) const; QExifValue value (ExifExtendedTag tag) const;
QExifValue value(GpsTag tag) const; QExifValue value (GpsTag tag) const;
void setValue(ImageTag tag, const QExifValue &value); void setValue (ImageTag tag, const QExifValue &value);
void setValue(ExifExtendedTag tag, const QExifValue &value); void setValue (ExifExtendedTag tag, const QExifValue &value);
void setValue(GpsTag tag, const QExifValue &value); void setValue (GpsTag tag, const QExifValue &value);
QImage thumbnail() const; QImage thumbnail () const;
void setThumbnail( const QImage &thumbnail ); void setThumbnail (const QImage &thumbnail);
private: private:
enum PrivateTag enum PrivateTag {
{
ExifIfdPointer = 0x8769, ExifIfdPointer = 0x8769,
GpsInfoIfdPointer = 0x8825, GpsInfoIfdPointer = 0x8825,
InteroperabilityIfdPointer = 0xA005, InteroperabilityIfdPointer = 0xA005,
...@@ -319,30 +307,30 @@ private: ...@@ -319,30 +307,30 @@ private:
JpegInterchangeFormatLength = 0x0202 JpegInterchangeFormatLength = 0x0202
}; };
QByteArray extractExif( QIODevice *device ) const; QByteArray extractExif (QIODevice *device) const;
QList< ExifIfdHeader > readIfdHeaders( QDataStream &stream ) const; QList<ExifIfdHeader> readIfdHeaders (QDataStream &stream) const;
QExifValue readIfdValue(QDataStream &stream, int startPos, const ExifIfdHeader &header) const; QExifValue readIfdValue (QDataStream &stream, int startPos, const ExifIfdHeader &header) const;
template <typename T> QMap<T, QExifValue> readIfdValues( template<typename T>
QDataStream &stream, int startPos, const QList<ExifIfdHeader> &headers) const; QMap<T, QExifValue> readIfdValues (QDataStream &stream, int startPos, const QList<ExifIfdHeader> &headers) const;
template <typename T> QMap<T, QExifValue> readIfdValues( template<typename T>
QDataStream &stream, int startPos, const QExifValue &pointer) const; QMap<T, QExifValue> readIfdValues (QDataStream &stream, int startPos, const QExifValue &pointer) const;
quint32 writeExifHeader(QDataStream &stream, quint16 tag, const QExifValue &value, quint32 offset) const; quint32 writeExifHeader (QDataStream &stream, quint16 tag, const QExifValue &value, quint32 offset) const;
void writeExifValue(QDataStream &stream, const QExifValue &value) const; void writeExifValue (QDataStream &stream, const QExifValue &value) const;
template <typename T> quint32 writeExifHeaders( template<typename T>
QDataStream &stream, const QMap<T, QExifValue > &values, quint32 offset) const; quint32 writeExifHeaders (QDataStream &stream, const QMap<T, QExifValue> &values, quint32 offset) const;
template <typename T> void writeExifValues( template<typename T>
QDataStream &target, const QMap<T, QExifValue> &values) const; void writeExifValues (QDataStream &target, const QMap<T, QExifValue> &values) const;
quint32 sizeOf(const QExifValue &value) const; quint32 sizeOf (const QExifValue &value) const;
template <typename T> quint32 calculateSize( template<typename T>
const QMap<T, QExifValue> &values) const; quint32 calculateSize (const QMap<T, QExifValue> &values) const;
QExifImageHeaderPrivate *d; QExifImageHeaderPrivate *d;
}; };
#endif #endif // ifndef QEXIFIMAGEHEADER_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment