i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app_server: Add casts to appease GCC 11 -Wclass-memaccess.

Browse Source
This commit is contained in:
Augustin Cavalier
2021-11-17 14:00:10 -05:00
parent 46c49135a0
commit 44e3766be5
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/DesktopSettings.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ DesktopSettingsPrivate::_SetDefaults()
fWorkspacesColumns = 2;
fWorkspacesRows = 2;
memcpy(fShared.colors, BPrivate::kDefaultColors,
memcpy((void*)fShared.colors, BPrivate::kDefaultColors,
sizeof(rgb_color) * kColorWhichCount);
gSubpixelAntialiasing = true;
src/servers/app/SystemPalette.cpp
+9 -9
View File
@@ -7,7 +7,7 @@
* Stefano Ceccherini ([email protected])
*/
//! Methods to initialize and get the system color_map.
//! Methods to initialize and get the system color_map.
#include "SystemPalette.h"
@@ -50,7 +50,7 @@ color_distance(uint8 red1, uint8 green1, uint8 blue1,
int rmean = ((int)red1 + (int)red2) / 2;
return (((512 + rmean) * rd * rd) >> 8)
+ 4 * gd * gd
+ (((767 - rmean) * bd * bd) >> 8);
+ (((767 - rmean) * bd * bd) >> 8);
}
@@ -80,13 +80,13 @@ InvertColor(const rgb_color &color)
if (color.red == 255 && color.green == 255
&& color.blue == 255)
return color;
rgb_color inverted;
inverted.red = 255 - color.red;
inverted.green = 255 - color.green;
inverted.blue = 255 - color.blue;
inverted.alpha = 255;
return inverted;
}
@@ -94,8 +94,8 @@ InvertColor(const rgb_color &color)
static void
FillColorMap(const rgb_color *palette, color_map *map)
{
memcpy(map->color_list, palette, sizeof(map->color_list));
memcpy((void*)map->color_list, palette, sizeof(map->color_list));
// init index map
for (int32 color = 0; color < 32768; color++) {
// get components
@@ -103,14 +103,14 @@ FillColorMap(const rgb_color *palette, color_map *map)
rgbColor.red = (color & 0x7c00) >> 7;
rgbColor.green = (color & 0x3e0) >> 2;
rgbColor.blue = (color & 0x1f) << 3;
map->index_map[color] = FindClosestColor(rgbColor, palette);
}
// init inversion map
for (int32 index = 0; index < 256; index++) {
rgb_color inverted = InvertColor(map->color_list[index]);
map->inversion_map[index] = FindClosestColor(inverted, palette);
map->inversion_map[index] = FindClosestColor(inverted, palette);
}
}
src/servers/app/drawing/PatternHandler.cpp
+15 -15
View File
@@ -22,8 +22,8 @@ const rgb_color kWhite = (rgb_color){ 255, 255, 255, 255 };
/*!
\brief Void constructor
The pattern is set to B_SOLID_HIGH, high color is set to black, and
The pattern is set to B_SOLID_HIGH, high color is set to black, and
low color is set to white.
*/
PatternHandler::PatternHandler(void)
@@ -34,14 +34,14 @@ PatternHandler::PatternHandler(void)
fYOffset(0),
fColorsWhenCached(ULONGLONG_MAX)
{
memset(fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
memset((void*)fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
}
/*!
\brief Constructor initializes to given pattern
\param pat Pattern to use.
This initializes to the given pattern or B_SOLID_HIGH if the pattern
This initializes to the given pattern or B_SOLID_HIGH if the pattern
is NULL. High color is set to black, and low color is set to white.
*/
PatternHandler::PatternHandler(const int8* pat)
@@ -52,14 +52,14 @@ PatternHandler::PatternHandler(const int8* pat)
fYOffset(0),
fColorsWhenCached(ULONGLONG_MAX)
{
memset(fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
memset((void*)fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
}
/*!
\brief Constructor initializes to given pattern
\param pat Pattern to use.
This initializes to the given pattern or B_SOLID_HIGH if the pattern
This initializes to the given pattern or B_SOLID_HIGH if the pattern
is NULL. High color is set to black, and low color is set to white.
*/
PatternHandler::PatternHandler(const uint64& pat)
@@ -70,13 +70,13 @@ PatternHandler::PatternHandler(const uint64& pat)
fYOffset(0),
fColorsWhenCached(ULONGLONG_MAX)
{
memset(fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
memset((void*)fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
}
/*!
\brief Constructor initializes to given pattern
\param pat Pattern to use.
This initializes to the given Pattern.
High color is set to black, and low color is set to white.
*/
@@ -88,13 +88,13 @@ PatternHandler::PatternHandler(const Pattern& pat)
fYOffset(0),
fColorsWhenCached(ULONGLONG_MAX)
{
memset(fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
memset((void*)fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
}
/*!
\brief Constructor initializes to given PatternHandler
\param other PatternHandler to copy.
Copy constructor.
*/
PatternHandler::PatternHandler(const PatternHandler& other)
@@ -105,7 +105,7 @@ PatternHandler::PatternHandler(const PatternHandler& other)
fYOffset(other.fYOffset),
fColorsWhenCached(ULONGLONG_MAX)
{
memset(fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
memset((void*)fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
}
//! Destructor does nothing
@@ -116,8 +116,8 @@ PatternHandler::~PatternHandler(void)
/*!
\brief Sets the pattern for the handler to the one given
\param pat Pattern to use.
This initializes to the given pattern or B_SOLID_HIGH if the pattern
This initializes to the given pattern or B_SOLID_HIGH if the pattern
is NULL.
*/
void