1270,7 → 1270,7 |
} |
|
QPixmap * getFancyPixmap(ScColor col) { |
static QMap<Q_UINT64, QPixmap*> pxCache; |
//static QMap<Q_UINT64, QPixmap*> pxCache; |
|
static QPixmap alertIcon; |
static QPixmap cmykIcon; |
1288,11 → 1288,12 |
iconsInitialized = true; |
} |
|
Q_UINT64 res=code64(col); |
if (pxCache.contains(res)) |
return pxCache[res]; |
QPixmap * pa = getSmallPixmap(col.getRawRGBColor()); |
/* CB disabled due to ugly memory leak here |
QPixmap * pa = pxCache[code64(col)]; |
if (!pa) { |
pa = new QPixmap(60, 15); |
|
QPixmap *pa=new QPixmap(60, 15); |
QPixmap *pm=getSmallPixmap(col.getRawRGBColor()); |
pa->fill(Qt::white); |
paintAlert(*pm, *pa, 0, 0); |
1307,8 → 1308,9 |
paintAlert(spotIcon, *pa, 46, 2); |
if (col.isRegistrationColor()) |
paintAlert(regIcon, *pa, 45, 0); |
pxCache.insert(res, pa); |
|
pxCache[code64(col)] = pa; |
} |
*/ |
return pa; |
} |
|