Attachment 895027 Details for Bug 1097109 – taglib fix

[patch] taglib fix

taglib-BEfix.patch (text/plain), 1.52 KB, created by Jakub Čajka on 2014-05-13 07:35:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Čajka

Created: 2014-05-13 07:35:47 UTC

Size: 1.52 KB

patch

obsolete

>diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
>index 603455a..20e4d62 100644
>--- a/taglib/toolkit/tstring.cpp
>+++ b/taglib/toolkit/tstring.cpp
>@@ -844,7 +844,11 @@ void String::copyFromUTF16(const char *s, size_t length, Type t)
> 
>   d->data.resize(length / 2);
>   for(size_t i = 0; i < length / 2; ++i) {
>-    d->data[i] = swap ? combine(*s, *(s + 1)) : combine(*(s + 1), *s);
>+    #if SYSTEM_BYTEORDER == 2 // big endian
>+        d->data[i] = swap ? combine(*(s+1), *(s)) : combine(*(s), *(s+1));
>+    #else // little endian
>+        d->data[i] = swap ? combine(*(s), *(s+1)) : combine(*(s+1), *(s));
>+    #endif
>     s += 2;
>   }
> }
>diff --git a/tests/test_flac.cpp b/tests/test_flac.cpp
>index caec715..364fb11 100644
>--- a/tests/test_flac.cpp
>+++ b/tests/test_flac.cpp
>@@ -91,6 +91,7 @@ public:
>     newpic->setData("JPEG data");
>     f->addPicture(newpic);
>     f->save();
>+    delete f;
> 
>     f = new FLAC::File(newname.c_str());
>     lst = f->pictureList();
>@@ -138,6 +139,7 @@ public:
>     f->removePictures();
>     f->addPicture(newpic);
>     f->save();
>+    delete f;
> 
>     f = new FLAC::File(newname.c_str());
>     lst = f->pictureList();
>@@ -165,6 +167,7 @@ public:
> 
>     f->removePictures();
>     f->save();
>+    delete f;
> 
>     f = new FLAC::File(newname.c_str());
>     lst = f->pictureList();
>@@ -185,6 +188,7 @@ public:
>     tag->setTitle("NEW TITLE 2");
>     f->save();
>     CPPUNIT_ASSERT_EQUAL(String("NEW TITLE 2"), tag->title());
>+    delete f;
> 
>     f = new FLAC::File(newname.c_str());
>     tag = f->tag();

Actions: View | Diff

Attachments on bug 1097109: 895027