summaryrefslogtreecommitdiffstats
path: root/xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch
diff options
context:
space:
mode:
authorAlex Lancaster <alexlan[AT]fedoraproject org>2012-05-16 20:19:21 -0400
committerAlex Lancaster <alexlan[AT]fedoraproject org>2012-05-16 20:19:21 -0400
commitd5c86c6ed87a63b6cd963799904510eadcc41bdb (patch)
treeeeefb182a1610530bb44794d48fcd9570c1b8b46 /xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch
parent06ea05f47e4d9f067b2ca39350ecd573bb7d4a44 (diff)
downloadxbmc-rpm-d5c86c6ed87a63b6cd963799904510eadcc41bdb.tar.gz
xbmc-rpm-d5c86c6ed87a63b6cd963799904510eadcc41bdb.tar.xz
xbmc-rpm-d5c86c6ed87a63b6cd963799904510eadcc41bdb.zip
- Add support for PVR add-ons (backported from tsp's PVR branch to
Eden), including MythTV - Workaround bug in compiling against afpfs-ng-devel, will hopefully get AirPlay support working (needs testing) - Drop references to obsolete patches now in Eden - Add patch from dteirney's branch for MythTV 0.25 support
Diffstat (limited to 'xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch')
-rw-r--r--xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch b/xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch
deleted file mode 100644
index 7e6ce67..0000000
--- a/xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Update libpng 1.5 patch: check return values of png_get_PLTE() and
-png_get_tRNS() before using the values to avoid using uninitialized values.
-
---- a/lib/cximage-6.0/CxImage/ximapng.cpp
-+++ b/lib/cximage-6.0/CxImage/ximapng.cpp
-@@ -178,12 +178,14 @@ bool CxImagePNG::Decode(CxFile *hFile)
- int _num_palette;
- png_colorp _palette;
- #if PNG_LIBPNG_VER > 10399
-- png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
-+ png_uint_32 _palette_ret;
-+ _palette_ret = png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
-+ if (_palette_ret && _num_palette>0){
- #else
- _num_palette=info_ptr->num_palette;
- _palette=info_ptr->palette;
--#endif
- if (_num_palette>0){
-+#endif
- SetPalette((rgb_color*)_palette,_num_palette);
- SetClrImportant(_num_palette);
- } else if (_bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
-@@ -199,11 +201,13 @@ bool CxImagePNG::Decode(CxFile *hFile)
- int _num_trans;
- png_color_16p _trans_color;
- #if PNG_LIBPNG_VER > 10399
-- png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);
-+ png_uint_32 _trans_ret;
-+ _trans_ret = png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);
-+ if (_trans_ret && _num_trans!=0){ //palette transparency
- #else
- _num_trans=info_ptr->num_trans;
--#endif
- if (_num_trans!=0){ //palette transparency
-+#endif
- if (_num_trans==1){
- if (_color_type == PNG_COLOR_TYPE_PALETTE){
- #if PNG_LIBPNG_VER > 10399
-@@ -219,7 +223,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
- #endif
- }
- }
-+#if PNG_LIBPNG_VER > 10399
-+ if (_num_trans>1 && _trans_alpha!=NULL){
-+#else
- if (_num_trans>1){
-+#endif
- RGBQUAD* pal=GetPalette();
- if (pal){
- DWORD ip;