1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
diff -Naur xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp
--- xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp 2009-10-24 06:12:27.000000000 +0200
+++ xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/DllInterface.cpp 2010-01-02 10:49:17.000000000 +0100
@@ -188,7 +188,6 @@
int ResampleKeepAspectArea(CxImage &image, unsigned int area)
{
- bool bResize = false;
float fAspect = ((float)image.GetWidth()) / ((float)image.GetHeight());
unsigned int width = (unsigned int)sqrt(area * fAspect);
unsigned int height = (unsigned int)sqrt(area / fAspect);
diff -Naur xbmc-9.11.orig/xbmc/linux/NetworkLinux.cpp xbmc-9.11/xbmc/linux/NetworkLinux.cpp
--- xbmc-9.11.orig/xbmc/linux/NetworkLinux.cpp 2009-11-20 05:52:25.000000000 +0100
+++ xbmc-9.11/xbmc/linux/NetworkLinux.cpp 2010-01-03 05:25:29.000000000 +0100
@@ -636,6 +636,7 @@
if (!fw)
{
// TODO
+ fclose(fr);
return;
}
diff -Naur xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h
--- xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h 2009-07-06 10:12:52.000000000 +0200
+++ xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/Core/NptUtils.h 2010-01-02 08:26:18.000000000 +0100
@@ -205,7 +205,7 @@
#endif
#if defined(NPT_CONFIG_HAVE_MEMSET)
-#define NPT_SetMemory memset
+#define NPT_SetMemory(dest, c, s) memset(dest, c, s)
#else
extern void NPT_SetMemory(void* dest, int c, NPT_Size size);
#endif
diff -Naur xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp
--- xbmc-9.11.orig/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp 2009-10-10 12:22:06.000000000 +0200
+++ xbmc-9.11/xbmc/lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp 2010-01-02 08:26:48.000000000 +0100
@@ -90,7 +90,7 @@
time_t ltime;
struct tm gmt;
- NPT_SetMemory(&gmt, sizeof(gmt), 0);
+ NPT_SetMemory(&gmt, 0, sizeof(gmt));
ltime = (time_t) time.m_Seconds;
int result = gmtime_s(&gmt, <ime);
@@ -112,7 +112,7 @@
time_t ltime;
struct tm local;
- NPT_SetMemory(&local, sizeof(local), 0);
+ NPT_SetMemory(&local, 0, sizeof(local));
/* get the current time stamp */
NPT_CHECK_SEVERE(NPT_System::GetCurrentTimeStamp(now));
|
