diff options
Diffstat (limited to 'generators.c')
| -rw-r--r-- | generators.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/generators.c b/generators.c index c6df9c0..356c434 100644 --- a/generators.c +++ b/generators.c @@ -166,7 +166,8 @@ generate_image (TGallerySetup *setup, modify_exif (big_dst, setup->erase_exif_thumbnail, setup->add_copyright); g_free (big_dst); - if (item->force_fullsize || (! item->force_nofullsize && ! items->nofullsize)) + if (item->force_fullsize || (items->fullsize && ! item->force_nofullsize) || + (! item->force_nofullsize && ! items->nofullsize && ! setup->nofullsize)) { s1 = g_path_get_dirname(dst); orig_dst = g_strconcat (s1, "/", IMG_ORIG_DIR, "/", *img_src, NULL); @@ -623,6 +624,7 @@ write_html_image (TGallerySetup *setup, gboolean res; int level, old_parent_item_index; gboolean override_title_meta; + gboolean image_fullsize; fin = fopen (template_src, "r"); @@ -688,7 +690,9 @@ write_html_image (TGallerySetup *setup, /* Retrieve image sizes of preview and original image */ get_image_sizes (big_dst, &img_big_w, &img_big_h); - if (item->force_fullsize || (! item->force_nofullsize && ! parent_items->nofullsize)) + image_fullsize = item->force_fullsize || (parent_items->fullsize && ! item->force_nofullsize) || + (! item->force_nofullsize && ! parent_items->nofullsize && ! setup->nofullsize); + if (image_fullsize) get_image_sizes (orig_dst, &img_orig_w, &img_orig_h); @@ -709,7 +713,7 @@ write_html_image (TGallerySetup *setup, if (strstr (buffer, "<!-- $(END_IMG_FULLSIZE_LINK) -->")) { in_img_fullsize_link = FALSE; free (b); - if (item->force_fullsize || (! item->force_nofullsize && ! parent_items->nofullsize)) + if (image_fullsize) b = strdup (buf_img_fullsize_link); else continue; } |