mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused doc::Palette::make*Ramp() member functions

Browse Source
This commit is contained in:
David Capello 2015-06-17 17:02:43 -03:00
parent 1c84471e24
commit 312e3f9da0
3 changed files with 3 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/ui/color_bar.cpp
View File

@ -668,7 +668,7 @@ void ColorBar::onGradient()
return;
Palette newPalette(*get_current_palette());
newPalette.makeHorzRamp(index1, index2);
newPalette.makeGradient(index1, index2);
setPalette(&newPalette, "Gradient");
}

69
src/doc/palette.cpp
View File

@ -150,7 +150,7 @@ void Palette::makeBlack()
}
// Creates a linear ramp in the palette.
void Palette::makeHorzRamp(int from, int to)
void Palette::makeGradient(int from, int to)
{
int r, g, b;
int r1, g1, b1;
@ -182,73 +182,6 @@ void Palette::makeHorzRamp(int from, int to)
}
}
void Palette::makeVertRamp(int from, int to, int columns)
{
int r, g, b;
int r1, g1, b1;
int r2, g2, b2;
int y, ybeg, yend, n;
int offset;
ASSERT(from >= 0 && from <= 255);
ASSERT(to >= 0 && to <= 255);
ASSERT(columns >= 1 && columns <= MaxColors);
/* both indices have to be in the same column */
ASSERT((from % columns) == (to % columns));
if (from > to)
std::swap(from, to);
ybeg = from/columns;
yend = to/columns;
n = yend - ybeg;
if (n < 2)
return;
r1 = rgba_getr(getEntry(from));
g1 = rgba_getg(getEntry(from));
b1 = rgba_getb(getEntry(from));
r2 = rgba_getr(getEntry(to));
g2 = rgba_getg(getEntry(to));
b2 = rgba_getb(getEntry(to));
offset = from % columns;
for (y=ybeg+1; y<yend; ++y) {
r = r1 + (r2-r1) * (y-ybeg) / n;
g = g1 + (g2-g1) * (y-ybeg) / n;
b = b1 + (b2-b1) * (y-ybeg) / n;
setEntry(y*columns+offset, rgba(r, g, b, 255));
}
}
// Creates a rectangular ramp in the palette
void Palette::makeRectRamp(int from, int to, int columns)
{
int x1, y1, x2, y2, y;
ASSERT(from >= 0 && from <= 255);
ASSERT(to >= 0 && to <= 255);
ASSERT(columns >= 1 && columns <= MaxColors);
if (from > to)
std::swap(from, to);
x1 = from % columns;
y1 = from / columns;
x2 = to % columns;
y2 = to / columns;
makeVertRamp(from, y2*columns+x1, columns);
if (x1 < x2) {
makeVertRamp(y1*columns+x2, to, columns);
if (x2 - x1 >= 2)
for (y=y1; y<=y2; ++y)
makeHorzRamp(y*columns+x1, y*columns+x2);
}
}
int Palette::findExactMatch(int r, int g, int b) const
{
for (int i=0; i<(int)m_colors.size(); ++i)

4
src/doc/palette.h
View File

@ -62,9 +62,7 @@ namespace doc {
bool isBlack() const;
void makeBlack();
void makeHorzRamp(int from, int to);
void makeVertRamp(int from, int to, int columns);
void makeRectRamp(int from, int to, int columns);
void makeGradient(int from, int to);
int findExactMatch(int r, int g, int b) const;
int findBestfit(int r, int g, int b, int mask_index = 0) const;