diff --git a/NT/elog.sln b/NT/elog.sln index 3d627277..5c35937b 100755 --- a/NT/elog.sln +++ b/NT/elog.sln @@ -1,6 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elog", "elog.vcproj", "{FD6FCAF3-A94B-40FA-AE52-07705DE2E519}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elog", "elog.vcxproj", "{FD6FCAF3-A94B-40FA-AE52-07705DE2E519}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/NT/elogd.sln b/NT/elogd.sln index e7cd5574..9b3b15c6 100755 --- a/NT/elogd.sln +++ b/NT/elogd.sln @@ -1,18 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elconv", "elconv.vcproj", "{8D6EBED8-48F3-4719-907E-7BE46A3C0FA4}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elconv", "elconv.vcxproj", "{8D6EBED8-48F3-4719-907E-7BE46A3C0FA4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elog", "elog.vcproj", "{FD6FCAF3-A94B-40FA-AE52-07705DE2E519}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elog", "elog.vcxproj", "{FD6FCAF3-A94B-40FA-AE52-07705DE2E519}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elogd", "elogd.vcproj", "{CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elogd", "elogd.vcxproj", "{CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "locext", "locext.vcproj", "{77ED3530-9382-4830-8513-9729C051A93E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "locext", "locext.vcxproj", "{77ED3530-9382-4830-8513-9729C051A93E}" EndProject Global - GlobalSection(SubversionScc) = preSolution - Svn-Managed = True - Manager = AnkhSVN - Subversion Support for Visual Studio - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 @@ -32,4 +28,8 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(SubversionScc) = preSolution + Svn-Managed = True + Manager = AnkhSVN - Subversion Support for Visual Studio + EndGlobalSection EndGlobal diff --git a/doc/config.html b/doc/config.html index 6030e94e..3fb7889e 100755 --- a/doc/config.html +++ b/doc/config.html @@ -980,6 +980,13 @@ if the file name starts with a "/" (Unix) or Setting Thumbnail size = 0 turns off the thumbnail creation.

+

  • + Thumbnail options = <options>
    + With this option one can pass additional parameters to the ImageMagick + package. They are passes 1:1 to the convert program. Commonly + used is the -density option to increase the image quality when + converting from PDF or EPS files.

    +


  • diff --git a/src/elogd.c b/src/elogd.c index db8c7850..0d0ff208 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -23046,7 +23046,7 @@ int is_inline_attachment(char *encoding, int message_id, char *text, int i, char int create_thumbnail(LOGBOOK * lbs, char *file_name) { - char str[2 * MAX_PATH_LENGTH], cmd[2 * MAX_PATH_LENGTH], thumb_size[256]; + char str[2 * MAX_PATH_LENGTH], cmd[2 * MAX_PATH_LENGTH], thumb_size[256], thumb_options[256]; int i; if (!image_magick_exist) @@ -23059,6 +23059,8 @@ int create_thumbnail(LOGBOOK * lbs, char *file_name) } else thumb_size[0] = 0; + getcfg(lbs->name, "Thumbnail options", thumb_options, sizeof(thumb_options)); + if (!chkext(file_name, ".ps") && !chkext(file_name, ".pdf") && !chkext(file_name, ".eps") && !chkext(file_name, ".gif") && !chkext(file_name, ".jpg") && !chkext(file_name, ".jpeg") && !chkext(file_name, ".png") && !chkext(file_name, ".ico") && !chkext(file_name, ".tif")) @@ -23079,9 +23081,9 @@ int create_thumbnail(LOGBOOK * lbs, char *file_name) strlcat(str, ".png", sizeof(str)); if (chkext(file_name, ".pdf") || chkext(file_name, ".ps")) - snprintf(cmd, sizeof(cmd), "convert '%s[0-7]'%s '%s'", file_name, thumb_size, str); + snprintf(cmd, sizeof(cmd), "convert %s '%s[0-7]'%s '%s'", thumb_options, file_name, thumb_size, str); else - snprintf(cmd, sizeof(cmd), "convert '%s'%s '%s'", file_name, thumb_size, str); + snprintf(cmd, sizeof(cmd), "convert %s '%s'%s '%s'", thumb_options, file_name, thumb_size, str); #ifdef OS_WINNT for (i = 0; i < (int) strlen(cmd); i++)