summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2022-05-12 19:04:12 +0900
committerMichele Calgaro <[email protected]>2022-05-12 22:57:36 +0900
commit79949811e08fc5c91e9e3e09e059351749364ab7 (patch)
tree2b325eb92789a940b3747c6b67a88648eae4f154
parentde8a8ab3e5e70b6cafc3d95bfec600c31f90d736 (diff)
downloadkoffice-79949811e08fc5c91e9e3e09e059351749364ab7.tar.gz
koffice-79949811e08fc5c91e9e3e09e059351749364ab7.zip
Fix FTBFS with clang. This resolves issue #25.
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r--chalk/plugins/filters/colorsfilters/colorsfilters.cpp4
-rw-r--r--chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp2
-rw-r--r--chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp2
-rw-r--r--chalk/plugins/filters/levelfilter/kis_level_filter.cpp2
-rw-r--r--filters/kspread/excel/sidewinder/cell.cpp2
-rw-r--r--filters/kword/rtf/import/rtfimport.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cpp b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
index 754bbc2c..332cb67f 100644
--- a/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
+++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
@@ -209,7 +209,7 @@ void KisAutoContrast::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFil
// adjust, but since it's partially selected we also only partially adjust
src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), adj, 1);
const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()};
- TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness};
+ TQ_UINT8 weights[2] = {(TQ_UINT8)(MAX_SELECTED - selectedness), selectedness};
src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData());
++iter;
pixelsProcessed++;
@@ -303,7 +303,7 @@ void KisDesaturateFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki
// adjust, but since it's partially selected we also only partially adjust
src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), m_adj, 1);
const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()};
- TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness};
+ TQ_UINT8 weights[2] = {(TQ_UINT8)(MAX_SELECTED - selectedness), selectedness};
src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData());
++iter;
pixelsProcessed++;
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
index cbca7a08..85b63ffb 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
@@ -240,7 +240,7 @@ void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP
// adjust, but since it's partially selected we also only partially adjust
src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), configBC->m_adjustment, 1);
const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()};
- TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness};
+ TQ_UINT8 weights[2] = {(TQ_UINT8)(MAX_SELECTED - selectedness), selectedness};
src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData());
++iter;
pixelsProcessed++;
diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
index d479b27d..ed2cf82a 100644
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
@@ -254,7 +254,7 @@ void KisPerChannelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki
// adjust, but since it's partially selected we also only partially adjust
src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), adj, 1);
const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()};
- TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness};
+ TQ_UINT8 weights[2] = {(TQ_UINT8)(MAX_SELECTED - selectedness), selectedness};
src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData());
++iter;
pixelsProcessed++;
diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cpp b/chalk/plugins/filters/levelfilter/kis_level_filter.cpp
index 84dbc035..3d27e6e6 100644
--- a/chalk/plugins/filters/levelfilter/kis_level_filter.cpp
+++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cpp
@@ -195,7 +195,7 @@ void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt
// adjust, but since it's partially selected we also only partially adjust
src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), configBC->m_adjustment, 1);
const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()};
- TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness};
+ TQ_UINT8 weights[2] = {(TQ_UINT8)(MAX_SELECTED - selectedness), selectedness};
src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData());
++iter;
pixelsProcessed++;
diff --git a/filters/kspread/excel/sidewinder/cell.cpp b/filters/kspread/excel/sidewinder/cell.cpp
index b9000ba3..408dae88 100644
--- a/filters/kspread/excel/sidewinder/cell.cpp
+++ b/filters/kspread/excel/sidewinder/cell.cpp
@@ -117,7 +117,7 @@ UString Cell::columnLabel( unsigned column )
CellPrivate::columnNames[c] = UString(UChar((char)'A'+c));
for(unsigned d = 0; d < 256-26; d++)
{
- char buf[3] = { 'A'+(d/26), 'A'+(d%26), 0};
+ char buf[3] = { (char)('A'+(d / 26)), (char)('A'+(d % 26)), 0};
CellPrivate::columnNames[d+26] = UString(buf);
}
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index 573498eb..37275173 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -1267,7 +1267,7 @@ void RTFImport::insertHexSymbol( RTFProperty * )
return;
}
- char tmpch[2] = {token.value, '\0'};
+ char tmpch[2] = {(char)(token.value), '\0'};
char *tk = token.text;
token.type = RTFTokenizer::PlainText;