82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
--- a/Source/cmake/OptionsGTK.cmake 2021-05-10 10:02:55.000000000 +0200
|
|
+++ b/Source/cmake/OptionsGTK.cmake 2024-05-10 17:01:41.610031597 +0200
|
|
@@ -21,7 +21,6 @@
|
|
find_package(Threads REQUIRED)
|
|
find_package(ZLIB REQUIRED)
|
|
find_package(ATK 2.16.0 REQUIRED)
|
|
-find_package(WebP REQUIRED COMPONENTS demux)
|
|
find_package(ATSPI 2.5.3)
|
|
find_package(EGL)
|
|
find_package(OpenGL)
|
|
--- a/Source/WebCore/platform/ImageDecoders.cmake 2021-02-26 10:57:13.000000000 +0100
|
|
+++ b/Source/WebCore/platform/ImageDecoders.cmake 2024-05-10 17:27:37.870060143 +0200
|
|
@@ -6,7 +6,6 @@
|
|
"${WEBCORE_DIR}/platform/image-decoders/jpeg"
|
|
"${WEBCORE_DIR}/platform/image-decoders/jpeg2000"
|
|
"${WEBCORE_DIR}/platform/image-decoders/png"
|
|
- "${WEBCORE_DIR}/platform/image-decoders/webp"
|
|
)
|
|
|
|
list(APPEND WebCore_SOURCES
|
|
@@ -26,8 +25,6 @@
|
|
platform/image-decoders/jpeg2000/JPEG2000ImageDecoder.cpp
|
|
|
|
platform/image-decoders/png/PNGImageDecoder.cpp
|
|
-
|
|
- platform/image-decoders/webp/WEBPImageDecoder.cpp
|
|
)
|
|
|
|
list(APPEND WebCore_LIBRARIES
|
|
@@ -39,13 +36,6 @@
|
|
list(APPEND WebCore_LIBRARIES OpenJPEG::OpenJPEG)
|
|
endif ()
|
|
|
|
-if (WebP_FOUND)
|
|
- list(APPEND WebCore_LIBRARIES
|
|
- WebP::demux
|
|
- WebP::libwebp
|
|
- )
|
|
-endif ()
|
|
-
|
|
if (USE_CAIRO)
|
|
list(APPEND WebCore_SOURCES
|
|
platform/image-decoders/cairo/ImageBackingStoreCairo.cpp
|
|
--- a/Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp 2021-02-26 10:57:13.000000000 +0100
|
|
+++ b/Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp 2024-05-10 17:31:12.260064075 +0200
|
|
@@ -33,9 +33,6 @@
|
|
#if USE(OPENJPEG)
|
|
#include "JPEG2000ImageDecoder.h"
|
|
#endif
|
|
-#if USE(WEBP)
|
|
-#include "WEBPImageDecoder.h"
|
|
-#endif
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
@@ -90,13 +87,6 @@
|
|
}
|
|
#endif
|
|
|
|
-#if USE(WEBP)
|
|
-bool matchesWebPSignature(char* contents)
|
|
-{
|
|
- return !memcmp(contents, "RIFF", 4) && !memcmp(contents + 8, "WEBPVP", 6);
|
|
-}
|
|
-#endif
|
|
-
|
|
bool matchesBMPSignature(char* contents)
|
|
{
|
|
return !memcmp(contents, "BM", 2);
|
|
@@ -142,11 +132,6 @@
|
|
return JPEG2000ImageDecoder::create(JPEG2000ImageDecoder::Format::J2K, alphaOption, gammaAndColorProfileOption);
|
|
#endif
|
|
|
|
-#if USE(WEBP)
|
|
- if (matchesWebPSignature(contents))
|
|
- return WEBPImageDecoder::create(alphaOption, gammaAndColorProfileOption);
|
|
-#endif
|
|
-
|
|
if (matchesBMPSignature(contents))
|
|
return BMPImageDecoder::create(alphaOption, gammaAndColorProfileOption);
|
|
|