From a3dba82b3e16c0470c122174a170645770906b0f Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Fri, 10 Mar 2000 05:52:36 +0100
Subject: [PATCH] Added 'ANY' to the list of modules to try in _decode. This
probably means that a lot of other modules can be removed from the list
Rev: lib/modules/_Image.pmod/module.pmod:1.7
---
lib/modules/_Image.pmod/module.pmod | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/lib/modules/_Image.pmod/module.pmod b/lib/modules/_Image.pmod/module.pmod
index 06b5b45a93..11fde902fa 100644
--- a/lib/modules/_Image.pmod/module.pmod
+++ b/lib/modules/_Image.pmod/module.pmod
@@ -1,5 +1,5 @@
//! module Image
-//! $Id: module.pmod,v 1.6 2000/02/24 01:11:22 marcus Exp $
+//! $Id: module.pmod,v 1.7 2000/03/10 04:52:36 per Exp $
//! method object(Image.Image) load()
//! method object(Image.Image) load(object file)
@@ -46,7 +46,7 @@ mapping _decode( string data, mixed|void tocolor )
};
if(!i)
- foreach( ({ "GIF", "JPEG", "XWD", "PNM" }), string fmt )
+ foreach( ({ "GIF", "JPEG", "XWD", "PNM", "RAS" }), string fmt )
{
catch {
i = Image[fmt]->decode( data );
@@ -57,7 +57,7 @@ mapping _decode( string data, mixed|void tocolor )
}
if(!i)
- foreach( ({ "XCF", "PSD", "PNG", "BMP", "TGA", "PCX",
+ foreach( ({ "ANY", "XCF", "PSD", "PNG", "BMP", "TGA", "PCX",
"XBM", "XPM", "TIFF", "ILBM", "PS", "PVR",
/* Image formats low on headers below this mark */
"HRZ", "AVS", "WBF",
@@ -74,15 +74,6 @@ mapping _decode( string data, mixed|void tocolor )
break;
}
- if(!i) // No image could be decoded at all.
- return 0;
-
- if( arrayp(tocolor) && (sizeof(tocolor)==3) && objectp(i) && objectp(a) )
- {
- Image.Image o = Image.Image( i->xsize(), i->ysize(), @tocolor );
- i = o->paste_mask( i, a );
- }
-
return ([
"format":format,
"alpha":a,
--
GitLab