Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: enable -Wall when compiling koreader targets #1849

Merged
merged 4 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions cre.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2066,7 +2066,6 @@ static int getTextFromPositions(lua_State *L) {
}

LVDocView *tv = doc->text_view;
lvRect margin = tv->getPageMargins();

lvPoint startpt(x0, y0);
lvPoint endpt(x1, y1);
Expand Down Expand Up @@ -2122,7 +2121,6 @@ static int getTextFromPositions(lua_State *L) {
}
ldomNode * node = r.getStart().getNode();
lString32 text = node->getText();
int textLen = text.length();
if (grab_prev) {
r.getStart().prevVisibleWordStart();
}
Expand Down Expand Up @@ -2198,7 +2196,6 @@ static int extendXPointersToSentenceSegment(lua_State *L) {
includeImages = lua_toboolean(L, 4);
}

LVDocView *tv = doc->text_view;
ldomDocument *dv = doc->dom_doc;
ldomXPointerEx startp = dv->createXPointer(lString32(pos0));
ldomXPointerEx endp = dv->createXPointer(lString32(pos1));
Expand Down Expand Up @@ -2724,7 +2721,7 @@ static int getPageLinks(lua_State *L) {
lua_newtable(L); // all links (actual entries may be less than links.length(), so, no pre-alloc)

ldomXRangeList links;
ldomXRangeList & sel = doc->text_view->getDocument()->getSelections();
benoit-pierre marked this conversation as resolved.
Show resolved Hide resolved
// ldomXRangeList & sel = doc->text_view->getDocument()->getSelections();

doc->text_view->getCurrentPageLinks( links );
int linkCount = links.length();
Expand Down Expand Up @@ -2814,7 +2811,6 @@ static bool _isLinkToFootnote(CreDocument *doc, const lString32 source_xpointer,
const int flags, const int maxTextSize, lString32 &reason,
lString32 &extendedStopReason, ldomXRange &extendedRange)
{
ldomDocument *dv = doc->dom_doc;
const ldomXPointerEx sourceXP = ldomXPointerEx(doc->dom_doc->createXPointer(source_xpointer));
const ldomXPointerEx targetXP = ldomXPointerEx(doc->dom_doc->createXPointer(target_xpointer));
ldomNode *sourceNode = sourceXP.getNode();
Expand Down Expand Up @@ -4037,6 +4033,9 @@ static int renderImageData(lua_State *L) {
else if ( lua_isstring(L, 1) ) {
idata = (const char*)lua_tolstring(L, 1, &size);
}
else {
return luaL_argerror(L, 1, "expected light userdata or string");
}
LVStreamRef stream = LVCreateMemoryStream((void*)idata, size);
LVImageSourceRef img = LVCreateStreamImageSource(stream);
if ( img.isNull() )
Expand Down
31 changes: 9 additions & 22 deletions djvu.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,6 @@ typedef enum DjvuZoneId {
N_ZI
} DjvuZoneId;

static const char *djvuZoneName[N_ZI] = {
"page",
"column",
"region",
"para",
"line",
"word",
"char"
};

typedef enum DjvuZoneSexpIdx {
SI_ZONE_NAME,
SI_ZONE_XMIN,
Expand Down Expand Up @@ -533,10 +523,7 @@ static int getPageText(lua_State *L) {
return luaL_error(L, "cannot get page #%d information", pageno);

/* start retrieving page text */
miniexp_t sexp, se_line, se_word;
int i = 1, j = 1, counter_l = 1, counter_w=1,
nr_line = 0, nr_word = 0;
const char *word = NULL;
miniexp_t sexp;

while ((sexp = ddjvu_document_get_pagetext(doc->doc_ref, pageno-1, "word"))
== miniexp_dummy) {
Expand Down Expand Up @@ -565,7 +552,7 @@ static int getPagePix(lua_State *L) {
ddjvu_render_mode_t mode = (int) luaL_checkint(L, 3);
ddjvu_rect_t prect;
ddjvu_rect_t rrect;
int px, py, pw, ph, rx, ry, rw, rh, status;
int px, py, pw, ph, rx, ry, rw, rh;

px = 0;
py = 0;
Expand Down Expand Up @@ -658,23 +645,23 @@ static int reflowPage(lua_State *L) {
src->bpp = 8*page->doc->pixelsize;

bmp_alloc(src);
if (src->bpp == 8) {
int ii;
for (ii = 0; ii < 256; ii++)
src->red[ii] = src->blue[ii] = src->green[ii] = ii;
}
if (src->bpp == 8)
for (int ii = 0; ii < 256; ii++)
src->red[ii] = src->blue[ii] = src->green[ii] = ii;

ddjvu_format_set_row_order(page->doc->pixelformat, 1);

status = ddjvu_page_render(page->page_ref, mode, &prect, &rrect, page->doc->pixelformat,
bmp_bytewidth(src), (char *) src->data);
if (!status)
return luaL_error(L, "%s: ddjvu_page_render failed", __func__);

if (kctx->precache) {
pthread_t rf_thread;
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
pthread_create(&rf_thread, &attr, (void *(*) (void *))k2pdfopt_reflow_bmp, (void*)kctx);
pthread_create(&rf_thread, &attr, (void *)k2pdfopt_reflow_bmp, kctx);
pthread_attr_destroy(&attr);
} else {
k2pdfopt_reflow_bmp(kctx);
Expand Down Expand Up @@ -744,7 +731,7 @@ static int drawPage(lua_State *L) {
* So we don't set rotation here.
*/

if (!ddjvu_page_render(page->page_ref, djvu_render_mode, &pagerect, &renderrect, page->doc->pixelformat, bb->w*page->doc->pixelsize, imagebuffer)) {
if (!ddjvu_page_render(page->page_ref, djvu_render_mode, &pagerect, &renderrect, page->doc->pixelformat, bb->w*page->doc->pixelsize, (void *)imagebuffer)) {
// Clear to white on failure
memset(imagebuffer, 0xFF, bbsize);
}
Expand Down
3 changes: 2 additions & 1 deletion thirdparty/cmake_modules/koreader_targets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ function(setup_target NAME)
CXX_VISIBILITY_PRESET ${${NAME}_VISIBILITY}
)
endif()
target_compile_options(${NAME} PRIVATE -Wall)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
target_compile_definitions(${NAME} PRIVATE DEBUG)
endif()
Expand Down Expand Up @@ -73,7 +74,7 @@ declare_koreader_target(
VISIBILITY hidden
)
function(setup_blitbuffer)
target_compile_options(blitbuffer PRIVATE SHELL:${VECTO_CFLAGS})
target_compile_options(blitbuffer PRIVATE -Wno-maybe-uninitialized SHELL:${VECTO_CFLAGS})
endfunction()

# koreade-cre
Expand Down
1 change: 1 addition & 0 deletions thirdparty/kpvcrlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ add_library(crengine STATIC
)
# Make sure we get full `constexpr` support.
target_compile_features(crengine PRIVATE cxx_std_17)
target_compile_options(crengine PRIVATE -ftabstop=4 -Wall)
# Enable `-fvisibility=hidden`.
set_target_properties(crengine PROPERTIES CXX_VISIBILITY_PRESET hidden)
# Enable `-fvisibility-inlines-hidden`.
Expand Down