← Back to branch summary

~ubuntu-branches/ubuntu/edgy/digikam/edgy-proposed

« back to all changes in this revision

Viewing changes to digikam/libs/jpegutils/jpegmetadata.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Achim Bohnet
  • Date: 2006-05-15 01:15:02 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20060515011502-kpyuz7766hpbuia8
Tags: 0.8.2~rc1-0ubuntu1
* sync with debian (UVF see #44102)
  0.8.2~rc1-0ubuntu1 is identical to debian's 0.8.1+0.8.2-rc1-1.
  Version was changed due to latest 0.8.1.ubuntu-0ubuntu1 upload.
  This version is unfortunately bigger than debian's 0.8.1+0.8.2-rc1-1
* Merge in ubuntu changelog

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/libs/jpegutils/jpegmetadata.cpp
118
118
                continue;
119
119
            }
120
120
 
121
 
            comments = QString::fromAscii((const char*)marker->data,
 
121
            comments = QString::fromUtf8((const char*)marker->data,
122
122
                                          marker->data_length);
123
123
        }
124
124
        else if (marker->marker == M_EXIF)