Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7620 → Rev 7621

/contrib/media/updf/lrintf.c
File deleted
/contrib/media/updf/Makethird
File deleted
/contrib/media/updf/strtoll.c
File deleted
/contrib/media/updf/xps/xps_glyphs.c
File deleted
/contrib/media/updf/xps/muxps.h
File deleted
/contrib/media/updf/xps/xps_resource.c
File deleted
/contrib/media/updf/xps/xps_common.c
File deleted
/contrib/media/updf/xps/xps_tiff.c
File deleted
/contrib/media/updf/xps/xps_path.c
File deleted
/contrib/media/updf/xps/xps_gradient.c
File deleted
/contrib/media/updf/xps/xps_util.c
File deleted
/contrib/media/updf/xps/xps_tile.c
File deleted
/contrib/media/updf/xps/xps_xml.c
File deleted
/contrib/media/updf/xps/xps_image.c
File deleted
/contrib/media/updf/xps/xps_zip.c
File deleted
/contrib/media/updf/xps/xps_png.c
File deleted
/contrib/media/updf/xps/xps_doc.c
File deleted
/contrib/media/updf/xps/xps_jpeg.c
File deleted
/contrib/media/updf/Makerules
File deleted
/contrib/media/updf/Makefile
7,7 → 7,7
 
default: all
LDFLAGS = -Tinclude/scripts/menuetos_app_v01.ld -nostdlib -L include/lib
CFLAGS += -Ifitz -Ipdf -Ixps -Iscripts -fno-stack-protector -nostdinc -fno-builtin -m32 -I include -fno-pic -w
CFLAGS += -Ifitz -Ipdf -Iscripts -fno-stack-protector -nostdinc -fno-builtin -m32 -I include -fno-pic -w
LIBS += -lfreetype2 -lpng -ljbig2dec -ljpeg -lopenjpeg -lz -lm -lc
 
#include Makerules
49,31 → 49,26
$(CC_CMD)
$(OUT)/%.o : pdf/%.c fitz/fitz.h pdf/mupdf.h | $(OUT)
$(CC_CMD)
$(OUT)/%.o : xps/%.c fitz/fitz.h xps/muxps.h | $(OUT)
$(OUT)/%.o : apps/%.c fitz/fitz.h pdf/mupdf.h | $(OUT)
$(CC_CMD)
$(OUT)/%.o : apps/%.c fitz/fitz.h pdf/mupdf.h xps/muxps.h | $(OUT)
$(CC_CMD)
$(OUT)/%.o : scripts/%.c | $(OUT)
$(CC_CMD)
 
.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
 
# --- Fitz, MuPDF and MuXPS libraries ---
# --- Fitz and MuPDF libraries ---
 
FITZ_LIB := $(OUT)/libfitz.a
MUPDF_LIB := $(OUT)/libmupdf.a
MUXPS_LIB := $(OUT)/libmuxps.a
 
FITZ_SRC := $(notdir $(wildcard fitz/*.c draw/*.c))
MUPDF_SRC := $(notdir $(wildcard pdf/*.c))
MUXPS_SRC := $(notdir $(wildcard xps/*.c))
 
$(FITZ_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o))
$(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUPDF_SRC:%.c=%.o))
$(MUXPS_LIB) : $(addprefix $(OUT)/, $(MUXPS_SRC:%.c=%.o))
 
libs: $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
@ echo MuPDF/XPS and underlying libraries built
libs: $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
@ echo MuPDF and underlying libraries built
 
# --- Generated CMAP and FONT files ---
 
121,40 → 116,14
# --- Tools and Apps ---
 
PDF_APPS := $(addprefix $(OUT)/, pdfdraw pdfclean pdfextract pdfinfo pdfshow)
XPS_APPS := $(addprefix $(OUT)/, xpsdraw)
 
$(PDF_APPS) : $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
$(XPS_APPS) : $(MUXPS_LIB) $(FITZ_LIB) $(THIRD_LIBS)
 
MUPDF := $(OUT)/mupdf
$(MUPDF) : $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
$(MUPDF) : $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
ifeq "$(NOX11)" ""
$(MUPDF) : $(addprefix $(OUT)/, kos_main.o pdfapp.o)
$(LINK_CMD)
endif
 
# --- Install ---
 
prefix ?= /usr/local
bindir ?= $(prefix)/bin
libdir ?= $(prefix)/lib
incdir ?= $(prefix)/include
mandir ?= $(prefix)/share/man
 
install: $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF)
install -d $(bindir) $(libdir) $(incdir) $(mandir)/man1
install $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(libdir)
install fitz/fitz.h pdf/mupdf.h xps/muxps.h $(incdir)
install $(PDF_APPS) $(XPS_APPS) $(MUPDF) $(bindir)
install $(wildcard apps/man/*.1) $(mandir)/man1
 
# --- Clean and Default ---
 
all: $(THIRD_LIBS) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF)
 
clean:
rm -rf $(OUT)
nuke:
rm -rf build/* $(GEN)
 
.PHONY: all clean nuke install
all: $(THIRD_LIBS) $(FITZ_LIB) $(PDF_APPS) $(MUPDF)
/contrib/media/updf/apps/xpsdraw.c
File deleted
/contrib/media/updf/apps/kos_main.c
2,7 → 2,6
#define _WIN32
#include "fitz.h"
#include "mupdf.h"
#include "muxps.h"
#include "pdfapp.h"
#include "icons/allbtns.h"
#include "kolibri.c"
/contrib/media/updf/apps/pdfapp.c
1,6 → 1,5
#include "fitz.h"
#include "mupdf.h"
#include "muxps.h"
#include "pdfapp.h"
 
#include <ctype.h> /* for tolower() */
66,7 → 65,8
"n\t\t-- find next search result\n"
"N\t\t-- find previous search result\n"
"c\t\t-- toggle between color and grayscale\n"
; */
;
*/
}
 
void pdfapp_init(pdfapp_t *app)
172,27 → 172,8
__menuet__debug_out("All is set!\n");
}
 
static void pdfapp_open_xps(pdfapp_t *app, char *filename, int fd)
{
fz_error error;
fz_stream *file;
 
file = fz_open_fd(fd);
error = xps_open_stream(&app->xps, file);
if (error)
pdfapp_error(app, fz_rethrow(error, "cannot open document '%s'", filename));
fz_close(file);
 
app->doctitle = filename;
 
app->pagecount = xps_count_pages(app->xps);
}
 
void pdfapp_open(pdfapp_t *app, char *filename, int fd, int reload)
{
if (strstr(filename, ".xps") || strstr(filename, ".XPS") || strstr(filename, ".rels"))
pdfapp_open_xps(app, filename, fd);
else
pdfapp_open_pdf(app, filename, fd);
 
app->cache = fz_new_glyph_cache();
241,12 → 222,6
app->xref = NULL;
}
 
if (app->xps)
{
xps_free_context(app->xps);
app->xps = NULL;
}
 
fz_flush_warnings();
}
 
333,34 → 308,6
pdf_age_store(app->xref->store, 3);
}
 
static void pdfapp_loadpage_xps(pdfapp_t *app)
{
xps_page *page;
fz_device *mdev;
fz_error error;
 
error = xps_load_page(&page, app->xps, app->pageno - 1);
if (error)
pdfapp_error(app, fz_rethrow(error, "cannot load page %d in file '%s'", app->pageno, app->doctitle));
 
app->page_bbox.x0 = 0;
app->page_bbox.y0 = 0;
app->page_bbox.x1 = page->width;
app->page_bbox.y1 = page->height;
app->page_rotate = 0;
app->page_links = NULL;
 
/* Create display list */
app->page_list = fz_new_display_list();
mdev = fz_new_list_device(app->page_list);
app->xps->dev = mdev;
xps_parse_fixed_page(app->xps, fz_identity, page);
app->xps->dev = NULL;
fz_free_device(mdev);
 
xps_free_page(app->xps, page);
}
 
static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repaint)
{
char buf[256];
383,8 → 330,6
 
if (app->xref)
pdfapp_loadpage_pdf(app);
if (app->xps)
pdfapp_loadpage_xps(app);
 
/* Zero search hit position */
app->hit = -1;
399,9 → 344,9
 
if (drawpage)
{
// sprintf(buf, "%s - %d/%d (%d dpi)", app->doctitle,
// app->pageno, app->pagecount, app->resolution);
// wintitle(app, buf);
sprintf(buf, "%s - %d/%d (%d dpi)", app->doctitle,
app->pageno, app->pagecount, app->resolution);
wintitle(app, buf);
 
ctm = pdfapp_viewctm(app);
bbox = fz_round_rect(fz_transform_rect(ctm, app->page_bbox));
430,7 → 375,7
 
if (app->shrinkwrap)
{
//__menuet__debug_out ("SHRINK\n");
__menuet__debug_out ("SHRINK\n");
int w = app->image->w;
int h = app->image->h;
if (app->winw == w)
/contrib/media/updf/apps/pdfapp.h
32,7 → 32,6
char *doctitle;
pdf_xref *xref;
pdf_outline *outline;
xps_context *xps;
 
int pagecount;
fz_glyph_cache *cache;
/contrib/media/updf/include/freetype/ttnameid.h
619,7 → 619,7
#else /* current sources say */
#define TT_MS_LANGID_CROATIAN_BOSNIA_HERZEGOVINA 0x101a
#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA 0x141a
/* and XPsp2 Platform SDK added (2004-07-26) */
/* and XP_sp2 Platform SDK added (2004-07-26) */
/* Names are shortened to be significant within 40 chars. */
#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_LATIN 0x181a
#define TT_MS_LANGID_SERBIAN_BOSNIA_HERZ_CYRILLIC 0x181a
661,7 → 661,7
#define TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS 0x0438
#define TT_MS_LANGID_HINDI_INDIA 0x0439
#define TT_MS_LANGID_MALTESE_MALTA 0x043a
/* Added by XPsp2 Platform SDK (2004-07-26) */
/* Added by XP_sp2 Platform SDK (2004-07-26) */
#define TT_MS_LANGID_SAMI_NORTHERN_NORWAY 0x043b
#define TT_MS_LANGID_SAMI_NORTHERN_SWEDEN 0x083b
#define TT_MS_LANGID_SAMI_NORTHERN_FINLAND 0x0C3b
751,7 → 751,7
#define TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN 0x085f
/* Missing a LCID for Tifinagh script */
#define TT_MS_LANGID_KASHMIRI_PAKISTAN /* Arabic */ 0x0460
/* Spelled this way by XPsp2 Platform SDK (2004-07-26) */
/* Spelled this way by XP_sp2 Platform SDK (2004-07-26) */
/* script is yet unclear... might be Arabic, Nagari or Sharada */
#define TT_MS_LANGID_KASHMIRI_SASIA 0x0860
/* ... and aliased (by MS) for compatibility reasons. */
773,7 → 773,7
#define TT_MS_LANGID_QUECHUA_ECUADOR 0x086b
#define TT_MS_LANGID_QUECHUA_PERU 0x0c6b
#define TT_MS_LANGID_SEPEDI_SOUTH_AFRICA 0x046c
/* Also spelled by XPsp2 Platform SDK (2004-07-26) */
/* Also spelled by XP_sp2 Platform SDK (2004-07-26) */
#define TT_MS_LANGID_SOTHO_SOUTHERN_SOUTH_AFRICA \
TT_MS_LANGID_SEPEDI_SOUTH_AFRICA
/* language codes 0x046d, 0x046e and 0x046f are (still) unknown. */