move k2pdfopt source to a submodule libk2pdfopt

Currently libk2pdfopt is staticly linked to kpdfview.

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "luajit-2.0"]
 	path = luajit-2.0
 	url = http://luajit.org/git/luajit-2.0.git
+[submodule "libk2pdfopt"]
+	path = libk2pdfopt
+	url = git://github.com/chrox/libk2pdfopt.git

Makefile

@@ -13,6 +13,7 @@ JPEGDIR=$(MUPDFDIR)/thirdparty/jpeg-9
 LFSDIR=luafilesystem
 
 POPENNSDIR=popen-noshell
+K2PDFOPTLIBDIR=libk2pdfopt
 
 # must point to directory with *.ttf fonts for crengine
 TTF_FONTS_DIR=$(MUPDFDIR)/fonts
@@ -113,17 +114,18 @@ LUALIB := $(LUADIR)/src/libluajit.a
 
 POPENNSLIB := $(POPENNSDIR)/libpopen_noshell.a
 
+K2PDFOPTLIB := $(K2PDFOPTLIBDIR)/libk2pdfopt.a
+
 all: kpdfview extr
 
 VERSION?=$(shell git describe HEAD)
-kpdfview: kpdfview.o einkfb.o pdf.o k2pdfopt.o blitbuffer.o drawcontext.o koptcontext.o input.o $(POPENNSLIB) util.o ft.o lfs.o mupdfimg.o $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB) djvu.o $(DJVULIBS) cre.o $(CRENGINELIBS) pic.o pic_jpeg.o
+kpdfview: kpdfview.o einkfb.o pdf.o blitbuffer.o drawcontext.o koptcontext.o input.o $(POPENNSLIB) util.o ft.o lfs.o mupdfimg.o $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB) djvu.o $(DJVULIBS) cre.o $(CRENGINELIBS) pic.o pic_jpeg.o
 	echo $(VERSION) > git-rev
 	$(CC) \
 		$(CFLAGS) \
 		kpdfview.o \
 		einkfb.o \
 		pdf.o \
-		k2pdfopt.o \
 		blitbuffer.o \
 		drawcontext.o \
 		koptcontext.o \
@@ -133,6 +135,7 @@ kpdfview: kpdfview.o einkfb.o pdf.o k2pdfopt.o blitbuffer.o drawcontext.o koptco
 		ft.o \
 		lfs.o \
 		mupdfimg.o \
+		$(K2PDFOPTLIB) \
 		$(MUPDFLIBS) \
 		$(THIRDPARTYLIBS) \
 		$(LUALIB) \
@@ -166,9 +169,6 @@ ft.o: %.o: %.c $(THIRDPARTYLIBS)
 kpdfview.o pdf.o blitbuffer.o util.o drawcontext.o koptcontext.o einkfb.o input.o mupdfimg.o: %.o: %.c
 	$(CC) -c $(KPDFREADER_CFLAGS) $(EMU_CFLAGS) -I$(LFSDIR)/src $< -o $@
 
-k2pdfopt.o: %.o: %.c
-	$(CC) -c -I$(MUPDFDIR)/ -I$(DJVUDIR)/ $(CFLAGS) $< -o $@
-
 djvu.o: %.o: %.c
 	$(CC) -c $(KPDFREADER_CFLAGS) -I$(DJVUDIR)/ $< -o $@
 
@@ -232,6 +232,7 @@ cleanthirdparty:
 	rm -f $(MUPDFDIR)/fontdump.host
 	rm -f $(MUPDFDIR)/cmapdump.host
 	$(MAKE) -C $(POPENNSDIR) clean
+	$(MAKE) -C $(K2PDFOPTLIBDIR) clean
 
 $(MUPDFDIR)/fontdump.host:
 	CFLAGS="$(HOSTCFLAGS)" $(MAKE) -C mupdf build="release" CC="$(HOSTCC)" $(MUPDFTARGET)/fontdump
@@ -274,7 +275,10 @@ endif
 $(POPENNSLIB):
 	$(MAKE) -C $(POPENNSDIR) CC="$(CC)" AR="$(AR)"
 
-thirdparty: $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB) $(DJVULIBS) $(CRENGINELIBS) $(POPENNSLIB)
+$(K2PDFOPTLIB):
+	$(MAKE) -C $(K2PDFOPTLIBDIR) BUILDMODE=static CC="$(CC)" CFLAGS="$(CFLAGS) -I../$(DJVUDIR)/ -I../$(MUPDFDIR)/" AR="$(AR)"
+
+thirdparty: $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB) $(DJVULIBS) $(CRENGINELIBS) $(POPENNSLIB) $(K2PDFOPTLIB)
 
 INSTALL_DIR=kindlepdfviewer
 

k2pdfopt.h

@@ -1,60 +0,0 @@
-/*
- ** k2pdfopt.h   K2pdfopt optimizes PDF/DJVU files for mobile e-readers
- **              (e.g. the Kindle) and smartphones. It works well on
- **              multi-column PDF/DJVU files. K2pdfopt is freeware.
- **
- ** Copyright (C) 2012  http://willus.com
- **
- ** This program is free software: you can redistribute it and/or modify
- ** it under the terms of the GNU Affero General Public License as
- ** published by the Free Software Foundation, either version 3 of the
- ** License, or (at your option) any later version.
- **
- ** This program is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- ** GNU Affero General Public License for more details.
- **
- ** You should have received a copy of the GNU Affero General Public License
- ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
- **
- */
-
-#ifndef _K2PDFOPT_H
-#define _K2PDFOPT_H
-
-#include <fitz/fitz-internal.h>
-#include <libdjvu/ddjvuapi.h>
-
-typedef unsigned char  uint8_t;
-typedef struct KOPTContext {
-	int trim;
-	int wrap;
-	int indent;
-	int rotate;
-	int columns;
-	int offset_x;
-	int offset_y;
-	int dev_width;
-	int dev_height;
-	int page_width;
-	int page_height;
-	int straighten;
-	int justification;
-
-	double zoom;
-	double margin;
-	double quality;
-	double contrast;
-	double defect_size;
-	double line_spacing;
-	double word_spacing;
-
-	uint8_t *data;
-} KOPTContext;
-
-void k2pdfopt_mupdf_reflow(KOPTContext *kc, fz_document *doc, fz_page *page, fz_context *ctx);
-void k2pdfopt_djvu_reflow(KOPTContext *kc, ddjvu_page_t *page, ddjvu_context_t *ctx, ddjvu_render_mode_t mode, ddjvu_format_t *fmt);
-
-#endif
-

libk2pdfopt

@@ -0,0 +1 @@
+Subproject commit 3a2023a5139bb76c4d106b4425db960f0bc20332