Fix FTBFS with clang. This resolves issue #25.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 79949811e0)
r14.0.x
Michele Calgaro 3 years ago
parent cd328d43f4
commit df76f6b671
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -209,7 +209,7 @@ void KisAutoContrast::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFil
// adjust, but since it's partially selected we also only partially adjust // adjust, but since it's partially selected we also only partially adjust
src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), adj, 1); src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), adj, 1);
const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; 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()); src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData());
++iter; ++iter;
pixelsProcessed++; 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 // adjust, but since it's partially selected we also only partially adjust
src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), m_adj, 1); src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), m_adj, 1);
const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; 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()); src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData());
++iter; ++iter;
pixelsProcessed++; pixelsProcessed++;

@ -240,7 +240,7 @@ void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP
// adjust, but since it's partially selected we also only partially adjust // adjust, but since it's partially selected we also only partially adjust
src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), configBC->m_adjustment, 1); src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), configBC->m_adjustment, 1);
const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; 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()); src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData());
++iter; ++iter;
pixelsProcessed++; pixelsProcessed++;

@ -254,7 +254,7 @@ void KisPerChannelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki
// adjust, but since it's partially selected we also only partially adjust // adjust, but since it's partially selected we also only partially adjust
src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), adj, 1); src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), adj, 1);
const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; 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()); src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData());
++iter; ++iter;
pixelsProcessed++; pixelsProcessed++;

@ -195,7 +195,7 @@ void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt
// adjust, but since it's partially selected we also only partially adjust // adjust, but since it's partially selected we also only partially adjust
src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), configBC->m_adjustment, 1); src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), configBC->m_adjustment, 1);
const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; 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()); src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData());
++iter; ++iter;
pixelsProcessed++; pixelsProcessed++;

@ -117,7 +117,7 @@ UString Cell::columnLabel( unsigned column )
CellPrivate::columnNames[c] = UString(UChar((char)'A'+c)); CellPrivate::columnNames[c] = UString(UChar((char)'A'+c));
for(unsigned d = 0; d < 256-26; d++) 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); CellPrivate::columnNames[d+26] = UString(buf);
} }

@ -1267,7 +1267,7 @@ void RTFImport::insertHexSymbol( RTFProperty * )
return; return;
} }
char tmpch[2] = {token.value, '\0'}; char tmpch[2] = {(char)(token.value), '\0'};
char *tk = token.text; char *tk = token.text;
token.type = RTFTokenizer::PlainText; token.type = RTFTokenizer::PlainText;

Loading…
Cancel
Save