mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

56 lines
2.1 KiB

  1. --- ./Sources/Core/System/Unix/appconf.h.orig 2004-05-14 12:00:47.877665592 +0200
  2. +++ ./Sources/Core/System/Unix/appconf.h 2004-05-14 12:01:09.510376920 +0200
  3. @@ -527,7 +527,9 @@
  4. //protected: --- if FileConfig::ConfigEntry is not public, functions in
  5. // ConfigGroup such as Find/AddEntry can't return ConfigEntry*!
  6. + protected:
  7. class ConfigGroup;
  8. + public:
  9. class ConfigEntry
  10. {
  11. private:
  12. --- ./Sources/Display/Display/Generic/blit_alphamask_rle.h.orig 2004-05-14 12:30:42.314047056 +0200
  13. +++ ./Sources/Display/Display/Generic/blit_alphamask_rle.h 2004-05-14 12:35:45.472959896 +0200
  14. @@ -107,14 +107,14 @@
  15. {
  16. T a = alpha_data[x];
  17. T destval = dst_data[x];
  18. - T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
  19. - T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
  20. - T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
  21. + T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
  22. + T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
  23. + T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
  24. T amix =
  25. - (r<<rstart) +
  26. - (g<<gstart) +
  27. - (b<<bstart);
  28. + (r<<this->rstart) +
  29. + (g<<this->gstart) +
  30. + (b<<this->bstart);
  31. dst_data[x] = amix + *(src_data++);
  32. }
  33. @@ -151,13 +151,13 @@
  34. {
  35. T a = alpha_data[x];
  36. T destval = dst_buf[x];
  37. - T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
  38. - T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
  39. - T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
  40. + T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
  41. + T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
  42. + T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
  43. T amix =
  44. - (r<<rstart) +
  45. - (g<<gstart) +
  46. - (b<<bstart);
  47. + (r<<this->rstart) +
  48. + (g<<this->gstart) +
  49. + (b<<this->bstart);
  50. dst_buf[x] = amix + *(src_data++);
  51. }
  52. memcpy(dst_data, dst_buf, sizeof(T)*rep);