From 188027bccce01fc744a845c0626c7c6c8559966c Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Tue, 22 Mar 2022 18:42:33 +0100 Subject: [PATCH] Rename `convert` to `process` More consistent with its "main" function's name --- Makefile | 2 +- include/gfx/{convert.hpp => process.hpp} | 0 src/CMakeLists.txt | 2 +- src/gfx/main.cpp | 2 +- src/gfx/pal_sorting.cpp | 2 +- src/gfx/{convert.cpp => process.cpp} | 5 +++-- 6 files changed, 7 insertions(+), 6 deletions(-) rename include/gfx/{convert.hpp => process.hpp} (100%) rename src/gfx/{convert.cpp => process.cpp} (99%) diff --git a/Makefile b/Makefile index 9c8f0adb..dab6c013 100644 --- a/Makefile +++ b/Makefile @@ -105,10 +105,10 @@ rgbfix_obj := \ src/error.o rgbgfx_obj := \ - src/gfx/convert.o \ src/gfx/main.o \ src/gfx/pal_packing.o \ src/gfx/pal_sorting.o \ + src/gfx/process.o \ src/gfx/proto_palette.o \ src/gfx/rgba.o \ src/extern/getopt.o \ diff --git a/include/gfx/convert.hpp b/include/gfx/process.hpp similarity index 100% rename from include/gfx/convert.hpp rename to include/gfx/process.hpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a41b2214..6273d74f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,10 +70,10 @@ set(rgbfix_src ) set(rgbgfx_src - "gfx/convert.cpp" "gfx/main.cpp" "gfx/pal_packing.cpp" "gfx/pal_sorting.cpp" + "gfx/process.cpp" "gfx/proto_palette.cpp" "gfx/rgba.cpp" "extern/getopt.c" diff --git a/src/gfx/main.cpp b/src/gfx/main.cpp index 403f0b21..08e3dc38 100644 --- a/src/gfx/main.cpp +++ b/src/gfx/main.cpp @@ -24,7 +24,7 @@ #include "platform.h" #include "version.h" -#include "gfx/convert.hpp" +#include "gfx/process.hpp" using namespace std::literals::string_view_literals; diff --git a/src/gfx/pal_sorting.cpp b/src/gfx/pal_sorting.cpp index 8377dc60..abf50fad 100644 --- a/src/gfx/pal_sorting.cpp +++ b/src/gfx/pal_sorting.cpp @@ -7,8 +7,8 @@ #include "helpers.h" -#include "gfx/convert.hpp" #include "gfx/main.hpp" +#include "gfx/process.hpp" namespace sorting { diff --git a/src/gfx/convert.cpp b/src/gfx/process.cpp similarity index 99% rename from src/gfx/convert.cpp rename to src/gfx/process.cpp index aa0249a0..cb1255e1 100644 --- a/src/gfx/convert.cpp +++ b/src/gfx/process.cpp @@ -6,7 +6,7 @@ * SPDX-License-Identifier: MIT */ -#include "gfx/convert.hpp" +#include "gfx/process.hpp" #include #include @@ -687,7 +687,8 @@ static void outputTileData(Png const &png, DefaultInitVec const &a for (auto tile : png.visitAsTiles(options.columnMajor)) { size_t protoPaletteID = iter->protoPaletteID; // If the tile is fully transparent, default to palette 0 - Palette const &palette = palettes[protoPaletteID != AttrmapEntry::transparent ? mappings[protoPaletteID] : 0]; + Palette const &palette = + palettes[protoPaletteID != AttrmapEntry::transparent ? mappings[protoPaletteID] : 0]; for (uint32_t y = 0; y < 8; ++y) { uint16_t bitplanes = TileData::rowBitplanes(tile, palette, y); output.sputc(bitplanes & 0xFF);