Commit bcff6327 authored by Nobuhiko Tanibata's avatar Nobuhiko Tanibata Committed by Pekka Paalanen
Browse files

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



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: default avatarNobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp>
Acked-by: Pekka Paalanen's avatarPekka Paalanen <pekka.paalanen@collabora.co.uk>
parent e6cc9970
......@@ -719,9 +719,14 @@ update_scale(struct ivi_layout_layer *ivilayer,
return;
}
if (ivisurf->prop.dest_width == 0 && ivisurf->prop.dest_height == 0) {
ivisurf->prop.dest_width = ivisurf->surface->width_from_buffer;
ivisurf->prop.dest_height = ivisurf->surface->height_from_buffer;
if (ivisurf->prop.source_width == 0 || ivisurf->prop.source_height == 0) {
weston_log("ivi-shell: source rectangle is not yet set by ivi_layout_surface_set_source_rectangle\n");
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 );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment