1 From da6373a3e1ae9199ee50e326fe296c03b50625ae Mon Sep 17 00:00:00 2001
2 From: "P. Levine" <nsane457@gmail.com>
3 Date: Sat, 14 May 2016 18:57:24 +0200
4 Subject: Fix narrowing conversions from 'int' to 'const char' inside { }.
6 Please provide a proper git patch including author information next time ...
11 libk3b/projects/k3bcdrdaowriter.cpp | 2 +-
12 libk3b/tools/k3bwavefilewriter.cpp | 22 +++++++++++-----------
13 plugins/encoder/external/k3bexternalencoder.cpp | 22 +++++++++++-----------
14 3 files changed, 23 insertions(+), 23 deletions(-)
16 diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
17 index 4eebdf8..bca1407 100644
18 --- a/libk3b/projects/k3bcdrdaowriter.cpp
19 +++ b/libk3b/projects/k3bcdrdaowriter.cpp
20 @@ -908,7 +908,7 @@ void K3b::CdrdaoWriter::parseCdrdaoWrote( const QString& line )
22 void K3b::CdrdaoWriter::parseCdrdaoMessage()
24 - static const char msgSync[] = { 0xff, 0x00, 0xff, 0x00 };
25 + static const char msgSync[] = { (char)0xff, (char)0x00, (char)0xff, (char)0x00 };
26 unsigned int avail = m_comSock->bytesAvailable();
27 unsigned int msgs = avail / ( sizeof(msgSync)+d->progressMsgSize );
28 unsigned int count = 0;
29 diff --git a/libk3b/tools/k3bwavefilewriter.cpp b/libk3b/tools/k3bwavefilewriter.cpp
30 index c51781f..6772f6c 100644
31 --- a/libk3b/tools/k3bwavefilewriter.cpp
32 +++ b/libk3b/tools/k3bwavefilewriter.cpp
33 @@ -111,17 +111,17 @@ void K3b::WaveFileWriter::writeEmptyHeader()
35 static const char riffHeader[] =
37 - 0x52, 0x49, 0x46, 0x46, // 0 "RIFF"
38 - 0x00, 0x00, 0x00, 0x00, // 4 wavSize
39 - 0x57, 0x41, 0x56, 0x45, // 8 "WAVE"
40 - 0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
41 - 0x10, 0x00, 0x00, 0x00, // 16
42 - 0x01, 0x00, 0x02, 0x00, // 20
43 - 0x44, 0xac, 0x00, 0x00, // 24
44 - 0x10, 0xb1, 0x02, 0x00, // 28
45 - 0x04, 0x00, 0x10, 0x00, // 32
46 - 0x64, 0x61, 0x74, 0x61, // 36 "data"
47 - 0x00, 0x00, 0x00, 0x00 // 40 byteCount
48 + (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0 "RIFF"
49 + (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4 wavSize
50 + (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8 "WAVE"
51 + (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt "
52 + (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16
53 + (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20
54 + (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24
55 + (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28
56 + (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32
57 + (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data"
58 + (char)0x00, (char)0x00, (char)0x00, (char)0x00 // 40 byteCount
61 m_outputStream.writeRawData( riffHeader, 44 );
62 diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp
63 index 388d181..d365905 100644
64 --- a/plugins/encoder/external/k3bexternalencoder.cpp
65 +++ b/plugins/encoder/external/k3bexternalencoder.cpp
66 @@ -39,17 +39,17 @@ Q_DECLARE_METATYPE( QProcess::ExitStatus )
68 static const char s_riffHeader[] =
70 - 0x52, 0x49, 0x46, 0x46, // 0 "RIFF"
71 - 0x00, 0x00, 0x00, 0x00, // 4 wavSize
72 - 0x57, 0x41, 0x56, 0x45, // 8 "WAVE"
73 - 0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
74 - 0x10, 0x00, 0x00, 0x00, // 16
75 - 0x01, 0x00, 0x02, 0x00, // 20
76 - 0x44, 0xac, 0x00, 0x00, // 24
77 - 0x10, 0xb1, 0x02, 0x00, // 28
78 - 0x04, 0x00, 0x10, 0x00, // 32
79 - 0x64, 0x61, 0x74, 0x61, // 36 "data"
80 - 0x00, 0x00, 0x00, 0x00 // 40 byteCount
81 + (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0 "RIFF"
82 + (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4 wavSize
83 + (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8 "WAVE"
84 + (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt "
85 + (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16
86 + (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20
87 + (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24
88 + (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28
89 + (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32
90 + (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data"
91 + (char)0x00, (char)0x00, (char)0x00, (char)0x00 // 40 byteCount
98 From 88b3596675e06c04573b4c0a296d4eabcc94680f Mon Sep 17 00:00:00 2001
99 From: Leslie Zhai <xiangzhai83@gmail.com>
100 Date: Mon, 28 Nov 2016 12:28:15 +0800
101 Subject: Export K3b::BootItem compiled for clang++
106 libk3b/projects/datacd/k3bbootitem.h | 3 ++-
107 plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 6 +++---
108 4 files changed, 8 insertions(+), 4 deletions(-)
110 diff --git a/libk3b/projects/datacd/k3bbootitem.h b/libk3b/projects/datacd/k3bbootitem.h
111 index 305c8dd..7b9a7ed 100644
112 --- a/libk3b/projects/datacd/k3bbootitem.h
113 +++ b/libk3b/projects/datacd/k3bbootitem.h
115 #define _K3B_BOOT_ITEM_H_
117 #include "k3bfileitem.h"
118 +#include "k3b_export.h"
121 - class BootItem : public FileItem
122 + class LIBK3B_EXPORT BootItem : public FileItem
125 BootItem( const QString& fileName, DataDoc& doc, const QString& k3bName = 0 );
126 diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
127 index 25b2208..f1dfbf7 100644
128 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
129 +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
130 @@ -260,7 +260,7 @@ QString K3bFFMpegFile::title() const
131 AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
134 - if( ade->value != '\0' )
135 + if (strlen(ade->value))
136 return QString::fromLocal8Bit( ade->value );
139 @@ -273,7 +273,7 @@ QString K3bFFMpegFile::author() const
140 AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
143 - if( ade->value != '\0' )
144 + if (strlen(ade->value))
145 return QString::fromLocal8Bit( ade->value );
148 @@ -286,7 +286,7 @@ QString K3bFFMpegFile::comment() const
149 AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
152 - if( ade->value != '\0' )
153 + if (strlen(ade->value))
154 return QString::fromLocal8Bit( ade->value );