--- parser3/src/classes/image.C 2002/11/28 09:12:27 1.86 +++ parser3/src/classes/image.C 2002/11/29 08:17:52 1.88 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_IMAGE_C="$Date: 2002/11/28 09:12:27 $"; +static const char* IDENT_IMAGE_C="$Date: 2002/11/29 08:17:52 $"; /* jpegsize: gets the width and height (in pixels) of a jpeg file @@ -72,7 +72,7 @@ public: /*override*/void seek(long value, int whence) { if(lseek(f, value, whence)<0) - throw Exception("file.seek", + throw Exception("image.format", &file_name, "seek(value=%ld, whence=%d) failed: %s (%d), actual filename '%s'", value, whence, strerror(errno), errno, fname); @@ -104,11 +104,11 @@ public: switch(whence) { case SEEK_CUR: new_offset=offset+value; break; case SEEK_SET: new_offset=(size_t)value; break; - default: throw Exception("file.seek", 0, "whence #%d not supported", 0, whence); break; + default: throw Exception(0, 0, "whence #%d not supported", 0, whence); break; // never } if((ssize_t)new_offset<0 || new_offset>size) - throw Exception("file.seek", + throw Exception("image.format", &file_name, "seek(value=%l, whence=%d) failed: out of buffer, new_offset>size (%l>%l) or new_offset<0", value, whence, new_offset, size); @@ -938,11 +938,16 @@ public: /* ******************************** string ********************************** */ + int step_width(int index) { + return letter_spacing + (monospace ? monospace : index_width(index)); + } + + // counts trailing letter_spacing, consider this OK. useful for contiuations int string_width(const String& s){ const char *cstr=s.cstr(); int result=0; for(; *cstr; cstr++) - result+=index_width(index_of(*cstr)); + result+=step_width(index_of(*cstr)); return result; } @@ -951,7 +956,7 @@ public: if(cstr) for(; *cstr; cstr++) { int index=index_of(*cstr); index_display(image, x, y, index); - x+=letter_spacing + (monospace ? monospace : index_width(index)); + x+=step_width(index); } }