LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-07 19:57:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibCore: Move puff() from LibDraw to LibCore

Browse Source 
Since it's used both by CGzip and PNGLoader, it seems most appropriate
to keep this in LibCore.
This commit is contained in:
Andreas Kling 2019-11-23 23:43:37 +01:00
parent 600c15aa3a
commit 35c26a06fc
Notes: sideshowbarker 2024-07-19 11:05:59 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/35c26a06fce
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Libraries/LibCore/CGzip.cpp
View File

@ -1,12 +1,11 @@
#include "CGzip.h"
#include <AK/ByteBuffer.h>
#include <AK/Optional.h>
#include <LibCore/puff.h>
#include <LibCore/puff.c>
#include <limits.h>
#include <stddef.h>
#include <LibDraw/puff.h>
bool CGzip::is_compressed(const ByteBuffer& data)
{
return data.size() > 2 && data[0] == 0x1F && data[1] == 0x8b;
@ -120,4 +119,4 @@ Optional<ByteBuffer> CGzip::decompress(const ByteBuffer& data)
}
return destination;
}
}

0
Libraries/LibDraw/puff.c → Libraries/LibCore/puff.c
View File

0
Libraries/LibDraw/puff.h → Libraries/LibCore/puff.h
View File

2
Libraries/LibDraw/PNGLoader.cpp
View File

@ -1,8 +1,8 @@
#include <AK/FileSystemPath.h>
#include <AK/MappedFile.h>
#include <AK/NetworkOrdered.h>
#include <LibCore/puff.h>
#include <LibDraw/PNGLoader.h>
#include <LibDraw/puff.c>
#include <fcntl.h>
#include <serenity.h>
#include <stdio.h>

2
Servers/ProtocolServer/Makefile
View File

@ -23,7 +23,7 @@ ProtocolClientEndpoint.h: ProtocolClient.ipc
@echo "IPC $<"; $(IPCCOMPILER) $< > $@
$(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore -lipc -ldraw
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore -lipc
.cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

2
Servers/WindowServer/Makefile
View File

@ -26,7 +26,7 @@ DEFINES += -DUSERLAND
all: $(APP)
$(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -lcore -ldraw -lthread -lpthread -laudio -lipc
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lc -ldraw -lcore -lthread -lpthread -laudio -lipc
.cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<