medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

[fbreader] Added ZLColor::RGB_MASK

Browse source
This commit is contained in:
Slava Monich 2022-10-29 20:09:23 +03:00
parent 327ba014d1
commit 4cc749ff63
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fbreader/fbreader/zlibrary/core/src/util/ZLColor.h
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com> * Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com>
* Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com> * Copyright (C) 2015-2022 Slava Monich <slava.monich@jolla.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -28,6 +28,7 @@ struct ZLColor {
unsigned char Blue; unsigned char Blue;
static const unsigned long ALPHA_MASK = 0xff000000; static const unsigned long ALPHA_MASK = 0xff000000;
static const unsigned long RGB_MASK = 0x00ffffff;
ZLColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a); ZLColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
ZLColor(unsigned char r, unsigned char g, unsigned char b); ZLColor(unsigned char r, unsigned char g, unsigned char b);
@ -37,7 +38,7 @@ struct ZLColor {
unsigned long intValue(); unsigned long intValue();
static unsigned long rgbValue(unsigned long rgb, unsigned char a = 0xff); static unsigned long rgbValue(unsigned long rgb, unsigned char a = 0xff);
bool equals(const ZLColor color) const; bool equals(const ZLColor& color) const;
bool operator == (const ZLColor &color) const; bool operator == (const ZLColor &color) const;
bool operator != (const ZLColor &color) const; bool operator != (const ZLColor &color) const;
}; };
@ -48,7 +49,7 @@ inline ZLColor::ZLColor(unsigned long argb) : Alpha((unsigned char)(argb >> 24)
inline void ZLColor::setIntValue(unsigned long argb) { Alpha = (unsigned char)(argb >> 24); Red = (unsigned char)(argb >> 16); Green = (unsigned char)(argb >> 8); Blue = (unsigned char)argb; } inline void ZLColor::setIntValue(unsigned long argb) { Alpha = (unsigned char)(argb >> 24); Red = (unsigned char)(argb >> 16); Green = (unsigned char)(argb >> 8); Blue = (unsigned char)argb; }
inline unsigned long ZLColor::intValue() { return (((unsigned long)Alpha) << 24) | (((unsigned long)Red) << 16) | (((unsigned long)Green) << 8) | (unsigned long)Blue; } inline unsigned long ZLColor::intValue() { return (((unsigned long)Alpha) << 24) | (((unsigned long)Red) << 16) | (((unsigned long)Green) << 8) | (unsigned long)Blue; }
inline unsigned long ZLColor::rgbValue(unsigned long rgb, unsigned char a) { return (((unsigned long)a) << 24) | rgb; } inline unsigned long ZLColor::rgbValue(unsigned long rgb, unsigned char a) { return (((unsigned long)a) << 24) | rgb; }
inline bool ZLColor::equals(const ZLColor color) const { return (Red == color.Red) && (Green == color.Green) && (Blue == color.Blue) && (Alpha == color.Alpha); } inline bool ZLColor::equals(const ZLColor& color) const { return (Red == color.Red) && (Green == color.Green) && (Blue == color.Blue) && (Alpha == color.Alpha); }
inline bool ZLColor::operator == (const ZLColor &color) const { return equals(color); } inline bool ZLColor::operator == (const ZLColor &color) const { return equals(color); }
inline bool ZLColor::operator != (const ZLColor &color) const { return !equals(color); } inline bool ZLColor::operator != (const ZLColor &color) const { return !equals(color); }