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.
 
 
 
 
 
 

72 lines
2.8 KiB

# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../clanlib06/gcc34.patch
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Sources/Core/System/Unix/appconf.h.orig 2004-05-14 12:00:47.877665592 +0200
+++ ./Sources/Core/System/Unix/appconf.h 2004-05-14 12:01:09.510376920 +0200
@@ -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:
--- ./Sources/Display/Display/Generic/blit_alphamask_rle.h.orig 2004-05-14 12:30:42.314047056 +0200
+++ ./Sources/Display/Display/Generic/blit_alphamask_rle.h 2004-05-14 12:35:45.472959896 +0200
@@ -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);