RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:07:35 +00:00
Code Issues Activity Actions

LibGfx: Rename GraphicsBitmap.{cpp,h} => Bitmap.{cpp,h}

Browse source
This commit is contained in:
Andreas Kling 2020-02-06 12:07:05 +01:00
parent 9ac94d393e
commit c39d44fc2e
46 changed files with 51 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibGfx/GraphicsBitmap.cpp → Libraries/LibGfx/Bitmap.cpp
View file

@ -25,7 +25,7 @@
*/
#include <AK/MappedFile.h>
#include <LibGfx/GraphicsBitmap.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/PNGLoader.h>
#include <errno.h>
#include <fcntl.h>

0
Libraries/LibGfx/GraphicsBitmap.h → Libraries/LibGfx/Bitmap.h
View file

2
Libraries/LibGfx/Emoji.cpp
View file

@ -27,7 +27,7 @@
#include <AK/HashMap.h>
#include <AK/String.h>
#include <LibGfx/Emoji.h>
#include <LibGfx/GraphicsBitmap.h>
#include <LibGfx/Bitmap.h>
namespace Gfx {

2
Libraries/LibGfx/Font.cpp
View file

@ -26,7 +26,7 @@
#include "Font.h"
#include "Emoji.h"
#include "GraphicsBitmap.h"
#include "Bitmap.h"
#include <AK/BufferStream.h>
#include <AK/MappedFile.h>
#include <AK/StdLibExtras.h>

4
Libraries/LibGfx/GIFLoader.cpp
View file

@ -42,7 +42,7 @@ RefPtr<Gfx::Bitmap> load_gif(const StringView& path)
return nullptr;
auto bitmap = load_gif_impl((const u8*)mapped_file.data(), mapped_file.size());
if (bitmap)
bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded GIF: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded GIF: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
return bitmap;
}
@ -50,7 +50,7 @@ RefPtr<Gfx::Bitmap> load_gif_from_memory(const u8* data, size_t length)
{
auto bitmap = load_gif_impl(data, length);
if (bitmap)
bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded GIF: <memory>", bitmap->width(), bitmap->height()));
bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded GIF: <memory>", bitmap->width(), bitmap->height()));
return bitmap;
}

2
Libraries/LibGfx/GIFLoader.h
View file

@ -26,7 +26,7 @@
#pragma once
#include <LibGfx/GraphicsBitmap.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/ImageDecoder.h>
namespace Gfx {

12
Libraries/LibGfx/Makefile
View file

@ -1,18 +1,18 @@
OBJS = \
Bitmap.o \
CharacterBitmap.o \
Color.o \
DisjointRectSet.o \
Emoji.o \
Font.o \
GraphicsBitmap.o \
Painter.o \
PNGLoader.o \
GIFLoader.o \
ImageDecoder.o \
PNGLoader.o \
Painter.o \
Palette.o \
Rect.o \
StylePainter.o \
SystemTheme.o \
Palette.o \
Emoji.o
SystemTheme.o
LIBRARY = libgfx.a

4
Libraries/LibGfx/PNGLoader.cpp
View file

@ -179,7 +179,7 @@ RefPtr<Gfx::Bitmap> load_png(const StringView& path)
return nullptr;
auto bitmap = load_png_impl((const u8*)mapped_file.data(), mapped_file.size());
if (bitmap)
bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded PNG: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded PNG: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
return bitmap;
}
@ -187,7 +187,7 @@ RefPtr<Gfx::Bitmap> load_png_from_memory(const u8* data, size_t length)
{
auto bitmap = load_png_impl(data, length);
if (bitmap)
bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded PNG: <memory>", bitmap->width(), bitmap->height()));
bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded PNG: <memory>", bitmap->width(), bitmap->height()));
return bitmap;
}

2
Libraries/LibGfx/PNGLoader.h
View file

@ -26,7 +26,7 @@
#pragma once
#include <LibGfx/GraphicsBitmap.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/ImageDecoder.h>
namespace Gfx {

2
Libraries/LibGfx/Painter.cpp
View file

@ -27,7 +27,7 @@
#include "Painter.h"
#include "Emoji.h"
#include "Font.h"
#include "GraphicsBitmap.h"
#include "Bitmap.h"
#include <AK/Assertions.h>
#include <AK/StdLibExtras.h>
#include <AK/StringBuilder.h>

2
Libraries/LibGfx/StylePainter.cpp
View file

@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <LibGfx/GraphicsBitmap.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Painter.h>
#include <LibGfx/Palette.h>
#include <LibGfx/StylePainter.h>