mirror of
https://git.pwmt.org/pwmt/zathura.git
synced 2024-11-10 23:43:46 +01:00
Merge branch 'develop' of pwmt.org:zathura into develop
Conflicts: document.c
This commit is contained in:
commit
f4f24fe0cc
8
Makefile
8
Makefile
@ -50,7 +50,7 @@ ${PROJECT}: ${OBJECTS}
|
||||
|
||||
clean:
|
||||
$(QUIET)rm -rf ${PROJECT} ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \
|
||||
${DOBJECTS} ${PROJECT}-debug .depend ${PROJECT}.pc doc
|
||||
${DOBJECTS} ${PROJECT}-debug .depend ${PROJECT}.pc doc *gcda *gcno $(PROJECT).info gcov
|
||||
$(QUIET)make -C tests clean
|
||||
|
||||
${PROJECT}-debug: ${DOBJECTS}
|
||||
@ -87,6 +87,12 @@ dist: clean
|
||||
doc: clean
|
||||
$(QUIET)doxygen Doxyfile
|
||||
|
||||
gcov: clean
|
||||
$(QUIET)CFLAGS+="-fprofile-arcs -ftest-coverage" LDFLAGS+="-fprofile-arcs" $(MAKE) $(PROJECT)
|
||||
$(QUIET)make -C tests
|
||||
$(QUIET)lcov --directory . --capture --output-file $(PROJECT).info
|
||||
$(QUIET)genhtml --output-directory gcov $(PROJECT).info
|
||||
|
||||
install: all ${PROJECT}.pc
|
||||
$(ECHO) installing executable file
|
||||
$(QUIET)mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||
|
@ -275,6 +275,12 @@ zathura_document_open(zathura_t* zathura, const char* path, const char* password
|
||||
goto error_free;
|
||||
}
|
||||
|
||||
/* check current page number */
|
||||
if (document->current_page_number < 1 || document->current_page_number >= document->number_of_pages) {
|
||||
girara_warning("document info: '%s' has an invalid page number", document->file_path);
|
||||
document->current_page_number = 1;
|
||||
}
|
||||
|
||||
/* update statusbar */
|
||||
girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, real_path);
|
||||
|
||||
|
@ -4,3 +4,6 @@ CHECK_INC ?= $(shell pkg-config --cflags check)
|
||||
CHECK_LIB ?= $(shell pkg-config --libs check)
|
||||
|
||||
LIBS += ${CHECK_LIB}
|
||||
|
||||
CFLAGS += -fprofile-arcs -ftest-coverage
|
||||
LDFLAGS += -fprofile-arcs
|
||||
|
Loading…
Reference in New Issue
Block a user