Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8437 → Rev 8438

/contrib/media/updf/apps/resource.h
File deleted
Property changes:
Deleted: svn:executable
-*
\ No newline at end of property
/contrib/media/updf/apps/Makefile
12,9 → 12,9
APPS_SRC := $(notdir $(wildcard *.c))
 
default: $(patsubst %.c,%.o,$(APPS_SRC))
$(LD) $(LDFLAGS) $(LIBPATH) -o updf kolibri.o pdfapp.o kos_main.o -lmupdf -lfreetype -lfitz -lgcc -lfitz -ldraw -ljpeg -ljbig2dec -lfreetype -lc.dll -lopenjpeg -lz -lc -lsyscall --subsystem native
$(LD) $(LDFLAGS) $(LIBPATH) -o updf kolibri.o pdfapp.o kos_main.o -lmupdf -lfreetype -lfitz -lgcc -lfitz -ldraw -ljpeg -ljbig2dec -lfreetype -lopenjpeg -lz -lc.dll -lsyscall --subsystem native
# yet not work
# $(LD) $(LDFLAGS) $(LIBPATH) -o pdfdraw kolibri.o pdfapp.o pdfdraw.o -lmupdf -lfreetype -lfitz -lgcc -lfitz -ldraw -ljpeg -ljbig2dec -lfreetype -lc.dll -lopenjpeg -lz -lc -lsyscall --subsystem native
# $(LD) $(LDFLAGS) $(LIBPATH) -o pdfdraw kolibri.o pdfapp.o pdfdraw.o -lmupdf -lfreetype -lfitz -lgcc -lfitz -ldraw -ljpeg -ljbig2dec -lfreetype -lopenjpeg -lz -lc.dll -lsyscall --subsystem native
objcopy updf -O binary
 
 
/contrib/media/updf/apps/kolibri.h
148,3 → 148,4
void kos_blit(int dstx, int dsty, int w, int h, int srcx,
int srcy,int srcw, int srch, int stride, char *d);
int kos_random(int num);
int kos_get_mouse_wheels(void);
/contrib/media/updf/apps/kos_main.c
1,6 → 1,3
// getrusage
#include "resource.h"
 
#include <menuet/os.h>
#include "fitz.h"
#include "mupdf.h"
94,9 → 91,8
}
 
 
void wintitle(pdfapp_t *app, char *s)
void wintitle(pdfapp_t *app, char *s, char param[])
{
char* param = *(char**)0x1C;
sprintf(Title,"%s - uPDF", strrchr(param, '/') + 1 );
}
 
368,6 → 364,13
{
char ii, mouse_wheels_state;
// argv without spaces
char full_argv[1024];
for (int i = 1; i<argc; i++) {
if (i != 1) strcat(full_argv, " ");
strcat(full_argv, argv[i]);
}
if (argc == 1) {
kol_board_puts("uPDF: no param set, showing OpenDialog");
RunOpenApp(argv[0]);
374,7 → 377,7
exit(0);
}
 
kol_board_puts(argv[1]);
kol_board_puts(full_argv);
kol_board_puts("\n");
char buf[128];
388,9 → 391,9
gapp.resolution = resolution;
gapp.pageno = pageno;
kol_board_puts("PDF Open\n");
pdfapp_open(&gapp, argv[1], 0, 0);
pdfapp_open(&gapp, full_argv, 0, 0);
kol_board_puts("PDF Opened\n");
wintitle(&gapp, 0);
wintitle(&gapp, 0, full_argv);
kol_board_puts("Inital paint\n");
411,8 → 414,11
__menuet__window_redraw(2);
__menuet__get_process_table(&Form, PID_WHOAMI);
if (Form.window_state > 2) continue; //fix rolled up
// ??
Form.client_width++; //fix for Menuet kernel bug
Form.client_height++; //fix for Menuet kernel bug
DrawWindow();
break;
 
/contrib/media/updf/apps/pdfapp.c
347,7 → 347,7
{
sprintf(buf, "%s - %d/%d (%d dpi)", app->doctitle,
app->pageno, app->pagecount, app->resolution);
wintitle(app, buf);
/// wintitle(app, buf);
 
ctm = pdfapp_viewctm(app);
bbox = fz_round_rect(fz_transform_rect(ctm, app->page_bbox));
/contrib/media/updf/apps/pdfapp.h
13,7 → 13,7
 
extern void winwarn(pdfapp_t*, char *s);
extern void winerror(pdfapp_t*, fz_error error);
extern void wintitle(pdfapp_t*, char *title);
extern void wintitle(pdfapp_t*, char *title, char param[]);
extern void winresize(pdfapp_t*, int w, int h);
extern void winrepaint(pdfapp_t*);
extern void winrepaintsearch(pdfapp_t*);
/contrib/media/updf/libopenjpeg/j2k_lib.c
48,7 → 48,8
struct rusage t;
double procTime;
/* (1) Get the rusage data structure at this moment (man getrusage) */
getrusage(0,&t);
/// STUB ///
/// getrusage(0,&t);
/* (2) What is the elapsed time ? - CPU time = User time + System time */
/* (2a) Get the seconds */
procTime = t.ru_utime.tv_sec + t.ru_stime.tv_sec;