X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=blobdiff_plain;f=obrender%2Fimage.c;h=fb5f40bc1e17703814d9840f8e438acf9de29a40;hp=8ff9bf106b0ef204b339a77527dafcc613934ea8;hb=122e2a81d3899f918de81a735061776193ddeed8;hpb=1491e196f3d05152fab127eb9cff3146a68a20a8 diff --git a/obrender/image.c b/obrender/image.c index 8ff9bf1..fb5f40b 100644 --- a/obrender/image.c +++ b/obrender/image.c @@ -243,7 +243,7 @@ RrImageSet* RrImageSetMergeSets(RrImageSet *b, RrImageSet *a) gint n_original, n_resized, tmp; GSList *it; - const gint max_resized = a->cache->max_resized_saved; + gint max_resized; if (!a) return b; @@ -251,7 +251,6 @@ RrImageSet* RrImageSetMergeSets(RrImageSet *b, RrImageSet *a) return a; if (a == b) return b; - /* the original and resized picture lists in an RrImageSet are kept ordered as newest to oldest. we don't have timestamps for them, so we cannot preserve this in the merged RrImageSet exactly. a decent approximation, @@ -264,6 +263,8 @@ RrImageSet* RrImageSetMergeSets(RrImageSet *b, RrImageSet *a) g_assert(b->cache == a->cache); + max_resized = a->cache->max_resized_saved; + a_i = b_i = merged_i = 0; n_original = a->n_original + b->n_original; original = g_new(RrImagePic*, n_original);