Hum, sorry, this break on 1.5 with latest svn.
Should we add a compile time test on libpng version?
#if PNG_LIBPNG_VER_SONUM >=15
png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
(png_charpp)
&icc_profile_title, &compression_type,
(png_byte**)
&icc_profile, (png_uint_32*) &icc_profile_size);
#else
png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
(png_charpp)
&icc_profile_title, &compression_type,
(png_charpp)
&icc_profile, (png_uint_32*) &icc_profile_size);
#endif
does the trick.
Regards,
Tâm MERLANT
Le Sun, 15 Jan 2012 14:49:27 +0100,
Klaus Post <[email protected]> a écrit :
> Hi!
>
> On the libpng patch i get this error:
>
> exiv2-colorspace.cpp: In function ‘RSColorSpace*
> exiv2_get_colorspace(const gchar*, gfloat*)’:
> exiv2-colorspace.cpp:132:73: error: invalid conversion from
> ‘png_byte**’ to ‘char**’
> exiv2-colorspace.cpp:132:73: error: initializing argument 5 of
> ‘png_uint_32 png_get_iCCP(png_struct*, png_info*, char**, int*,
> char**, png_uint_32*)’
> make[3]: *** [exiv2-colorspace.lo] Error 1
>
> It is this line:
>
> png_uint_32 retval = png_get_iCCP (png_ptr,
> info_ptr,
> (png_charpp)
> &icc_profile_title, &compression_type,
> (png_byte**)
> &icc_profile, (png_uint_32*) &icc_profile_size);
>
>
> png_byte is unsigned char in v.1.2:
>
> typedef unsigned char png_byte;
>
> I've changed it to png_charpp - does that break on 1.5? Could you test
> against latest svn?
>
>
>
>
> Regards, Klaus Post
>
> http://www.klauspost.com
>
>
> On Tue, Sep 20, 2011 at 11:01, Ille <[email protected]> wrote:
>
> > Hi,
> >
> > attached is the patch to make rawstudio (rev. 4042) compile against
> > libpng-1.5
> > I hope it's backward compatible, but can't be 100% sure.
> >
> > The other patch is an improvement for meta-x3f. It makes possible
> > for rawstudio to display thumbnails for SD15, DP1/2, SD1. Wathever,
> > decoding of raw datas is still not possible.
> >
> > Regards,
> > Ille
> >
> >
> >
> >
> > Le Mon, 19 Sep 2011 20:01:36 +0200,
> > Ille <[email protected]> a écrit :
> >
> > > I will make the patch tonight and submit it soon.
> > >
> > > I'm also tweeking the meta-x3f plugin. It seems the plugin loads
> > > the thumbnail from the last available uncompressed embedded image
> > > (ppm for SD9->SD14), which can be the full size preview. We could
> > > get better responsiveness if we make sure we load the embbeded
> > > thumbnail (whatever, it's of no gain with SD14, since the only
> > > uncompressed image is the thumbnail).
> > > Also, since SD15 (and DPs), the embbeded thumbnails are now in
> > > jpeg format. It shouldn't be hard to display the jpeg thumbnails
> > > in RS iconbox, but the loading of the raw datas from TRUE
> > > processors is not yet implemented in dcraw (I think) wich means
> > > RS can't actually process SD15, DP1 or DP2 raw files.
> > > I'm trying to get a better x3f loader.
> > >
> > > Regards,
> > > Ille
> > >
> >
> > _______________________________________________
> > Rawstudio-dev mailing list
> > [email protected]
> > http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-dev
> >
> >
_______________________________________________
Rawstudio-dev mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-dev
