Actually reject images with origin not in the upper-left corner. (#105912)

2003-02-14  Matthias Clasen  <maclas@gmx.de>

	* io-tga.c (try_preload):
	(gdk_pixbuf__tga_load): Actually reject images with origin
	not in the upper-left corner.  (#105912)

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index e182f7b7eb653883c4b20883a838c957e1632c9f..6928f34728d1fc316382db0143a0af3eab250f6c 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,14 @@
+2003-02-14  Matthias Clasen  <maclas@gmx.de>
+
+       * io-tga.c (try_preload): 
+       (gdk_pixbuf__tga_load): Actually reject images with origin
+       not in the upper-left corner.  (#105912)  
+
+2003-02-06  Matthias Clasen  <maclas@gmx.de>
+
+       * queryloaders.c (query_module): Better error message if
+       module_open() fails.  (#105349, Tim Mooney)
+
 Mon Jan 27 17:10:30 2003  Owen Taylor  <otaylor@redhat.com>
  
        * Makefile.am (gdk-pixbuf.loaders): Rewrite to run

diff --git a/gdk-pixbuf/io-tga.c b/gdk-pixbuf/io-tga.c
index 7035faf9cff3180974921d6a88222334542710c1..dcbb76978789227bb53f1fb7e8f1183f561e9b97 100644 (file)
--- a/gdk-pixbuf/io-tga.c
+++ b/gdk-pixbuf/io-tga.c
@@ -50,9 +50,7 @@
 #define TGA_INTERLEAVE_4WAY     0x80
 
 #define TGA_ORIGIN_MASK         0x30
-#define TGA_ORIGIN_LEFT         0x00
 #define TGA_ORIGIN_RIGHT        0x10
-#define TGA_ORIGIN_LOWER        0x00
 #define TGA_ORIGIN_UPPER        0x20
 
 enum {
@@ -727,8 +725,8 @@ static gboolean try_preload(TGAContext *ctx, GError **err)
                        }
                        if ((ctx->hdr->flags & TGA_INTERLEAVE_MASK) != 
                            TGA_INTERLEAVE_NONE ||
-                           ctx->hdr->flags & TGA_ORIGIN_RIGHT || 
-                           ctx->hdr->flags & TGA_ORIGIN_LOWER) {
+                           (ctx->hdr->flags & TGA_ORIGIN_RIGHT) || 
+                           !(ctx->hdr->flags & TGA_ORIGIN_UPPER)) {
                                g_set_error(err, GDK_PIXBUF_ERROR, 
                                            GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
                                            _("TGA image type not supported"));
@@ -1289,7 +1287,7 @@ static GdkPixbuf *gdk_pixbuf__tga_load(FILE *f, GError **err)
        if (!hdr)
                return NULL;
        if ((hdr->flags & TGA_INTERLEAVE_MASK) != TGA_INTERLEAVE_NONE ||
-           hdr->flags & TGA_ORIGIN_RIGHT || hdr->flags & TGA_ORIGIN_LOWER) {
+           (hdr->flags & TGA_ORIGIN_RIGHT) || !(hdr->flags & TGA_ORIGIN_UPPER)) {
                g_set_error(err, GDK_PIXBUF_ERROR, 
                            GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
                            _("Unsupported TGA image type"));