summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorFran├žois Revel <mmu_man@netsurf-browser.org>2008-08-08 20:12:38 +0000
committerFran├žois Revel <mmu_man@netsurf-browser.org>2008-08-08 20:12:38 +0000
commit914cbeacfe860c5898a5d74d32aa24ee40570fd7 (patch)
treec7a59fdff598b04b9c676d32f8cdeb95b9af3c79 /render
parent82cc44fc4ece9d7e646b1072d7269c161bd44f73 (diff)
downloadnetsurf-914cbeacfe860c5898a5d74d32aa24ee40570fd7.tar.gz
netsurf-914cbeacfe860c5898a5d74d32aa24ee40570fd7.tar.bz2
C89
svn path=/trunk/netsurf/; revision=4963
Diffstat (limited to 'render')
-rw-r--r--render/imagemap.c4
-rw-r--r--render/layout.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/render/imagemap.c b/render/imagemap.c
index 2a74307ed..af442484f 100644
--- a/render/imagemap.c
+++ b/render/imagemap.c
@@ -450,6 +450,8 @@ bool imagemap_addtolist(xmlNode *n, char *base_url, struct mapentry **entry)
}
if (new_map->type != IMAGEMAP_DEFAULT) {
+ int x, y;
+ float *xcoords, *ycoords;
/* coordinates are a comma-separated list of values */
val = strtok(coords, ",");
num = 1;
@@ -519,8 +521,6 @@ bool imagemap_addtolist(xmlNode *n, char *base_url, struct mapentry **entry)
xmlFree(coords);
return false;
}
- int x, y;
- float *xcoords, *ycoords;
while (val) {
x = atoi(val);
val = strtok('\0', ",");
diff --git a/render/layout.c b/render/layout.c
index 7d955011c..1469a3484 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -857,11 +857,11 @@ void layout_float_find_dimensions(int available_width,
box->gadget->type == GADGET_PASSWORD ||
box->gadget->type == GADGET_FILE ||
box->gadget->type == GADGET_TEXTAREA)) {
+ struct css_length size;
/* Give sensible dimensions to gadgets, with auto width/height,
* that don't shrink to fit contained text. */
assert(box->style);
- struct css_length size;
size.unit = CSS_UNIT_EM;
if (box->gadget->type == GADGET_TEXTBOX ||
box->gadget->type == GADGET_PASSWORD ||
@@ -1252,11 +1252,11 @@ bool layout_line(struct box *first, int *width, int *y,
unsigned int inline_count = 0;
unsigned int i;
struct css_length gadget_size; /* Checkbox / radio buttons */
+ const struct font_functions *font_func = content->data.html.font_func;
+
gadget_size.unit = CSS_UNIT_EM;
gadget_size.value = 1;
- const struct font_functions *font_func = content->data.html.font_func;
-
LOG(("first %p, first->text '%.*s', width %i, y %i, cx %i, cy %i",
first, (int) first->length, first->text, *width,
*y, cx, cy));