Differential D15085 Diff 42751 libs/image/kis_pixel_selection.cpp

Changeset View

Standalone View

View Options

libs/image/kis_pixel_selection.cpp

Context not available.
162 case SELECTION_INTERSECT: 162​ case SELECTION_INTERSECT:
163 intersectSelection(selection); 163​ intersectSelection(selection);
164 break; 164​ break;
165​ case SELECTION_SYMMETRICDIFFERENCE:
166​ symmetricdifferenceSelection(selection);
167​ break;
165 default: 168​ default:
166 break; 169​ break;
167 } 170​ }
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…
Context not available.
267 m_d->invalidateThumbnailImage(); 270​ m_d->invalidateThumbnailImage();
268} 271​}
269 272​
273​void KisPixelSelection::symmetricdifferenceSelection(KisPixelSelectionSP selection)
274​{
275​ QRect r = selection->selectedRect().united(selectedRect());
276​ if (r.isEmpty()) return;
277​
278​ KisHLineIteratorSP dst = createHLineIteratorNG(r.x(), r.y(), r.width());
279​ KisHLineConstIteratorSP src = selection->createHLineConstIteratorNG(r.x(), r.y(), r.width());
280​ for (int i = 0; i < r.height(); ++i) {
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​ do {*dst->rawData() = abs(*dst->rawData() - *src->oldRawData());
282​ } while (src->nextPixel() && dst->nextPixel());
283​ dst->nextRow();
284​ src->nextRow();
285​ }
286​
287​ m_d->outlineCacheValid &= selection->outlineCacheValid();
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.
288​ m_d->outlineCacheValid -= selection->outlineCacheValid();
289​
290​ if (m_d->outlineCacheValid) {
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 |…
291​ m_d->outlineCache += selection->outlineCache();
292​ }
293​
294​ m_d->invalidateThumbnailImage();
295​}
296​
270void KisPixelSelection::clear(const QRect & r) 297​void KisPixelSelection::clear(const QRect & r)
271{ 298​{
272 if (*defaultPixel().data() != MIN_SELECTED) { 299​ if (*defaultPixel().data() != MIN_SELECTED) {
Context not available.