Git commit 88b3596675e06c04573b4c0a296d4eabcc94680f by Leslie Zhai. Committed on 28/11/2016 at 04:28. Pushed by lesliezhai into branch 'cdrskin'. Export K3b::BootItem compiled for clang++ M +1 -0 CMakeLists.txt M +2 -0 INSTALL.txt M +2 -1 libk3b/projects/datacd/k3bbootitem.h M +3 -3 plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp https://commits.kde.org/k3b/88b3596675e06c04573b4c0a296d4eabcc94680f diff --git a/CMakeLists.txt b/CMakeLists.txt index ec6ec89..986a6d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,7 @@ include(KDECMakeSettings) include(FeatureSummary) include(GenerateExportHeader) include(ECMInstallIcons) +include(ECMEnableSanitizers) = find_package(Qt5 REQUIRED COMPONENTS Core DBus Gui WebKitWidgets) find_package(KF5 REQUIRED COMPONENTS Archive Config CoreAddons DocTools Fi= leMetaData I18n IconThemes JobWidgets diff --git a/INSTALL.txt b/INSTALL.txt index 880b02b..2a7d84b 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -37,6 +37,8 @@ After that it's all the same: For debug: = scan-build -k -v -V cmake .. -DCMAKE_INSTALL_PREFIX=3D/usr \ + -DCMAKE_CXX_COMPILER=3Dclang++ \ + -DECM_ENABLE_SANITIZERS=3D'address;leak;undefined' \ -DKDE_INSTALL_LIBDIR=3Dlib \ -DKDE_INSTALL_LIBEXECDIR=3Dlib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=3DON \ diff --git a/libk3b/projects/datacd/k3bbootitem.h b/libk3b/projects/datacd/= k3bbootitem.h index 305c8dd..7b9a7ed 100644 --- a/libk3b/projects/datacd/k3bbootitem.h +++ b/libk3b/projects/datacd/k3bbootitem.h @@ -16,9 +16,10 @@ #define _K3B_BOOT_ITEM_H_ = #include "k3bfileitem.h" +#include "k3b_export.h" = namespace K3b { - class BootItem : public FileItem + class LIBK3B_EXPORT BootItem : public FileItem { public: BootItem( const QString& fileName, DataDoc& doc, const QString& k3= bName =3D 0 ); diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/= ffmpeg/k3bffmpegwrapper.cpp index 25b2208..f1dfbf7 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp @@ -260,7 +260,7 @@ QString K3bFFMpegFile::title() const AVDictionaryEntry *ade =3D av_dict_get( d->formatContext->metadata, "T= ITLE", NULL, 0 ); if( ade =3D=3D NULL ) return QString(); - if( ade->value !=3D '\0' ) + if (strlen(ade->value)) return QString::fromLocal8Bit( ade->value ); else return QString(); @@ -273,7 +273,7 @@ QString K3bFFMpegFile::author() const AVDictionaryEntry *ade =3D av_dict_get( d->formatContext->metadata, "A= RTIST", NULL, 0 ); if( ade =3D=3D NULL ) return QString(); - if( ade->value !=3D '\0' ) + if (strlen(ade->value)) return QString::fromLocal8Bit( ade->value ); else return QString(); @@ -286,7 +286,7 @@ QString K3bFFMpegFile::comment() const AVDictionaryEntry *ade =3D av_dict_get( d->formatContext->metadata, "C= OMMENT", NULL, 0 ); if( ade =3D=3D NULL ) return QString(); - if( ade->value !=3D '\0' ) + if (strlen(ade->value)) return QString::fromLocal8Bit( ade->value ); else return QString();