diff options
| -rw-r--r-- | doc/Images.txt | 26 | ||||
| -rw-r--r-- | src/html.cc | 8 | ||||
| -rw-r--r-- | src/image.hh | 10 |
3 files changed, 24 insertions, 20 deletions
diff --git a/doc/Images.txt b/doc/Images.txt index 1f70b0ca..96e09579 100644 --- a/doc/Images.txt +++ b/doc/Images.txt @@ -1,4 +1,4 @@ - February 2001, --Jcid + December 2007, --Jcid ------ IMAGES @@ -23,10 +23,16 @@ requires to decode the image data into RGB format, and the second one has the whole data already decoded. * Regardless of the RGB-data feeding method, the decoded data is -passed to the widget (DwImage) and drawn by GdkRGB in a streamed -way. +passed to the widget (DwImage) and drawn in a streamed way. Note that INDEXED images are also decoded into RGB format. + Html_tag_open_img // IMG element processing + Html_add_new_image // Reat attributes, create image, add to HTML page + Html_load_image // Tells cache to retrieve image + a_Image_new // Create a 'DilloImage' data structure, to coordinate + // decoded image-data transfer to an 'Imgbuf'. + Html_add_widget // Adds the dw::Image to the page + --------------------- Fetching from the net @@ -99,16 +105,16 @@ represent which rows had been decoded. * The image processing can be found in the following sources: - - image.[ch] + - image.{cc,hh} - dicache.[ch] - gif.[ch], png.[ch], jpeg.[ch] - - dw_image.[ch] + - dw/image.{cc,hh} -* Bear in mind that there are three data structures for image -code: +* Bear in mind that there are four data structures for image +code: - - DilloImage (image.h) - - DwImage (dw_image.h) + - DilloImage (image.hh) - DICacheEntry (dicache.h) - + - dw::Image (class Image in dw/image.hh) + - core::Imgbuf (imgbuf.hh) diff --git a/src/html.cc b/src/html.cc index 2fa0af4b..16601653 100644 --- a/src/html.cc +++ b/src/html.cc @@ -862,7 +862,7 @@ DilloHtml::~DilloHtml() DilloHtmlForm *form; DilloHtmlInput *input_j; - MSG("::~DilloHtml(this=%p)\n", this); + _MSG("::~DilloHtml(this=%p)\n", this); a_Bw_remove_doc(bw, this); @@ -2816,12 +2816,10 @@ static void Html_tag_open_img(DilloHtml *html, const char *tag, int tagsize) if (S_TOP(html)->style->x_link != -1) { /* In this case we can use the text color */ style_attrs.setBorderColor ( - Color::createShaded (HT2LT(html), - style_attrs.color->getColor())); + Color::createShaded (HT2LT(html), style_attrs.color->getColor())); } else { style_attrs.setBorderColor ( - Color::createShaded (HT2LT(html), - html->link_color)); + Color::createShaded (HT2LT(html), html->link_color)); } style_attrs.setBorderStyle (BORDER_SOLID); style_attrs.borderWidth.setVal (border); diff --git a/src/image.hh b/src/image.hh index fde51838..8ed8b081 100644 --- a/src/image.hh +++ b/src/image.hh @@ -39,14 +39,14 @@ struct _DilloImage { uint_t height; const uchar_t *cmap; /* Color map (only for indexed) */ - DilloImgType in_type; /* Image Type */ + DilloImgType in_type; /* Image Type */ int32_t bg_color; /* Background color */ - int ProcessedBytes; /* Amount of bytes already decoded */ - bitvec_t *BitVec; /* Bit vector for decoded rows */ - ImageState State; + int ProcessedBytes; /* Amount of bytes already decoded */ + bitvec_t *BitVec; /* Bit vector for decoded rows */ + ImageState State; /* Processing status */ - int RefCount; /* Reference counter */ + int RefCount; /* Reference counter */ }; |