Pixie.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. --- Pixie/src/common/mathSpec.h.orig 2017-07-05 02:13:02.301256099 +0700
  2. +++ Pixie/src/common/mathSpec.h 2017-07-05 02:12:40.349255850 +0700
  3. @@ -7,6 +7,9 @@
  4. +#define min(a,b) ((a)<(b)?(a):(b))
  5. +#define max(a,b) ((a)>(b)?(a):(b))
  6. +
  7. inline void initv(SCALAR_TYPE *r,const SCALAR_TYPE x) {
  8. r[0] = x;
  9. r[1] = x;
  10. --- Pixie/src/common/containers.h.orig 2017-07-05 02:14:23.367257020 +0700
  11. +++ Pixie/src/common/containers.h 2017-07-05 02:15:14.528257601 +0700
  12. @@ -50,7 +50,8 @@
  13. -
  14. +#define min(a,b) ((a)<(b)?(a):(b))
  15. +#define max(a,b) ((a)>(b)?(a):(b))
  16. ///////////////////////////////////////////////////////////////////////
  17. // Class : CDictionary
  18. --- Pixie/src/ri/memory.h.orig 2017-07-05 02:18:00.590259487 +0700
  19. +++ Pixie/src/ri/memory.h 2017-07-05 02:18:11.143259607 +0700
  20. @@ -36,6 +36,9 @@
  21. #include <string.h>
  22. +#define min(a,b) ((a)<(b)?(a):(b))
  23. +#define max(a,b) ((a)>(b)?(a):(b))
  24. +
  25. ///////////////////////////////////////////////////////////////////////
  26. // Class : CMemPage
  27. // Description : This class coltains memory that's allocated on the fly
  28. --- Pixie/src/ri/occlusion.h.orig 2017-07-05 02:23:25.745263181 +0700
  29. +++ Pixie/src/ri/occlusion.h 2017-07-05 02:23:35.920263297 +0700
  30. @@ -34,6 +34,9 @@
  31. #include "common/global.h"
  32. #include "common/os.h"
  33. +#define min(a,b) ((a)<(b)?(a):(b))
  34. +#define max(a,b) ((a)>(b)?(a):(b))
  35. +
  36. ///////////////////////////////////////////////////////////////////////
  37. // Class : COcclusionCuller
  38. // Description : The occlusion culler class