In the second case, we actually check the wrong variable.
gint n_original, n_resized, tmp;
GSList *it;
gint n_original, n_resized, tmp;
GSList *it;
- const gint max_resized = a->cache->max_resized_saved;
return a;
if (a == b)
return b;
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,
/* 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,
g_assert(b->cache == a->cache);
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);
a_i = b_i = merged_i = 0;
n_original = a->n_original + b->n_original;
original = g_new(RrImagePic*, n_original);
xmlResetLastError();
i->doc = xmlParseMemory(data, len);
xmlResetLastError();
i->doc = xmlParseMemory(data, len);
i->root = xmlDocGetRootElement(i->doc);
if (!i->root) {
xmlFreeDoc(i->doc);
i->root = xmlDocGetRootElement(i->doc);
if (!i->root) {
xmlFreeDoc(i->doc);