--- parser3/src/classes/image.C 2001/05/11 17:45:10 1.26 +++ parser3/src/classes/image.C 2001/07/07 16:38:01 1.30 @@ -5,8 +5,9 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: image.C,v 1.26 2001/05/11 17:45:10 parser Exp $ + $Id: image.C,v 1.30 2001/07/07 16:38:01 parser Exp $ */ +static const char *RCSId="$Id: image.C,v 1.30 2001/07/07 16:38:01 parser Exp $"; #include "pa_config_includes.h" @@ -87,23 +88,23 @@ struct GIF_Header { /// JPEG file header struct JFIF_Header { - char length[2]; // length of JFIF segment marker - char identifier[5]; // JFIF identifier - char version[2]; // version - char units; // units X of Y pixel density - char xdensity[2]; // X pixel density - char ydensity[2]; // X pixel density - char xthumbnails; // width of thumbnails - char ythumbnails; // height of thumbnails - char reserved; // reserved + char length[2]; //< length of JFIF segment marker + char identifier[5]; //< JFIF identifier + char version[2]; //< version + char units; //< units X of Y pixel density + char xdensity[2]; //< X pixel density + char ydensity[2]; //< X pixel density + char xthumbnails; //< width of thumbnails + char ythumbnails; //< height of thumbnails + char reserved; //< reserved }; /// JPEG frame header struct JPG_Frame { - char length[2]; // length of image marker - char data; // data precision of bits/sample - char height[2]; // image height - char width[2]; // image width - char numComponents; // number of color components + char length[2]; //< length of image marker + char data; //< data precision of bits/sample + char height[2]; //< image height + char width[2]; //< image width + char numComponents; //< number of color components }; // @@ -257,7 +258,7 @@ static size_t read_disk(void*& buf, size static void _measure(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& data=params->get_no_junction(0, "data must not be code"); + Value& data=params->as_no_junction(0, "data must not be code"); void *info;Measure_reader::Func read_func; Read_mem_info read_mem_info; @@ -350,7 +351,7 @@ static gdImage *load(Request& r, const S static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vfile_name=params->get_no_junction(0, "file name must not be code"); + Value& vfile_name=params->as_no_junction(0, "file name must not be code"); const String& file_name=vfile_name.as_string(); gdImage& image=*load(r, method_name, file_name); @@ -544,8 +545,8 @@ static void _polybar(Request& r, const S class Font : public Pooled { public: - int height; /* Font heigth */ - int space; /* Default char width */ + int height; //< Font heigth + int space; //< Default char width gdImage& ifont; const String& alphabet; @@ -606,8 +607,8 @@ public: static void _font(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& valphabet=params->get_no_junction(0, "alphabet must not be code"); - Value& file_name=params->get_no_junction(1, "file_name must not be code"); + Value& valphabet=params->as_no_junction(0, "alphabet must not be code"); + Value& file_name=params->as_no_junction(1, "file_name must not be code"); int height=r.process(params->get(2)).as_int(); int width=params->size()>3?r.process(params->get(3)).as_int():0;