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 'master' of git@github.com:aseprite/aseprite.git

Browse Source
This commit is contained in:
David Capello 2015-01-03 18:34:39 -03:00
commit a2a3abfd6e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gen/pref_types.cpp
View File

@ -13,6 +13,7 @@
#include "gen/pref_types.h"
#include <iostream>
#include <stdexcept>
#include <vector>
typedef std::vector<TiXmlElement*> XmlElements;

10
src/render/median_cut.h
View File

@ -8,6 +8,8 @@
#define RENDER_MEDIAN_CUT_H_INCLUDED
#pragma once
#include "doc/color.h"
#include <list>
#include <queue>
@ -97,12 +99,12 @@ namespace render {
// No colors in the box? This should not be possible.
ASSERT(count > 0 && "Box without histogram points, you must fill the histogram before using this function.");
if (count == 0)
return rgba(0, 0, 0, 255);
return doc::rgba(0, 0, 0, 255);
// Returns the mean.
return rgba((255 * r / (Histogram::RElements-1)) / count,
(255 * g / (Histogram::GElements-1)) / count,
(255 * b / (Histogram::BElements-1)) / count, 255);
return doc::rgba((255 * r / (Histogram::RElements-1)) / count,
(255 * g / (Histogram::GElements-1)) / count,
(255 * b / (Histogram::BElements-1)) / count, 255);
}
// The boxes will be sort in the priority_queue by volume.