--- parser3/src/classes/image.C 2001/04/27 16:48:20 1.21.2.2 +++ parser3/src/classes/image.C 2001/05/02 11:49:17 1.23 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: image.C,v 1.21.2.2 2001/04/27 16:48:20 paf Exp $ + $Id: image.C,v 1.23 2001/05/02 11:49:17 paf Exp $ */ #include "pa_config_includes.h" @@ -24,9 +24,14 @@ // class class MImage : public Methoded { +public: // VStateless_class + + Value *create_new_value(Pool& pool) { return new(pool) VImage(pool); } + public: MImage(Pool& pool); bool used_directly() { return true; } + }; // helpers @@ -329,8 +334,12 @@ static gdImage *load(Request& r, const S const char *file_name_cstr=r.absolute(file_name).cstr(String::UL_FILE_NAME); if(FILE *f=fopen(file_name_cstr, "rb")) { gdImage& image=*new(pool) gdImage(pool); - image.CreateFromGif(f); + bool ok=image.CreateFromGif(f); fclose(f); + if(!ok) + PTHROW(0, 0, + &file_name, + "is not in GIF format"); return ℑ } else { PTHROW(0, 0, @@ -652,8 +661,8 @@ static void _text(Request& r, const Stri // constructor -MImage::MImage(Pool& pool) : Methoded(pool) { - set_name(NEW String(pool, IMAGE_CLASS_NAME)); +MImage::MImage(Pool& apool) : Methoded(apool) { + set_name(*NEW String(pool(), IMAGE_CLASS_NAME)); // ^image:measure[DATA]