LibGfx: Add PPM image file type support

luteresa · Jun 22, 2020 · 326032b · 326032b
1 parent 97aca8f
commit 326032b
Show file tree

Hide file tree

Showing 6 changed files with 553 additions and 1 deletion.
diff --git a/Libraries/LibGfx/Bitmap.cpp b/Libraries/LibGfx/Bitmap.cpp
@@ -33,6 +33,7 @@
 #include <LibGfx/GIFLoader.h>
 #include <LibGfx/PBMLoader.h>
 #include <LibGfx/PNGLoader.h>
+#include <LibGfx/PPMLoader.h>
 #include <LibGfx/ICOLoader.h>
 #include <LibGfx/ShareableBitmap.h>
 #include <fcntl.h>

diff --git a/Libraries/LibGfx/Bitmap.h b/Libraries/LibGfx/Bitmap.h
@@ -36,6 +36,7 @@
 #define ENUMERATE_IMAGE_FORMATS \
  __ENUMERATE_IMAGE_FORMAT(pbm, ".pbm") \
  __ENUMERATE_IMAGE_FORMAT(png, ".png") \
+ __ENUMERATE_IMAGE_FORMAT(ppm, ".ppm") \
  __ENUMERATE_IMAGE_FORMAT(gif, ".gif") \
  __ENUMERATE_IMAGE_FORMAT(bmp, ".bmp") \
  __ENUMERATE_IMAGE_FORMAT(ico, ".ico")

diff --git a/Libraries/LibGfx/CMakeLists.txt b/Libraries/LibGfx/CMakeLists.txt
@@ -16,6 +16,7 @@ set(SOURCES
  Path.cpp
  PBMLoader.cpp
  PNGLoader.cpp
+ PPMLoader.cpp
  Point.cpp
  Rect.cpp
  ShareableBitmap.cpp

diff --git a/Libraries/LibGfx/ImageDecoder.cpp b/Libraries/LibGfx/ImageDecoder.cpp
@@ -24,12 +24,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/ImageDecoder.h>
 #include <LibGfx/BMPLoader.h>
 #include <LibGfx/GIFLoader.h>
 #include <LibGfx/ICOLoader.h>
+#include <LibGfx/ImageDecoder.h>
 #include <LibGfx/PBMLoader.h>
 #include <LibGfx/PNGLoader.h>
+#include <LibGfx/PPMLoader.h>
 
 namespace Gfx {
 
@@ -51,6 +52,10 @@ ImageDecoder::ImageDecoder(const u8* data, size_t size)
  if (m_plugin->sniff())
  return;
 
+ m_plugin = make<PPMImageDecoderPlugin>(data, size);
+ if (m_plugin->sniff())
+ return;
+
  m_plugin = make<ICOImageDecoderPlugin>(data, size);
  if (m_plugin->sniff())
  return;