mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-10 21:44:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change "old-ordered" dithering algorithm to just "old"

Browse Source
This commit is contained in:
David Capello 2017-05-23 14:56:06 -03:00
parent 523b6a0a51
commit 4fc19c5466
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/cli/app_options.cpp
View File

@ -34,7 +34,7 @@ AppOptions::AppOptions(int argc, const char* argv[])
, m_saveAs(m_po.add("save-as").requiresValue("<filename>").description("Save the last given sprite with other format"))
, m_palette(m_po.add("palette").requiresValue("<filename>").description("Change the palette of the last given sprite"))
, m_scale(m_po.add("scale").requiresValue("<factor>").description("Resize all previously opened sprites"))
, m_ditheringAlgorithm(m_po.add("dithering-algorithm").requiresValue("<algorithm>").description("Dithering algorithm used in --color-mode\nto convert images from RGB to Indexed\n none\n ordered\n old-ordered"))
, m_ditheringAlgorithm(m_po.add("dithering-algorithm").requiresValue("<algorithm>").description("Dithering algorithm used in --color-mode\nto convert images from RGB to Indexed\n none\n ordered\n old"))
, m_ditheringMatrix(m_po.add("dithering-matrix").requiresValue("<id>").description("Matrix used in ordered dithering algorithm\n bayer2x2\n bayer4x4\n bayer8x8\n filename.png"))
, m_colorMode(m_po.add("color-mode").requiresValue("<mode>").description("Change color mode of all previously\nopened sprites:\n rgb\n grayscale\n indexed"))
, m_shrinkTo(m_po.add("shrink-to").requiresValue("width,height").description("Shrink each sprite if it is\nlarger than width or height"))

12
src/app/cli/cli_processor.cpp
View File

@ -349,14 +349,14 @@ void CliProcessor::process()
else if (opt == &m_options.ditheringAlgorithm()) {
if (value.value() == "none")
ditheringAlgorithm = render::DitheringAlgorithm::None;
else if (value.value() == "old-ordered")
ditheringAlgorithm = render::DitheringAlgorithm::OldOrdered;
else if (value.value() == "ordered")
ditheringAlgorithm = render::DitheringAlgorithm::Ordered;
else if (value.value() == "old")
ditheringAlgorithm = render::DitheringAlgorithm::Old;
else
throw std::runtime_error("--dithering-algorithm needs a valid algorithm name\n"
"Usage: --dithering-algorithm <algorithm>\n"
"Where <algorithm> can be none, old-ordered, or ordered");
"Where <algorithm> can be none, ordered, or old");
}
// --dithering-matrix <id>
else if (opt == &m_options.ditheringMatrix()) {
@ -378,12 +378,12 @@ void CliProcessor::process()
case render::DitheringAlgorithm::None:
params.set("dithering", "none");
break;
case render::DitheringAlgorithm::OldOrdered:
params.set("dithering", "old-ordered");
break;
case render::DitheringAlgorithm::Ordered:
params.set("dithering", "ordered");
break;
case render::DitheringAlgorithm::Old:
params.set("dithering", "old");
break;
}
if (ditheringAlgorithm != render::DitheringAlgorithm::None &&

10
src/app/commands/cmd_change_pixel_format.cpp
View File

@ -365,8 +365,8 @@ void ChangePixelFormatCommand::onLoadParams(const Params& params)
std::string dithering = params.get("dithering");
if (dithering == "ordered")
m_ditheringAlgorithm = render::DitheringAlgorithm::Ordered;
else if (dithering == "old-ordered")
m_ditheringAlgorithm = render::DitheringAlgorithm::OldOrdered;
else if (dithering == "old")
m_ditheringAlgorithm = render::DitheringAlgorithm::Old;
else
m_ditheringAlgorithm = render::DitheringAlgorithm::None;
@ -517,12 +517,12 @@ std::string ChangePixelFormatCommand::onGetFriendlyName() const
switch (m_ditheringAlgorithm) {
case render::DitheringAlgorithm::None:
break;
case render::DitheringAlgorithm::OldOrdered:
text += " with Old Ordered Dithering";
break;
case render::DitheringAlgorithm::Ordered:
text += " with Ordered Dithering";
break;
case render::DitheringAlgorithm::Old:
text += " with Old Dithering";
break;
}
break;
case IMAGE_GRAYSCALE:

6
src/app/ui/dithering_selector.cpp
View File

@ -124,11 +124,11 @@ DitheringSelector::DitheringSelector()
render::BayerMatrix(4), "Ordered Dithering - Bayer Matrix 4x4"));
addItem(new DitherItem(render::DitheringAlgorithm::Ordered,
render::BayerMatrix(2), "Ordered Dithering - Bayer Matrix 2x2"));
addItem(new DitherItem(render::DitheringAlgorithm::OldOrdered,
addItem(new DitherItem(render::DitheringAlgorithm::Old,
render::BayerMatrix(8), "Old Dithering - Bayer Matrix 8x8"));
addItem(new DitherItem(render::DitheringAlgorithm::OldOrdered,
addItem(new DitherItem(render::DitheringAlgorithm::Old,
render::BayerMatrix(4), "Old Dithering - Bayer Matrix 4x4"));
addItem(new DitherItem(render::DitheringAlgorithm::OldOrdered,
addItem(new DitherItem(render::DitheringAlgorithm::Old,
render::BayerMatrix(2), "Old Dithering - Bayer Matrix 2x2"));
setSelectedItemIndex(0);

2
src/render/dithering_algorithm.h
View File

@ -13,8 +13,8 @@ namespace render {
// Dithering algorithms
enum class DitheringAlgorithm {
None,
OldOrdered,
Ordered,
Old,
};
} // namespace render

6
src/render/quantization.cpp
View File

@ -99,12 +99,12 @@ Image* convert_pixel_format(
ditheringAlgorithm != DitheringAlgorithm::None) {
base::UniquePtr<DitheringAlgorithmBase> dither;
switch (ditheringAlgorithm) {
case DitheringAlgorithm::OldOrdered:
dither.reset(new OrderedDither(is_background ? -1: new_mask_color));
break;
case DitheringAlgorithm::Ordered:
dither.reset(new OrderedDither2(is_background ? -1: new_mask_color));
break;
case DitheringAlgorithm::Old:
dither.reset(new OrderedDither(is_background ? -1: new_mask_color));
break;
}
if (dither)
dither_rgb_image_to_indexed(