Read about our upcoming Code of Conduct on this issue

Commit ad598a8d authored by Daniel Fort's avatar Daniel Fort
Browse files

Merged unified into update-to-700D.115

--HG--
branch : update-to-700D.115
......@@ -565,7 +565,7 @@ static unsigned int silent_pic_preview(unsigned int ctx)
raw_buf = sp_frames[i];
}
raw_set_preview_rect(raw_info.active_area.x1, raw_info.active_area.y1, raw_info.active_area.x2 - raw_info.active_area.x1, raw_info.active_area.y2 - raw_info.active_area.y1);
raw_set_preview_rect(raw_info.active_area.x1, raw_info.active_area.y1, raw_info.active_area.x2 - raw_info.active_area.x1, raw_info.active_area.y2 - raw_info.active_area.y1, 1);
raw_force_aspect_ratio_1to1();
raw_preview_fast_ex(raw_buf, preview_buf, first_line, last_line, ultra_fast);
......@@ -1029,7 +1029,7 @@ silent_pic_take_lv(int interactive)
silent_pic_raw_show_focus(i);
local_raw_info.buffer = sp_frames[i % sp_buffer_count];
raw_set_preview_rect(raw_info.active_area.x1, raw_info.active_area.y1, raw_info.active_area.x2 - raw_info.active_area.x1, raw_info.active_area.y2 - raw_info.active_area.y1);
raw_set_preview_rect(raw_info.active_area.x1, raw_info.active_area.y1, raw_info.active_area.x2 - raw_info.active_area.x1, raw_info.active_area.y2 - raw_info.active_area.y1, 0);
raw_force_aspect_ratio_1to1();
raw_preview_fast_ex(local_raw_info.buffer, (void*)-1, -1, -1, -1);
ok = silent_pic_save_file(&local_raw_info, 0);
......
......@@ -338,7 +338,7 @@ export LIBTCC1
$(MAKE) -C tests $@
clean:
rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.so* *.out *.exe libtcc_test localsyms$(EXESUF)
rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.so* *.out *.exe libtcc_test$(EXESUF) localsyms
$(MAKE) -C tests $@
ifneq ($(LIBTCC1),)
$(MAKE) -C lib $@
......
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