![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 1fc20768463a433697bed663889fdcc3cbc544c7..2a18b3e3392f5d6874189f5d390447e00835d5b4 100644 (file)
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
rc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack());
}
-static void
+inline static void
merge_pixel_with_background (unsigned char *orig, unsigned char *bg,
unsigned char *base)
{
+ int precalc_bg_alpha = (255 * (255 - bg[3])) / 255;
+
for (int i = 0; i < 3; i++) {
- base[i] = (255 * (255 - bg[3])) / 255 + (bg[i] * bg[3]) / 255;
+ base[i] = precalc_bg_alpha + (bg[i] * bg[3]) / 255;
base[i] = (base[i] * (255 - orig[3])) / 255 + (orig[i] * orig[3]) / 255;
}
- base[3] = 255;
}
inline unsigned char * get_pixel(guchar *px, int x, int y, int width) {
return glist;
}
-static bool compare_pixels(unsigned char *check, unsigned char *orig, unsigned char *dtc, int threshold, PaintBucketChannels method) {
+static bool compare_pixels(unsigned char *check, unsigned char *orig, unsigned char *merged_orig_pixel, unsigned char *dtc, int threshold, PaintBucketChannels method) {
int diff = 0;
float hsl_check[3], hsl_orig[3];
@@ -285,14 +286,12 @@ static bool compare_pixels(unsigned char *check, unsigned char *orig, unsigned c
case FLOOD_CHANNELS_B:
return ((int)abs(check[2] - orig[2]) <= threshold);
case FLOOD_CHANNELS_RGB:
- unsigned char merged_orig[4];
- unsigned char merged_check[4];
+ unsigned char merged_check[3];
- merge_pixel_with_background(orig, dtc, merged_orig);
merge_pixel_with_background(check, dtc, merged_check);
for (int i = 0; i < 3; i++) {
- diff += (int)abs(merged_check[i] - merged_orig[i]);
+ diff += (int)abs(merged_check[i] - merged_orig_pixel[i]);
}
return ((diff / 3) <= ((threshold * 3) / 4));
@@ -307,42 +306,44 @@ static bool compare_pixels(unsigned char *check, unsigned char *orig, unsigned c
return false;
}
-static bool is_pixel_checked(unsigned char *t) { return t[0] == 1; }
-static bool is_pixel_queued(unsigned char *t) { return t[1] == 1; }
-static bool is_pixel_paintability_checked(unsigned char *t) { return t[2] != 0; }
-static bool is_pixel_paintable(unsigned char *t) { return t[2] == 1; }
-static bool is_pixel_colored(unsigned char *t) { return t[3] == 255; }
+static inline bool is_pixel_checked(unsigned char *t) { return t[0] == 1; }
+static inline bool is_pixel_queued(unsigned char *t) { return t[1] == 1; }
+static inline bool is_pixel_paintability_checked(unsigned char *t) { return t[2] != 0; }
+static inline bool is_pixel_paintable(unsigned char *t) { return t[2] == 1; }
+static inline bool is_pixel_colored(unsigned char *t) { return t[3] == 255; }
-static void mark_pixel_checked(unsigned char *t) { t[0] = 1; }
-static void mark_pixel_queued(unsigned char *t) { t[1] = 1; }
-static void mark_pixel_paintable(unsigned char *t) { t[2] = 1; }
-static void mark_pixel_not_paintable(unsigned char *t) { t[2] = 2; }
-static void mark_pixel_colored(unsigned char *t) { t[3] = 255; }
+static inline void mark_pixel_checked(unsigned char *t) { t[0] = 1; }
+static inline void mark_pixel_unchecked(unsigned char *t) { t[0] = 0; }
+static inline void mark_pixel_queued(unsigned char *t) { t[1] = 1; }
+static inline void mark_pixel_paintable(unsigned char *t) { t[2] = 1; }
+static inline void mark_pixel_not_paintable(unsigned char *t) { t[2] = 2; }
+static inline void mark_pixel_colored(unsigned char *t) { t[3] = 255; }
-static void clear_pixel_paintability(unsigned char *t) { t[2] = 0; }
+static inline void clear_pixel_paintability(unsigned char *t) { t[2] = 0; }
struct bitmap_coords_info {
bool is_left;
- int x;
- int y;
+ unsigned int x;
+ unsigned int y;
int y_limit;
- int width;
- int height;
- int threshold;
- int radius;
+ unsigned int width;
+ unsigned int height;
+ unsigned int threshold;
+ unsigned int radius;
PaintBucketChannels method;
unsigned char *dtc;
+ unsigned char *merged_orig_pixel;
NR::Rect bbox;
NR::Rect screen;
+ unsigned int max_queue_size;
};
-static bool check_if_pixel_is_paintable(guchar *px, guchar *trace_px, int x, int y, unsigned char *orig_color, bitmap_coords_info bci) {
- unsigned char *trace_t = get_pixel(trace_px, x, y, bci.width);
+inline static bool check_if_pixel_is_paintable(guchar *px, unsigned char *trace_t, int x, int y, unsigned char *orig_color, bitmap_coords_info bci) {
if (is_pixel_paintability_checked(trace_t)) {
return is_pixel_paintable(trace_t);
} else {
unsigned char *t = get_pixel(px, x, y, bci.width);
- if (compare_pixels(t, orig_color, bci.dtc, bci.threshold, bci.method)) {
+ if (compare_pixels(t, orig_color, bci.merged_orig_pixel, bci.dtc, bci.threshold, bci.method)) {
mark_pixel_paintable(trace_t);
return true;
} else {
@@ -352,19 +353,6 @@ static bool check_if_pixel_is_paintable(guchar *px, guchar *trace_px, int x, int
}
}
-static bool try_add_to_queue(std::deque<NR::Point> *fill_queue, guchar *px, guchar *trace_px, unsigned char *orig, int x, int y, int width, bitmap_coords_info bci, unsigned int max_queue_size) {
- unsigned char *trace_t = get_pixel(trace_px, x, y, width);
- if (!(is_pixel_checked(trace_t) || is_pixel_queued(trace_t))) {
- if (check_if_pixel_is_paintable(px, trace_px, x, y, orig, bci)) {
- if ((fill_queue->size() < max_queue_size)) {
- fill_queue->push_back(NR::Point(x, y));
- mark_pixel_queued(trace_t);
- }
- }
- }
- return true;
-}
-
static void do_trace(GdkPixbuf *px, SPDesktop *desktop, NR::Matrix transform, bool union_with_selection) {
SPDocument *document = sp_desktop_document(desktop);
SCANLINE_CHECK_BOUNDARY
};
-static bool coords_in_range(int x, int y, bitmap_coords_info bci) {
- return (x >= 0)
- && (x < bci.width)
- && (y >= 0)
- && (y < bci.height);
+static bool coords_in_range(unsigned int x, unsigned int y, bitmap_coords_info bci) {
+ return (x < bci.width) &&
+ (y < bci.height);
}
#define PAINT_DIRECTION_LEFT 1
#define PAINT_DIRECTION_RIGHT 2
#define PAINT_DIRECTION_UP 4
#define PAINT_DIRECTION_DOWN 8
+#define PAINT_DIRECTION_ALL 15
-static unsigned int paint_pixel(guchar *px, guchar *trace_px, unsigned char *orig_color, bitmap_coords_info bci) {
- unsigned char *trace_t;
-
- bool can_paint_up = true;
- bool can_paint_down = true;
- bool can_paint_left = true;
- bool can_paint_right = true;
-
+static unsigned int paint_pixel(guchar *px, guchar *trace_px, unsigned char *orig_color, bitmap_coords_info bci, unsigned char *original_point_trace_t) {
if (bci.radius == 0) {
- if (check_if_pixel_is_paintable(px, trace_px, bci.x, bci.y, orig_color, bci)) {
- trace_t = get_pixel(trace_px, bci.x, bci.y, bci.width);
- mark_pixel_colored(trace_t);
- return PAINT_DIRECTION_LEFT + PAINT_DIRECTION_RIGHT + PAINT_DIRECTION_UP + PAINT_DIRECTION_DOWN;
- } else {
- return 0;
- }
+ mark_pixel_colored(original_point_trace_t);
+ return PAINT_DIRECTION_ALL;
} else {
- for (int y = -bci.radius; y <= bci.radius; y++) {
+ unsigned char *trace_t;
+
+ bool can_paint_up = true;
+ bool can_paint_down = true;
+ bool can_paint_left = true;
+ bool can_paint_right = true;
+
+ for (int y = -bci.radius; y <= (int)bci.radius; y++) {
int ty = bci.y + y;
- for (int x = -bci.radius; x <= bci.radius; x++) {
+ for (int x = -bci.radius; x <= (int)bci.radius; x++) {
int tx = bci.x + x;
if (coords_in_range(tx, ty, bci)) {
trace_t = get_pixel(trace_px, tx, ty, bci.width);
if (!is_pixel_colored(trace_t)) {
- if (check_if_pixel_is_paintable(px, trace_px, tx, ty, orig_color, bci)) {
+ if (check_if_pixel_is_paintable(px, trace_t, tx, ty, orig_color, bci)) {
mark_pixel_colored(trace_t);
} else {
if (x < 0) { can_paint_left = false; }
@@ -552,36 +534,90 @@ static ScanlineCheckResult perform_bitmap_scanline_check(std::deque<NR::Point> *
bool ok;
bool keep_tracing;
- unsigned int max_queue_size = bci.width * bci.height;
-
+ bool initial_paint = true;
+
+ unsigned char *current_trace_t = get_pixel(trace_px, bci.x, bci.y, bci.width);
+ unsigned int paint_directions;
+
+ bool currently_painting_top = false;
+ bool currently_painting_bottom = false;
+
+ unsigned int pix_width = bci.width * 4;
+
do {
ok = false;
if (bci.is_left) {
- keep_tracing = (bci.x >= 0);
+ keep_tracing = (bci.x != 0);
} else {
keep_tracing = (bci.x < bci.width);
}
if (keep_tracing) {
- if (check_if_pixel_is_paintable(px, trace_px, bci.x, bci.y, orig_color, bci)) {
- unsigned int paint_directions = paint_pixel(px, trace_px, orig_color, bci);
+ if (check_if_pixel_is_paintable(px, current_trace_t, bci.x, bci.y, orig_color, bci)) {
+ paint_directions = paint_pixel(px, trace_px, orig_color, bci, current_trace_t);
+ if (bci.radius == 0) {
+ mark_pixel_checked(current_trace_t);
+ }
+
if (paint_directions & PAINT_DIRECTION_UP) {
- try_add_to_queue(fill_queue, px, trace_px, orig_color, bci.x, bci.y - 1, bci.width, bci, max_queue_size);
+ unsigned int ty = bci.y - 1;
+ if (ty > 0) {
+ unsigned char *trace_t = current_trace_t - pix_width;
+ if (!is_pixel_queued(trace_t)) {
+ bool ok_to_paint = check_if_pixel_is_paintable(px, trace_t, bci.x, ty, orig_color, bci);
+
+ if (initial_paint) { currently_painting_top = !ok_to_paint; }
+
+ if (ok_to_paint && (!currently_painting_top)) {
+ currently_painting_top = true;
+ if ((fill_queue->size() < bci.max_queue_size)) {
+ fill_queue->push_back(NR::Point(bci.x, ty));
+ mark_pixel_queued(trace_t);
+ }
+ }
+ if ((!ok_to_paint) && currently_painting_top) {
+ currently_painting_top = false;
+ }
+ }
+ }
}
+
if (paint_directions & PAINT_DIRECTION_DOWN) {
- try_add_to_queue(fill_queue, px, trace_px, orig_color, bci.x, bci.y + 1, bci.width, bci, max_queue_size);
+ unsigned int ty = bci.y + 1;
+ if (ty < bci.height) {
+ unsigned char *trace_t = current_trace_t + pix_width;
+ if (!is_pixel_queued(trace_t)) {
+ bool ok_to_paint = check_if_pixel_is_paintable(px, trace_t, bci.x, ty, orig_color, bci);
+
+ if (initial_paint) { currently_painting_bottom = !ok_to_paint; }
+
+ if (ok_to_paint && (!currently_painting_bottom)) {
+ currently_painting_bottom = true;
+ if ((fill_queue->size() < bci.max_queue_size)) {
+ fill_queue->push_back(NR::Point(bci.x, ty));
+ mark_pixel_queued(trace_t);
+ }
+ }
+ if ((!ok_to_paint) && currently_painting_bottom) {
+ currently_painting_bottom = false;
+ }
+ }
+ }
}
+
if (bci.is_left) {
if (paint_directions & PAINT_DIRECTION_LEFT) {
- bci.x -= 1;
+ bci.x -= 1; current_trace_t -= 4;
ok = true;
}
} else {
if (paint_directions & PAINT_DIRECTION_RIGHT) {
- bci.x += 1;
+ bci.x += 1; current_trace_t += 4;
ok = true;
}
}
+
+ initial_paint = false;
}
} else {
if (bci.bbox.min()[NR::X] > bci.screen.min()[NR::X]) {
@@ -620,8 +656,8 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
NR::Rect screen = desktop->get_display_area();
- int width = (int)ceil(screen.extent(NR::X) * zoom_scale * padding);
- int height = (int)ceil(screen.extent(NR::Y) * zoom_scale * padding);
+ unsigned int width = (int)ceil(screen.extent(NR::X) * zoom_scale * padding);
+ unsigned int height = (int)ceil(screen.extent(NR::Y) * zoom_scale * padding);
NR::Point origin(screen.min()[NR::X],
sp_document_height(document) - screen.extent(NR::Y) - screen.min()[NR::Y]);
@@ -663,9 +699,9 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
dtc[2] = NR_RGBA32_B(bgcolor);
dtc[3] = NR_RGBA32_A(bgcolor);
- for (int fy = 0; fy < height; fy++) {
+ for (unsigned int fy = 0; fy < height; fy++) {
guchar *p = NR_PIXBLOCK_PX(&B) + fy * B.rs;
- for (int fx = 0; fx < width; fx++) {
+ for (unsigned int fx = 0; fx < width; fx++) {
for (int i = 0; i < 4; i++) {
*p++ = dtc[i];
}
@@ -746,6 +782,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
bci.screen = screen;
bci.dtc = dtc;
bci.radius = prefs_get_int_attribute_limited("tools.paintbucket", "autogap", 0, 0, 3);
+ bci.max_queue_size = width * height;
bool first_run = true;
@@ -757,23 +794,28 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
unsigned char orig_color[4];
for (int i = 0; i < 4; i++) { orig_color[i] = orig_px[i]; }
- unsigned char merged_orig[4];
+ unsigned char merged_orig[3];
merge_pixel_with_background(orig_color, dtc, merged_orig);
+ bci.merged_orig_pixel = merged_orig;
+
unsigned char *trace_t = get_pixel(trace_px, (int)color_point[NR::X], (int)color_point[NR::Y], width);
if (!is_pixel_checked(trace_t) && !is_pixel_colored(trace_t)) {
- fill_queue.push_front(color_point);
-
- if (!first_run) {
- for (int y = 0; y < height; y++) {
- for (int x = 0; x < width; x++) {
- trace_t = get_pixel(trace_px, x, y, width);
- clear_pixel_paintability(trace_t);
+ if (check_if_pixel_is_paintable(px, trace_px, (int)color_point[NR::X], (int)color_point[NR::Y], orig_color, bci)) {
+ fill_queue.push_front(color_point);
+
+ if (!first_run) {
+ for (unsigned int y = 0; y < height; y++) {
+ trace_t = get_pixel(trace_px, 0, y, width);
+ for (unsigned int x = 0; x < width; x++) {
+ clear_pixel_paintability(trace_t);
+ trace_t += 4;
+ }
}
}
+ first_run = false;
}
- first_run = false;
}
while (!fill_queue.empty() && !aborted) {
@@ -783,60 +825,61 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
unsigned char *trace_t = get_pixel(trace_px, (int)cp[NR::X], (int)cp[NR::Y], width);
if (!is_pixel_checked(trace_t)) {
mark_pixel_checked(trace_t);
-
int x = (int)cp[NR::X];
int y = (int)cp[NR::Y];
- // same color at this point
- if (check_if_pixel_is_paintable(px, trace_px, x, y, orig_color, bci)) {
- if (y == 0) {
- if (bbox->min()[NR::Y] > screen.min()[NR::Y]) {
- aborted = true; break;
- } else {
- reached_screen_boundary = true;
- }
+ if (y == 0) {
+ if (bbox->min()[NR::Y] > screen.min()[NR::Y]) {
+ aborted = true; break;
+ } else {
+ reached_screen_boundary = true;
}
-
- if (y == y_limit) {
- if (bbox->max()[NR::Y] < screen.max()[NR::Y]) {
- aborted = true; break;
- } else {
- reached_screen_boundary = true;
- }
- }
-
- bci.is_left = true;
- bci.x = x;
- bci.y = y;
-
- ScanlineCheckResult result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci);
-
- switch (result) {
- case SCANLINE_CHECK_ABORTED:
- aborted = true;
- break;
- case SCANLINE_CHECK_BOUNDARY:
- reached_screen_boundary = true;
- break;
- default:
- break;
+ }
+
+ if (y == y_limit) {
+ if (bbox->max()[NR::Y] < screen.max()[NR::Y]) {
+ aborted = true; break;
+ } else {
+ reached_screen_boundary = true;
}
-
- bci.is_left = false;
- bci.x = x + 1;
- bci.y = y;
-
- result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci);
-
- switch (result) {
- case SCANLINE_CHECK_ABORTED:
- aborted = true;
- break;
- case SCANLINE_CHECK_BOUNDARY:
- reached_screen_boundary = true;
- break;
- default:
- break;
+ }
+
+ bci.is_left = true;
+ bci.x = x;
+ bci.y = y;
+
+ ScanlineCheckResult result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci);
+
+ switch (result) {
+ case SCANLINE_CHECK_ABORTED:
+ aborted = true;
+ break;
+ case SCANLINE_CHECK_BOUNDARY:
+ reached_screen_boundary = true;
+ break;
+ default:
+ break;
+ }
+
+ if (bci.x < width) {
+ trace_t += 4;
+ if (!is_pixel_checked(trace_t) && !is_pixel_queued(trace_t)) {
+ mark_pixel_checked(trace_t);
+ bci.is_left = false;
+ bci.x = x + 1;
+
+ result = perform_bitmap_scanline_check(&fill_queue, px, trace_px, orig_color, bci);
+
+ switch (result) {
+ case SCANLINE_CHECK_ABORTED:
+ aborted = true;
+ break;
+ case SCANLINE_CHECK_BOUNDARY:
+ reached_screen_boundary = true;
+ break;
+ default:
+ break;
+ }
}
}
}