misc/145180: graphics/imlib2: fix build for png-1.4.1

[Barbara]

>Number:         145180
>Category:       misc
>Synopsis:       graphics/imlib2: fix build for png-1.4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 29 19:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Barbara
>Release:        
>Organization:
>Environment:
FreeBSD satanasso.local.net 7.3-STABLE FreeBSD 7.3-STABLE #0: Thu Mar 25 09:52:40 CET 2010 root at satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO i386
>Description:
Fix the build after png update.
Successfully tested using graphics/feh under fluxbox with the following command:
    feh --bg-scale /path/to/a/file.png
With the last committed I was getting:
    No Imlib2 loader for that file format
    feh ERROR: Couldn't load image in order to set bg

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- files/patch-loader_png.c.orig	2010-03-29 14:22:41.000000000 +0200
+++ files/patch-loader_png.c	2010-03-29 21:36:48.000000000 +0200
@@ -5,7 +5,7 @@
          /* if we haven't read the header before, set the header data */
          fread(buf, 1, PNG_BYTES_TO_CHECK, f);
 -        if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+        if (png_check_sig(buf, 0, PNG_BYTES_TO_CHECK) != 0)
++        if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
            {
               fclose(f);
               return 0;


>Release-Note:
>Audit-Trail:
>Unformatted: