--- parser3/src/classes/image.C 2002/09/18 08:52:48 1.76 +++ parser3/src/classes/image.C 2002/11/21 11:04:39 1.79 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_IMAGE_C="$Date: 2002/09/18 08:52:48 $"; +static const char* IDENT_IMAGE_C="$Date: 2002/11/21 11:04:39 $"; /* jpegsize: gets the width and height (in pixels) of a jpeg file @@ -44,39 +44,87 @@ public: // Methoded #ifndef DOXYGEN class Measure_reader { public: - enum { READ_CHUNK_SIZE=0x400*20 };// 20K - typedef size_t(*Func)(void *& buf, size_t limit, void *info); + virtual size_t read(const void *&buf, size_t limit)=0; + virtual void seek(long value, int whence)=0; + virtual long tell()=0; +}; - Measure_reader(Func afunc, void *ainfo) : - func(afunc), info(ainfo), - chunk(0), offset(0), size(0) { +class Measure_file_reader: public Measure_reader { +public: + Measure_file_reader(Pool& apool, int af, const String& afile_name, const char *afname): + pool(apool), file_name(afile_name), fname(afname), f(af) { } - size_t read(void *&buf, size_t limit) { - if(offset+limit>size) // nothing left - if(offset==0 || limit==1) { // only one-byte continuations allowed - size=(*func)(chunk, READ_CHUNK_SIZE, info); - offset=0; - } else - return 0;// as if EOF - if(!size) // EOF + /*override*/size_t read(const void *&abuf, size_t limit) { + if(limit==0) return 0; - - // something left - size_t read_size=min(offset+limit, size)-offset; - buf=((unsigned char *)chunk)+offset; - offset+=read_size; + + void *lbuf=pool.malloc(limit); + size_t read_size=(size_t)::read(f, lbuf, limit); abuf=lbuf; + if(ssize_t(read_size)<0 || read_size>limit) + throw Exception(0, + &file_name, + "measure failed: actually read %lu bytes count not in [0..%lu] valid range", + read_size, limit); + return read_size; } + /*override*/void seek(long value, int whence) { + if(lseek(f, value, whence)<0) + throw Exception("file.seek", + &file_name, + "seek(value=%ld, whence=%d) failed: %s (%d), actual filename '%s'", + value, whence, strerror(errno), errno, fname); + } + + /*override*/long tell() { return ::tell(f); } + +private: + Pool& pool; + const String& file_name; const char *fname; + int f; +}; + +class Measure_buf_reader: public Measure_reader { +public: + Measure_buf_reader(const void *abuf, size_t asize, const String& afile_name): + buf(abuf), size(asize), file_name(afile_name), offset(0) { + } + + /*override*/size_t read(const void *&abuf, size_t limit) { + size_t to_read=min(limit, size-offset); + abuf=(const char*)buf+offset; + offset+=to_read; + return to_read; + } + + /*override*/void seek(long value, int whence) { + size_t new_offset; + 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; + } + + if((ssize_t)new_offset<0 || new_offset>size) + throw Exception("file.seek", + &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); + offset=new_offset; + } + + /*override*/long tell() { return offset; } + private: - Func func; - void *info; - void *chunk; + const void *buf; size_t size; + const String& file_name; + size_t offset; - size_t size; }; + #endif /// PNG file header @@ -114,22 +162,27 @@ struct JPG_Size_segment_body { char numComponents; //< number of color components }; +/// JPEG frame header +struct JPG_Exif_segment_start { + char signature[6]; // Exif\0\0 +}; + // -inline short x_endian_to_int(unsigned char L, unsigned char H) { +inline ushort x_endian_to_ushort(unsigned char L, unsigned char H) { return(short)((H<<8) + L); } -inline short big_endian_to_int(unsigned char b[2]) { - return x_endian_to_int(b[1], b[0]); +inline ushort big_endian_to_ushort(unsigned char b[2]) { + return x_endian_to_ushort(b[1], b[0]); } -inline short little_endian_to_int(unsigned char b[2]) { - return x_endian_to_int(b[0], b[1]); +inline ushort little_endian_to_ushort(unsigned char b[2]) { + return x_endian_to_ushort(b[0], b[1]); } void measure_gif(Pool& pool, const String *origin_string, - Measure_reader& reader, int& width, int& height) { + Measure_reader& reader, ushort& width, ushort& height) { void *buf; const int head_size=sizeof(GIF_Header); @@ -144,17 +197,20 @@ void measure_gif(Pool& pool, const Strin origin_string, "not GIF file - wrong signature"); - width=little_endian_to_int(head->width); - height=little_endian_to_int(head->height); + width=little_endian_to_ushort(head->width); + height=little_endian_to_ushort(head->height); } /// @test remove ugly mech in reader - 20K limit void measure_jpeg(Pool& pool, const String *origin_string, - Measure_reader& reader, int& width, int& height) { + Measure_reader& reader, ushort& width, ushort& height) { // JFIF format markers const unsigned char MARKER=0xFF; - const unsigned char CODE_SIZE_FIRST=0xC0; - const unsigned char CODE_SIZE_LAST=0xC3; + const unsigned char CODE_SIZE_A=0xC0; + const unsigned char CODE_SIZE_B=0xC1; + const unsigned char CODE_SIZE_C=0xC2; + const unsigned char CODE_SIZE_D=0xC3; + const unsigned char CODE_EXIF=0xE1; void *buf; const size_t prefix_size=2; @@ -169,44 +225,63 @@ void measure_jpeg(Pool& pool, const Stri origin_string, "not JPEG file - wrong signature"); - bool found=false; while(true) { - void *buf; - // Extract the segment header. + long segment_base_offset=reader.tell()+2/*marker,code*/; if(reader.read(buf, sizeof(JPG_Segment_head))marker!=MARKER) - break; + throw Exception("image.format", + origin_string, + "not JPEG file - marker not found"); + + switch(head->code) { + // http://www.ba.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html + case CODE_EXIF: + { + if(reader.read(buf, sizeof(JPG_Exif_segment_start))signature, "Exif\0\0", 4+2)!=0) //signature invalid? + break; // ignore invalid block - if(head->code >= CODE_SIZE_FIRST && head->code <= CODE_SIZE_LAST) { - // Segments that contain size info - if(reader.read(buf, sizeof(JPG_Size_segment_body))width); - height=big_endian_to_int(body->height); - found=true; + // parse Exif block + } break; - } else { - // Dummy read to skip over data - size_t limit=big_endian_to_int(head->length) - 2; - if(reader.read(buf, limit)width); + height=big_endian_to_ushort(body->height); + return; + } + }; + + reader.seek(segment_base_offset+big_endian_to_ushort(head->length), SEEK_SET); } - if(!found) - throw Exception("image.format", - origin_string, - "broken JPEG file - size frame not found"); + throw Exception("image.format", + origin_string, + "broken JPEG file - size frame not found"); } void measure_png(Pool& pool, const String *origin_string, - Measure_reader& reader, int& width, int& height) { + Measure_reader& reader, ushort& width, ushort& height) { void *buf; const int head_size=sizeof(PNG_Header); @@ -221,14 +296,14 @@ void measure_png(Pool& pool, const Strin origin_string, "not PNG file - wrong signature"); - width=big_endian_to_int(head->width); - height=big_endian_to_int(head->height); + width=big_endian_to_ushort(head->width); + height=big_endian_to_ushort(head->height); } // measure center void measure(Pool& pool, const String& file_name, - Measure_reader& reader, int& width, int& height) { + Measure_reader& reader, ushort& width, ushort& height) { if(const char *cext=strrchr(file_name.cstr(String::UL_FILE_SPEC), '.')) { cext++; if(strcasecmp(cext, "GIF")==0) @@ -247,69 +322,48 @@ void measure(Pool& pool, const String& f "can not determine image type - no file name extension"); } -#ifndef DOXYGEN -struct Read_mem_info { - unsigned char *ptr; - unsigned char *eof; -}; -#endif -static size_t read_mem(void*& buf, size_t limit, void *info) { - Read_mem_info& rmi=*static_cast(info); - buf=rmi.ptr; - size_t read_size=min(limit, (size_t)(rmi.eof-rmi.ptr)); - rmi.ptr+=read_size; - return read_size; -} +// methods #ifndef DOXYGEN -struct Read_disk_info { - const String *file_spec; - size_t offset; +struct File_measure_action_info { + ushort *width; + ushort *height; + const String *file_name; }; #endif -static size_t read_disk(void*& buf, size_t limit, void *info) { - Read_disk_info& rdi=*static_cast(info); - Pool& pool=rdi.file_spec->pool(); - - size_t read_size; - file_read(pool, *rdi.file_spec, - buf, read_size, - false/*as_text*/, - true/*fail_on_read_problem*/, - rdi.offset, limit); +static void file_measure_action(Pool& pool, + int f, + const String& file_spec, const char *fname, bool as_text, + void *context) { + File_measure_action_info& info=*static_cast(context); - rdi.offset+=read_size; - return read_size; + Measure_file_reader reader(pool, f, *info.file_name, fname); + measure(pool, *info.file_name, reader, *info.width, *info.height); } -// methods - static void _measure(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); 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; - Read_disk_info read_disk_info; + ushort width=0; + ushort height=0; const String *file_name; - if(data.is_string()) { - file_name=data.get_string(); - read_disk_info.file_spec=&r.absolute(*file_name); - read_disk_info.offset=0; - info=&read_disk_info;read_func=read_disk; + if(file_name=data.get_string()) { + File_measure_action_info info={&width, &height, file_name}; + file_read_action_under_lock(pool, r.absolute(*file_name), + "measure", file_measure_action, &info); } else { const VFile& vfile=*data.as_vfile(); file_name=&static_cast(vfile.fields().get(*name_name))->as_string(); - read_mem_info.ptr=(unsigned char *)vfile.value_ptr(); - read_mem_info.eof=read_mem_info.ptr+vfile.value_size(); - info=&read_mem_info;read_func=read_mem; + Measure_buf_reader reader( + vfile.value_ptr(), + vfile.value_size(), + *file_name + ); + measure(pool, *file_name, reader, width, height); } - Measure_reader reader(read_func, info); - int width, height; - measure(pool, *file_name, reader, width, height); - static_cast(r.get_self())->set(file_name, width, height); }