cvs commit: ports/graphics/imlib2 Makefile ports/graphics/imlib2/files patch-loader_png.c

[Dominic Fandrey]

On 29/03/2010 13:34, Dominic Fandrey wrote:
> On 29/03/2010 12:49, Ion-Mihai Tetcu wrote:
>> On Mon, 29 Mar 2010 12:12:31 +0200
>> Dominic Fandrey <kamikaze at bsdforen.de> wrote:
>>
>>> On 29/03/2010 11:31, Dirk Meyer wrote:
>>>> dinoex      2010-03-29 09:31:53 UTC
>>>>
>>>>   FreeBSD ports repository
>>>>
>>>>   Modified files:
>>>>     graphics/imlib2      Makefile 
>>>>     graphics/imlib2/files patch-loader_png.c 
>>>>   Log:
>>>>   - fix code for png-1.4.1
>>>>   
>>>>   Revision  Changes    Path
>>>>   1.136     +1 -1      ports/graphics/imlib2/Makefile
>>>>   1.3       +1 -1      ports/graphics/imlib2/files/patch-loader_png.c
>>>
>>> Why did you rebreak imlib2?
>>>
>>
>> Trouble is this is the correct code, according to png developers:
>>
>> libpng-1.4.1/CHANGES:  Changed png_check_sig() to !png_sig_cmp() in contrib programs.
> 
> I tested it and imlib2 does not work.
> 
> According to the documentation (http://www.libpng.org/pub/png/libpng-manual.txt):
> 	png_sig_cmp() ... will return 0 (false) if the bytes match the
> 	corresponding bytes of the PNG signature
> 
> I.e. it should be "png_sig_cmp(...) != 0" or "!png_sig_cmp(..)", just
> the oposite of what is done, now.

Ahem, I admit that "png_sig_cmp(...) != 0" or "!png_sig_cmp(..)" are
just the opposite, however png_sig_cmp still does not work:

This one is with "png_check_sig(buf, 0, PNG_BYTES_TO_CHECK)":
# feh wallpapers/Once\ Was\ Home\ \(16-10\).png 
feh WARNING: wallpapers/Once Was Home (16-10).png - No Imlib2 loader for that file format
feh - No loadable images specified.
Use feh --help for detailed usage information

That one is with my patch "png_check_sig(buf, 0, PNG_BYTES_TO_CHECK) != 0"

# feh wallpapers/Once\ Was\ Home\ \(16-10\).png
* displays png

Apparently the typecast int to bool is not reliable.

-- 
A: Because it fouls the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing on usenet and in e-mail?