Fix build with gcc-3.4.2
Submitted by: Alexey Dokuchaev <danfe@nsu.ru>
This commit is contained in:
parent
ee41da1092
commit
a7688ff558
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=115249
12
devel/clanlib/files/patch-Sources_Core_System_Unix_appconf.h
Normal file
12
devel/clanlib/files/patch-Sources_Core_System_Unix_appconf.h
Normal file
@ -0,0 +1,12 @@
|
||||
--- Sources/Core/System/Unix/appconf.h.orig Wed May 3 20:29:00 2000
|
||||
+++ Sources/Core/System/Unix/appconf.h Mon Aug 2 10:19:18 2004
|
||||
@@ -527,7 +527,9 @@
|
||||
|
||||
//protected: --- if FileConfig::ConfigEntry is not public, functions in
|
||||
// ConfigGroup such as Find/AddEntry can't return ConfigEntry*!
|
||||
+protected:
|
||||
class ConfigGroup;
|
||||
+public:
|
||||
class ConfigEntry
|
||||
{
|
||||
private:
|
@ -0,0 +1,43 @@
|
||||
--- Sources/Display/Display/Generic/blit_alphamask_rle.h.orig Mon Aug 2 10:47:18 2004
|
||||
+++ Sources/Display/Display/Generic/blit_alphamask_rle.h Mon Aug 2 10:49:31 2004
|
||||
@@ -107,14 +107,14 @@
|
||||
{
|
||||
T a = alpha_data[x];
|
||||
T destval = dst_data[x];
|
||||
- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
|
||||
- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
|
||||
- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
|
||||
+ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
|
||||
+ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
|
||||
+ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
|
||||
|
||||
T amix =
|
||||
- (r<<rstart) +
|
||||
- (g<<gstart) +
|
||||
- (b<<bstart);
|
||||
+ (r<<this->rstart) +
|
||||
+ (g<<this->gstart) +
|
||||
+ (b<<this->bstart);
|
||||
|
||||
dst_data[x] = amix + *(src_data++);
|
||||
}
|
||||
@@ -151,13 +151,13 @@
|
||||
{
|
||||
T a = alpha_data[x];
|
||||
T destval = dst_buf[x];
|
||||
- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
|
||||
- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
|
||||
- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
|
||||
+ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
|
||||
+ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
|
||||
+ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
|
||||
T amix =
|
||||
- (r<<rstart) +
|
||||
- (g<<gstart) +
|
||||
- (b<<bstart);
|
||||
+ (r<<this->rstart) +
|
||||
+ (g<<this->gstart) +
|
||||
+ (b<<this->bstart);
|
||||
dst_buf[x] = amix + *(src_data++);
|
||||
}
|
||||
memcpy(dst_data, dst_buf, sizeof(T)*rep);
|
Loading…
Reference in New Issue
Block a user