AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
58,154 Commits 1 Branch 0 Tags 297 MiB
a2d22f8b93
Commit Graph

15 Commits

Author SHA1 Message Date
Vadim Zeitlin
fff5f7d5d8 Merge libpng 1.6.2 into the trunk. 
Add pngprefix.h file generated by libpng configure/make process (which we
don't run during wxWidgets build, so this is something that will need to be
redone manually whenever libpng is upgraded, the procedure for doing this is
documented in docs/tech/tn0025.txt) in order to use "wx_" prefix for all
libpng public symbols. This should avoid at least some problems due to the
conflicts between the built-in libpng and shared libpng loaded into the
process as GTK+ libraries dependency under Unix.

Also rename wx_png_{warning,error} to use upper case PNG for consistency with
wx_PNG_stream_{reader,writer} and to avoid conflict with png_{warning,error}()
which we now rename to have "wx_" prefix.

Closes #14157.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-07 17:44:15 +00:00
Dimitri Schoolwerth
9c0d9ce328 merged libpng 1.5.6 to trunk 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-11-25 22:25:11 +00:00
Paul Cornett
b61cc19c06 merge libpng 1.4.4 to trunk 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-11-30 18:41:25 +00:00
Vadim Zeitlin
970f6abe1d merged libpng 1.2.34 into the trunk (see #10043) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-25 13:15:09 +00:00
Vadim Zeitlin
0272a10d2e bring the new linpng 1.2.20 (without its contrib subdirectory) into trunk 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-21 18:47:38 +00:00
Vadim Zeitlin
5e60a12a06 remove old libpng 1.2.7 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-21 18:45:12 +00:00
Václav Slavík
706b88074d merged libpng-1.2.7 to HEAD (1.2.6 contained serious bug that caused it to produce broken PNG files) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-12 11:46:04 +00:00
Václav Slavík
5b02c8a11f merged libpng-1.2.6 to HEAD 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-29 10:15:26 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-12-04 14:11:26 +00:00
Gilles Depeyrot
4946a942d7 corrected conflicts after import of libpng-1.2.4 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-07-08 23:03:16 +00:00
Gilles Depeyrot
75b6e0a0ab readded previsouly removed files (needed for merge after import of libpng-1.2.4) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-07-08 21:35:05 +00:00
Gilles Depeyrot
8237875c04 remove conflicting libpng-1/0/3 files before import of libpng-1.2.4 files 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-07-08 20:48:16 +00:00
Robert Roebling
a626cc0305 libPNG 1.0.3 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-04-17 13:43:15 +00:00
Karsten Ballüder
1f0299c17d fixed #include paths to use local copies of png/gdk_imlib/zlib headers 
fixed compiler warning in time.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-06-22 12:47:56 +00:00
Karsten Ballüder
c801d85f15 Initial revision 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-05-20 14:01:55 +00:00