Diffstat (limited to 'libopie2/opiemm/opieexif.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiemm/opieexif.cpp | 54 |
1 files changed, 5 insertions, 49 deletions
diff --git a/libopie2/opiemm/opieexif.cpp b/libopie2/opiemm/opieexif.cpp index 0860ea8..de49937 100644 --- a/libopie2/opiemm/opieexif.cpp +++ b/libopie2/opiemm/opieexif.cpp @@ -279,3 +279,2 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode) - //-------------------------------------------------------------------------- @@ -1011,4 +1010,3 @@ static QImage rotate_270( const QImage& img ) { - -static QString color_mode_to_string( bool b ) { +QString ExifData::color_mode_to_string( bool b ) { return b ? QObject::tr( "Colormode: Color\n" ) : QObject::tr( "Colormode: Black and white\n" ); @@ -1016,3 +1014,3 @@ static QString color_mode_to_string( bool b ) { -static QString compression_to_string( int level ) { +QString ExifData::compression_to_string( int level ) { QString str; @@ -1035,45 +1033,3 @@ static QString compression_to_string( int level ) { - -static QDateTime parseDateTime( const QString& string ) -{ - QDateTime dt; - if ( string.length() != 19 ) - return dt; - - QString year = string.left( 4 ); - QString month = string.mid( 5, 2 ); - QString day = string.mid( 8, 2 ); - QString hour = string.mid( 11, 2 ); - QString minute = string.mid( 14, 2 ); - QString seconds = string.mid( 18, 2 ); - - bool ok; - bool allOk = true; - int y = year.toInt( &ok ); - allOk &= ok; - - int mo = month.toInt( &ok ); - allOk &= ok; - - int d = day.toInt( &ok ); - allOk &= ok; - - int h = hour.toInt( &ok ); - allOk &= ok; - - int mi = minute.toInt( &ok ); - allOk &= ok; - - int s = seconds.toInt( &ok ); - allOk &= ok; - - if ( allOk ) { - dt.setDate( QDate( y, mo, d ) ); - dt.setTime( QTime( h, mi, s ) ); - } - - return dt; -} - -static QString white_balance_string( int i ) { +QString ExifData::white_balance_string( int i ) { QString balance; @@ -1121,3 +1077,3 @@ static QString white_balance_string( int i ) { -static QString metering_mode( int i) { +QString ExifData::metering_mode( int i) { QString meter; @@ -1156,3 +1112,3 @@ static QString metering_mode( int i) { -static QString exposure_program( int i ) { +QString ExifData::exposure_program( int i ) { QString exp; |