mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-shell: remove unnecesary assignment of fail safe value.

Browse Source 
Scale is calculated as float and to be inf. It shall be avoided by,
ivi_layout_surface_set_source/destination_rectangle. So output log and
then return this method to use prevous scale for fail safe.

Signed-off-by: Nobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Nobuhiko Tanibata
2015-04-27 16:57:26 +09:00
committed by Pekka Paalanen
parent e6cc997097
commit bcff632727
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivi-shell/ivi-layout.c
+8 -3
View File
@@ -719,9 +719,14 @@ update_scale(struct ivi_layout_layer *ivilayer,
return; return;
} }
if (ivisurf->prop.dest_width == 0 && ivisurf->prop.dest_height == 0) { if (ivisurf->prop.source_width == 0 || ivisurf->prop.source_height == 0) {
ivisurf->prop.dest_width = ivisurf->surface->width_from_buffer; weston_log("ivi-shell: source rectangle is not yet set by ivi_layout_surface_set_source_rectangle\n");
ivisurf->prop.dest_height = ivisurf->surface->height_from_buffer; return;
}
if (ivisurf->prop.dest_width == 0 || ivisurf->prop.dest_height == 0) {
weston_log("ivi-shell: destination rectangle is not yet set by ivi_layout_surface_set_destination_rectangle\n");
return;
} }
lw = ((float)ivilayer->prop.dest_width / (float)ivilayer->prop.source_width ); lw = ((float)ivilayer->prop.dest_width / (float)ivilayer->prop.source_width );