Differential D15085 Diff 41996 libs/image/kis_pixel_selection.cpp

Changeset View

Standalone View

View Options

libs/image/kis_pixel_selection.cpp

Context not available.
150 case SELECTION_INTERSECT: 150​ case SELECTION_INTERSECT:
151 intersectSelection(selection); 151​ intersectSelection(selection);
152 break; 152​ break;
153​ case SELECTION_SYMMETRICDIFFERENCE:
154​ symmetricdifferenceSelection(selection);
155​ break;
153 default: 156​ default:
154 break; 157​ break;
155 } 158​ }
Context not available.
255 m_d->invalidateThumbnailImage(); 258​ m_d->invalidateThumbnailImage();
256} 259​}
257 260​
261​void KisPixelSelection::symmetricdifferenceSelection(KisPixelSelectionSP selection)
262​{
263​ QRect r = selection->selectedRect().united(selectedRect());
264​ if (r.isEmpty()) return;
265​
266​ KisHLineIteratorSP dst = createHLineIteratorNG(r.x(), r.y(), r.width());
267​ KisHLineConstIteratorSP src = selection->createHLineConstIteratorNG(r.x(), r.y(), r.width());
268​ for (int i = 0; i < r.height(); ++i) {
269​ do {if (*dst->rawData() - *src->oldRawData() > MIN_SELECTED)
dkazakovUnsubmitted
Done

This check is incorrect because both values are quint8, which is unsigned it, therefore the condition is always true, unless *dst... == *src...

dkazakov: This check is incorrect because both values are quint8, which is unsigned it, therefore the…
270​ *dst->rawData() = *dst->rawData() - *src->oldRawData();
271​ else
272​ *dst->rawData() = *src->oldRawData() - *dst->rawData();
273​ } while (src->nextPixel() && dst->nextPixel());
274​ dst->nextRow();
275​ src->nextRow();
276​ }
277​
278​ m_d->outlineCacheValid &= selection->outlineCacheValid();
279​
280​ m_d->outlineCacheValid -= selection->outlineCacheValid();
ReptorianAuthorUnsubmitted
Done

It seems that no matter the operator used here, the ants just doesn't show up in some area, or the ants just doesn't show up at all.

Reptorian: It seems that no matter the operator used here, the ants just doesn't show up in some area, or…
dkazakovUnsubmitted
Done

This line looks weird. Did you mean m_d->outlineCache?

dkazakov: This line looks weird. Did you mean m_d->outlineCache?
281​
282​ if (m_d->outlineCacheValid) {
283​ m_d->outlineCache += selection->outlineCache();
284​ }
285​
286​ m_d->invalidateThumbnailImage();
287​}
288​
258void KisPixelSelection::clear(const QRect & r) 289​void KisPixelSelection::clear(const QRect & r)
259{ 290​{
260 if (*defaultPixel().data() != MIN_SELECTED) { 291​ if (*defaultPixel().data() != MIN_SELECTED) {
Context not available.
langkampUnsubmitted
Done

This should use &=. Otherwise it will alwas run regenerate the outline cache.

langkamp: This should use &=. Otherwise it will alwas run regenerate the outline cache.
langkampUnsubmitted
Done

This should be the same as for the vector selection so m_d->outlineCache = (m_d->outlineCache | selection->outlineCache()) - (m_d->outlineCache & selection->outlineCache());

langkamp: This should be the same as for the vector selection so m_d->outlineCache = (m_d->outlineCache |…