mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 04:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0'

Browse Source 
Conflicts:
	src/raster/conversion_alleg.cpp
This commit is contained in:
David Capello 2015-01-03 18:42:11 -03:00
commit 1b55fe39dc
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/color.cpp
View File

@ -86,7 +86,7 @@ Color Color::fromIndex(int index)
// static
Color Color::fromImage(PixelFormat pixelFormat, color_t c)
{
Color color = Color::fromMask();
Color color = app::Color::fromMask();
switch (pixelFormat) {
@ -124,7 +124,7 @@ Color Color::fromImageGetPixel(Image *image, int x, int y)
// static
Color Color::fromString(const std::string& str)
{
Color color = Color::fromMask();
Color color = app::Color::fromMask();
if (str != "mask") {
if (str.find("rgb{") == 0 ||

1
src/doc/algorithm/floodfill.cpp
View File

@ -97,6 +97,7 @@ template<typename ImageTraits>
static inline bool color_equal(color_t c1, color_t c2, int tolerance)
{
static_assert(false && sizeof(ImageTraits), "Invalid color comparison");
return false;
}
template<>

1
src/doc/conversion_she.cpp
View File

@ -30,6 +30,7 @@ namespace {
template<typename ImageTraits, she::SurfaceFormat format>
uint32_t convert_color_to_surface(color_t color, const Palette* palette, const she::SurfaceFormatData* fd) {
static_assert(false && sizeof(ImageTraits), "Invalid color conversion");
return 0;
}
template<>