Support for global <nofullsize> tag

1 files changed, 3 insertions, 3 deletions

diff --git a/generators.c b/generators.c
index 170c283..2c7b7a0 100644
--- a/generators.c
+++ b/generators.c
@@ -166,7 +166,7 @@ generate_image (TGallerySetup *setup,
       modify_exif (big_dst, setup->erase_exif_thumbnail, setup->add_copyright);
       g_free (big_dst);
 
-      if (! item->nofullsize)
+      if (item->force_fullsize || (! item->force_nofullsize && ! items->nofullsize))
       {
     	s1 = g_path_get_dirname(dst);
         orig_dst = g_strconcat (s1, "/", IMG_ORIG_DIR, "/", *img_src, NULL);
@@ -685,7 +685,7 @@ 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->nofullsize)
+  if (item->force_fullsize || (! item->force_nofullsize && ! parent_items->nofullsize))
     get_image_sizes (orig_dst, &img_orig_w, &img_orig_h);
 
 
@@ -706,7 +706,7 @@ write_html_image (TGallerySetup *setup,
     if (strstr (buffer, "<!-- $(END_IMG_FULLSIZE_LINK) -->")) {
       in_img_fullsize_link = FALSE;
       free (b);
-      if (! item->nofullsize)
+      if (item->force_fullsize || (! item->force_nofullsize && ! parent_items->nofullsize))
         b = strdup (buf_img_fullsize_link);
       else  continue;
     }