--- parser3/src/classes/image.C 2003/11/03 11:22:06 1.95 +++ parser3/src/classes/image.C 2003/11/20 15:35:29 1.98 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_IMAGE_C="$Date: 2003/11/03 11:22:06 $"; +static const char* IDENT_IMAGE_C="$Date: 2003/11/20 15:35:29 $"; /* jpegsize: gets the width and height (in pixels) of a jpeg file @@ -33,7 +33,7 @@ static const char* IDENT_IMAGE_C="$Date: class MImage: public Methoded { public: // VStateless_class - Value* create_new_value() { return new VImage(); } + Value* create_new_value(Pool&) { return new VImage(); } public: MImage(); @@ -687,8 +687,8 @@ struct File_measure_action_info { }; #endif static void file_measure_action( - struct stat& finfo, int f, - const String& file_spec, const char* fname, bool as_text, + struct stat& /*finfo*/, int f, + const String& /*file_spec*/, const char* fname, bool /*as_text*/, void *context) { File_measure_action_info& info=*static_cast(context); @@ -792,7 +792,6 @@ static gdImage* load(Request& r, throw Exception("file.missing", 0, "can not open '%s'", file_name_cstr); - return 0; } } @@ -805,7 +804,6 @@ static void _load(Request& r, MethodPara } static void _create(Request& r, MethodParams& params) { - int width=params.as_int(0, "width must be int", r); int height=params.as_int(1, "height must be int", r); int bgcolor_value=0xffFFff; @@ -818,7 +816,6 @@ static void _create(Request& r, MethodPa } static void _gif(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; if(!image) throw Exception(0, @@ -842,7 +839,6 @@ static void _gif(Request& r, MethodParam } static void _line(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; if(!image) throw Exception(0, @@ -858,7 +854,6 @@ static void _line(Request& r, MethodPara } static void _fill(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; if(!image) throw Exception(0, @@ -872,7 +867,6 @@ static void _fill(Request& r, MethodPara } static void _rectangle(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; if(!image) throw Exception(0, @@ -888,7 +882,6 @@ static void _rectangle(Request& r, Metho } static void _bar(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; if(!image) throw Exception(0, @@ -912,7 +905,6 @@ static void add_point(Table::element_typ } #endif static void _replace(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; if(!image) throw Exception(0, @@ -934,7 +926,6 @@ static void _replace(Request& r, MethodP } static void _polyline(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; if(!image) throw Exception(0, @@ -956,7 +947,6 @@ static void _polyline(Request& r, Method } static void _polygon(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; if(!image) throw Exception(0, @@ -977,7 +967,6 @@ static void _polygon(Request& r, MethodP } static void _polybar(Request& r, MethodParams& params) { - gdImage* image=GET_SELF(r, VImage).image; if(!image) throw Exception(0,