Projects
Multimedia
kodi
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 29
View file
kodi-noX-raspberry-pi.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 29 08:44:03 UTC 2016 - olaf@aepfle.de + +- kodi.cximage.gcc6.patch + +------------------------------------------------------------------- Sun Apr 24 11:55:31 UTC 2016 - sagiben at gmail dot com - Version update to Kodi 16.1 Jarvis:
View file
kodi-noX-raspberry-pi2.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 29 08:44:03 UTC 2016 - olaf@aepfle.de + +- kodi.cximage.gcc6.patch + +------------------------------------------------------------------- Sun Apr 24 11:55:31 UTC 2016 - sagiben at gmail dot com - Version update to Kodi 16.1 Jarvis:
View file
kodi-noX.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 29 08:44:03 UTC 2016 - olaf@aepfle.de + +- kodi.cximage.gcc6.patch + +------------------------------------------------------------------- Sun Apr 24 11:55:31 UTC 2016 - sagiben at gmail dot com - Version update to Kodi 16.1 Jarvis:
View file
kodi.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 29 08:44:03 UTC 2016 - olaf@aepfle.de + +- kodi.cximage.gcc6.patch + +------------------------------------------------------------------- Sun Apr 24 11:55:31 UTC 2016 - sagiben at gmail dot com - Version update to Kodi 16.1 Jarvis:
View file
kodi-noX-raspberry-pi.spec
Changed
@@ -59,6 +59,7 @@ Patch2: kodi-texturepacker.patch Patch3: crossguid_build64.patch Patch4: add_rpi2_support.patch +Patch6: kodi.cximage.gcc6.patch BuildRequires: avahi-devel BuildRequires: boost-devel BuildRequires: byacc @@ -246,6 +247,7 @@ %patch2 %patch3 %patch4 -p0 +%patch6 -p1 # Remove build time references so build-compare can do its work
View file
kodi-noX-raspberry-pi2.spec
Changed
@@ -59,6 +59,7 @@ Patch2: kodi-texturepacker.patch Patch3: crossguid_build64.patch Patch4: add_rpi2_support.patch +Patch6: kodi.cximage.gcc6.patch BuildRequires: avahi-devel BuildRequires: boost-devel BuildRequires: byacc @@ -246,6 +247,7 @@ %patch2 %patch3 %patch4 -p0 +%patch6 -p1 # Remove build time references so build-compare can do its work
View file
kodi-noX.spec
Changed
@@ -59,6 +59,7 @@ Patch2: kodi-texturepacker.patch Patch3: crossguid_build64.patch Patch4: add_rpi2_support.patch +Patch6: kodi.cximage.gcc6.patch BuildRequires: avahi-devel BuildRequires: boost-devel BuildRequires: byacc @@ -246,6 +247,7 @@ %patch2 %patch3 %patch4 -p0 +%patch6 -p1 # Remove build time references so build-compare can do its work
View file
kodi.spec
Changed
@@ -59,6 +59,7 @@ Patch2: kodi-texturepacker.patch Patch3: crossguid_build64.patch Patch4: add_rpi2_support.patch +Patch6: kodi.cximage.gcc6.patch BuildRequires: avahi-devel BuildRequires: boost-devel BuildRequires: byacc @@ -246,6 +247,7 @@ %patch2 %patch3 %patch4 -p0 +%patch6 -p1 # Remove build time references so build-compare can do its work
View file
kodi.cximage.gcc6.patch
Added
@@ -0,0 +1,1391 @@ +https://github.com/xbmc/xbmc/pull/9703 +--- + lib/cximage-6.0/CxImage/ximabmp.cpp | 6 - + lib/cximage-6.0/CxImage/ximadef.h | 8 - + lib/cximage-6.0/CxImage/ximadsp.cpp | 182 +++++++++++++++++------------------ + lib/cximage-6.0/CxImage/ximage.cpp | 4 + lib/cximage-6.0/CxImage/ximagif.cpp | 6 - + lib/cximage-6.0/CxImage/ximahist.cpp | 12 +- + lib/cximage-6.0/CxImage/ximaint.cpp | 8 - + lib/cximage-6.0/CxImage/ximaiter.h | 4 + lib/cximage-6.0/CxImage/ximajpg.cpp | 2 + lib/cximage-6.0/CxImage/ximapal.cpp | 14 +- + lib/cximage-6.0/CxImage/ximapng.cpp | 12 +- + lib/cximage-6.0/CxImage/ximaraw.cpp | 4 + lib/cximage-6.0/CxImage/ximasel.cpp | 54 +++++----- + lib/cximage-6.0/CxImage/ximath.cpp | 8 - + lib/cximage-6.0/CxImage/ximatif.cpp | 6 - + lib/cximage-6.0/CxImage/ximatran.cpp | 138 +++++++++++++------------- + lib/cximage-6.0/CxImage/ximawnd.cpp | 16 +-- + 17 files changed, 238 insertions(+), 246 deletions(-) + +--- a/lib/cximage-6.0/CxImage/ximabmp.cpp ++++ b/lib/cximage-6.0/CxImage/ximabmp.cpp +@@ -46,7 +46,7 @@ bool CxImageBMP::Encode(CxFile * hFile) + bihtoh(&infohdr); + + // Write the file header +- hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1); ++ hFile->Write(&hdr,cmin(14,sizeof(BITMAPFILEHEADER)),1); + hFile->Write(&infohdr,sizeof(BITMAPINFOHEADER),1); + //and DIB+ALPHA interlaced + BYTE *srcalpha = AlphaGetPointer(); +@@ -64,7 +64,7 @@ bool CxImageBMP::Encode(CxFile * hFile) + #endif //CXIMAGE_SUPPORT_ALPHA + { + // Write the file header +- hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1); ++ hFile->Write(&hdr,cmin(14,sizeof(BITMAPFILEHEADER)),1); + //copy attributes + memcpy(pDib,&head,sizeof(BITMAPINFOHEADER)); + bihtoh((BITMAPINFOHEADER*)pDib); +@@ -86,7 +86,7 @@ bool CxImageBMP::Decode(CxFile * hFile) + BITMAPFILEHEADER bf; + DWORD off = hFile->Tell(); //<CSC> + cx_try { +- if (hFile->Read(&bf,min(14,sizeof(bf)),1)==0) cx_throw("Not a BMP"); ++ if (hFile->Read(&bf,cmin(14,sizeof(bf)),1)==0) cx_throw("Not a BMP"); + + bf.bfSize = my_ntohl(bf.bfSize); + bf.bfOffBits = my_ntohl(bf.bfOffBits); +--- a/lib/cximage-6.0/CxImage/ximadef.h ++++ b/lib/cximage-6.0/CxImage/ximadef.h +@@ -53,12 +53,8 @@ + #define CXIMAGE_SUPPORT_WINDOWS 0 + #endif + +-#ifndef min +-#define min(a,b) (((a)<(b))?(a):(b)) +-#endif +-#ifndef max +-#define max(a,b) (((a)>(b))?(a):(b)) +-#endif ++#define cmin(a,b) (((a)<(b))?(a):(b)) ++#define cmax(a,b) (((a)>(b))?(a):(b)) + + #ifndef PI + #define PI 3.141592653589793f +--- a/lib/cximage-6.0/CxImage/ximadsp.cpp ++++ b/lib/cximage-6.0/CxImage/ximadsp.cpp +@@ -389,8 +389,8 @@ RGBQUAD CxImage::RGBtoHSL(RGBQUAD lRGBCo + G = lRGBColor.rgbGreen; + B = lRGBColor.rgbBlue; + +- cMax = max( max(R,G), B); /* calculate lightness */ +- cMin = min( min(R,G), B); ++ cMax = cmax( cmax(R,G), B); /* calculate lightness */ ++ cMin = cmin( cmin(R,G), B); + L = (BYTE)((((cMax+cMin)*HSLMAX)+RGBMAX)/(2*RGBMAX)); + + if (cMax==cMin){ /* r=g=b --> achromatic case */ +@@ -489,9 +489,9 @@ RGBQUAD CxImage::YUVtoRGB(RGBQUAD lYUVCo + G = (int)( Y - 0.344f * U - 0.714f * V); + B = (int)( Y + 1.770f * U); + +- R= min(255,max(0,R)); +- G= min(255,max(0,G)); +- B= min(255,max(0,B)); ++ R= cmin(255,cmax(0,R)); ++ G= cmin(255,cmax(0,G)); ++ B= cmin(255,cmax(0,B)); + RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0}; + return rgb; + } +@@ -510,9 +510,9 @@ RGBQUAD CxImage::RGBtoYUV(RGBQUAD lRGBCo + U = (int)((B-Y) * 0.565f + 128); + V = (int)((R-Y) * 0.713f + 128); + +- Y= min(255,max(0,Y)); +- U= min(255,max(0,U)); +- V= min(255,max(0,V)); ++ Y= cmin(255,cmax(0,Y)); ++ U= cmin(255,cmax(0,U)); ++ V= cmin(255,cmax(0,V)); + RGBQUAD yuv={(BYTE)V,(BYTE)U,(BYTE)Y,0}; + return yuv; + } +@@ -528,9 +528,9 @@ RGBQUAD CxImage::YIQtoRGB(RGBQUAD lYIQCo + G = (int)( Y - 0.273f * I - 0.647f * Q); + B = (int)( Y - 1.104f * I + 1.701f * Q); + +- R= min(255,max(0,R)); +- G= min(255,max(0,G)); +- B= min(255,max(0,B)); ++ R= cmin(255,cmax(0,R)); ++ G= cmin(255,cmax(0,G)); ++ B= cmin(255,cmax(0,B)); + RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0}; + return rgb; + } +@@ -546,9 +546,9 @@ RGBQUAD CxImage::RGBtoYIQ(RGBQUAD lRGBCo + I = (int)( 0.5960f * R - 0.2742f * G - 0.3219f * B + 128); + Q = (int)( 0.2109f * R - 0.5229f * G + 0.3120f * B + 128); + +- Y= min(255,max(0,Y)); +- I= min(255,max(0,I)); +- Q= min(255,max(0,Q)); ++ Y= cmin(255,cmax(0,Y)); ++ I= cmin(255,cmax(0,I)); ++ Q= cmin(255,cmax(0,Q)); + RGBQUAD yiq={(BYTE)Q,(BYTE)I,(BYTE)Y,0}; + return yiq; + } +@@ -565,9 +565,9 @@ RGBQUAD CxImage::XYZtoRGB(RGBQUAD lXYZCo + G = (int)( -0.969256f * X + 1.875992f * Y + 0.041556f * Z * k); + B = (int)( 0.055648f * X - 0.204043f * Y + 1.057311f * Z * k); + +- R= min(255,max(0,R)); +- G= min(255,max(0,G)); +- B= min(255,max(0,B)); ++ R= cmin(255,cmax(0,R)); ++ G= cmin(255,cmax(0,G)); ++ B= cmin(255,cmax(0,B)); + RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0}; + return rgb; + } +@@ -583,9 +583,9 @@ RGBQUAD CxImage::RGBtoXYZ(RGBQUAD lRGBCo + Y = (int)( 0.212671f * R + 0.715160f * G + 0.072169f * B); + Z = (int)((0.019334f * R + 0.119193f * G + 0.950227f * B)*0.918483657f); + +- //X= min(255,max(0,X)); +- //Y= min(255,max(0,Y)); +- //Z= min(255,max(0,Z)); ++ //X= cmin(255,cmax(0,X)); ++ //Y= cmin(255,cmax(0,Y)); ++ //Z= cmin(255,cmax(0,Z)); + RGBQUAD xyz={(BYTE)Z,(BYTE)Y,(BYTE)X,0}; + return xyz; + } +@@ -707,7 +707,7 @@ bool CxImage::Light(long brightness, lon + + BYTE cTable[256]; //<nipper> + for (int i=0;i<256;i++) { +- cTable[i] = (BYTE)max(0,min(255,(int)((i-128)*c + brightness + 0.5f))); ++ cTable[i] = (BYTE)cmax(0,cmin(255,(int)((i-128)*c + brightness + 0.5f))); + } + + return Lut(cTable); +@@ -830,11 +830,11 @@ bool CxImage::Filter(long* kernel, long + } + } + if (Kfactor==0 || ksumcur==0){ +- cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b + Koffset))); ++ cPtr2[iY1] = (BYTE)cmin(255, cmax(0,(int)(b + Koffset))); + } else if (ksumtot == ksumcur) { +- cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset))); ++ cPtr2[iY1] = (BYTE)cmin(255, cmax(0,(int)(b/Kfactor + Koffset))); + } else { +- cPtr2[iY1] = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset))); ++ cPtr2[iY1] = (BYTE)cmin(255, cmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset))); + } + } + } +@@ -863,17 +863,17 @@ bool CxImage::Filter(long* kernel, long + } + } + if (Kfactor==0 || ksumcur==0){ +- c.rgbRed = (BYTE)min(255, max(0,(int)(r + Koffset))); +- c.rgbGreen = (BYTE)min(255, max(0,(int)(g + Koffset))); +- c.rgbBlue = (BYTE)min(255, max(0,(int)(b + Koffset))); ++ c.rgbRed = (BYTE)cmin(255, cmax(0,(int)(r + Koffset))); ++ c.rgbGreen = (BYTE)cmin(255, cmax(0,(int)(g + Koffset))); ++ c.rgbBlue = (BYTE)cmin(255, cmax(0,(int)(b + Koffset))); + } else if (ksumtot == ksumcur) { +- c.rgbRed = (BYTE)min(255, max(0,(int)(r/Kfactor + Koffset))); +- c.rgbGreen = (BYTE)min(255, max(0,(int)(g/Kfactor + Koffset))); +- c.rgbBlue = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset))); ++ c.rgbRed = (BYTE)cmin(255, cmax(0,(int)(r/Kfactor + Koffset))); ++ c.rgbGreen = (BYTE)cmin(255, cmax(0,(int)(g/Kfactor + Koffset))); ++ c.rgbBlue = (BYTE)cmin(255, cmax(0,(int)(b/Kfactor + Koffset)));
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.