On 12/11/13 12:06, Michael Schwendt wrote:
> On Wed, 11 Dec 2013 06:47:40 +0200, Niko Sauer wrote:
>
>> On 12/09/13 19:43, Michael Schwendt wrote:
>>> On Fri, 06 Dec 2013 03:20:53 +0000, Omari Stephens wrote:
>>>
>>>> Niko: do you know if render speed is affected?
>>>
>>> It appears to be visibly faster here.
>>>
>>>> ISTR that render speed
>>>> was one downside to LCMS2, but that may have changed since I last heard
>>>> that, and also it might not be significant (I haven't used a project
>>>> using LCMS2 before).
>>>>
>>>> On 12/05/2013 04:47 AM, Niko Sauer wrote:
>>>>> I found a patch that will enable lcms2 when compiling Geeqie-1.1.This
>>>>> is Gitorious Commit 1548a68. There is a small bug in the patch that I
>>>>> remedied by deleting one single line. The new patch is attached.
>>>
>>> Which line have you deleted? There's a bug in the patch, because HAVE_LCMS
>>> is undefined, and that leads to some files (such as exif_common.c) not
>>> including lcms2.h and breaking compilation.
>>>
>>>
>> It is line 296 which reads as follows:
>>
>> 296 AC_DEFINE(HAVE_LCMS, 1, [define to enable use of color profiles
>> with lcms])
>
> Yes, that line must be present, or else Geeqie does not compile. Why?
> See e.g. beginning of src/exif_common.c, where both HAVE_LCMS and HAVE_LCMS2
> must be defined for LCMS2 headers to be included.
>
> #ifdef HAVE_LCMS
> /*** color support enabled ***/
>
> #ifdef HAVE_LCMS2
> #include <lcms2.h>
> #else
> #include <lcms.h>
> #endif
> #endif
>
> […]
>
I'm not sure that I understand your comment. Here is an annotated
snippet of the git-patch where my previous (cryptic) comment is perhaps
made clearer. The annotations are indicated by hashes.
--- a/configure.in
+++ b/configure.in
@@ -290,14 +290,22 @@ AC_ARG_ENABLE([lcms],
[liblcms=$enableval], [liblcms=auto])
if test "x${liblcms}" != "xno"; then
- PKG_CHECK_MODULES(LCMS, [lcms >= 1.14],
+ PKG_CHECK_MODULES(LCMS, [lcms2 >= 2.0],
[
HAVE_LCMS=yes
## The line below I have deleted #####
AC_DEFINE(HAVE_LCMS, 1, [define to enable use of color profiles
with lcms])
## ############################# #####
+ AC_DEFINE(HAVE_LCMS2, 1, [lcms2 is used])
],
[
- HAVE_LCMS=no
- AC_MSG_WARN([$LCMS_PKG_ERRORS])
+ PKG_CHECK_MODULES(LCMS, [lcms >= 1.14],
+ [
+ HAVE_LCMS=yes
## This line should be kept #####
+ AC_DEFINE(HAVE_LCMS, 1, [define to enable use of color profiles
with lcms])
########################### #####
It is when the indicated line (first one) is not taken out that the
compiler looks in lcms.h instead of lcsm2.h and bales out on Error.
> ------------------------------------------------------------------------------
> Rapidly troubleshoot problems before they affect your business. Most IT
> organizations don't have a clear picture of how application performance
> affects their revenue. With AppDynamics, you get 100% visibility into your
> Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
> http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
> _______________________________________________
> Geeqie-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/geeqie-devel
>
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Geeqie-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-devel
