# HG changeset patch # User zas_ # Date 1215203568 0 # Node ID 0f85435ac3354514dc894da64e11bfc770cad096 # Parent 1b14c0e177adc502d7fa5965d15fa74ce87b7214 Optimize a bit when connected zoom and scrolling are unset, just move the test outside loops. diff -r 1b14c0e177ad -r 0f85435ac335 src/layout_image.c --- a/src/layout_image.c Fri Jul 04 17:21:07 2008 +0000 +++ b/src/layout_image.c Fri Jul 04 20:32:48 2008 +0000 @@ -1053,13 +1053,15 @@ image_scroll(lw->image, x, y); + if (!lw->connect_scroll) return; + image_get_image_size(lw->image, &width, &height); dx = (gdouble) x / width; dy = (gdouble) y / height; for (i = 0; i < MAX_SPLIT_IMAGES; i++) { - if (lw->split_images[i] && lw->split_images[i] != lw->image && lw->connect_scroll) + if (lw->split_images[i] && lw->split_images[i] != lw->image) { gdouble sx, sy; image_get_scroll_center(lw->split_images[i], &sx, &sy); @@ -1078,9 +1080,11 @@ image_zoom_adjust(lw->image, increment); + if (!lw->connect_zoom) return; + for (i = 0; i < MAX_SPLIT_IMAGES; i++) { - if (lw->split_images[i] && lw->split_images[i] != lw->image && lw->connect_zoom) + if (lw->split_images[i] && lw->split_images[i] != lw->image) image_zoom_adjust(lw->split_images[i], increment); ; } } @@ -1092,9 +1096,11 @@ image_zoom_adjust_at_point(lw->image, increment, x, y); + if (!lw->connect_zoom) return; + for (i = 0; i < MAX_SPLIT_IMAGES; i++) { - if (lw->split_images[i] && lw->split_images[i] != lw->image && lw->connect_zoom) + if (lw->split_images[i] && lw->split_images[i] != lw->image) image_zoom_adjust_at_point(lw->split_images[i], increment, x, y); } } @@ -1106,9 +1112,11 @@ image_zoom_set(lw->image, zoom); - for (i=0; i < MAX_SPLIT_IMAGES; i++) + if (!lw->connect_zoom) return; + + for (i = 0; i < MAX_SPLIT_IMAGES; i++) { - if (lw->split_images[i] && lw->split_images[i] != lw->image && lw->connect_zoom) + if (lw->split_images[i] && lw->split_images[i] != lw->image) image_zoom_set(lw->split_images[i], zoom); } }