updf: clean

git-svn-id: svn://kolibrios.org@7624 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2019-04-09 16:23:19 +00:00
parent 938e74edc1
commit 2a3f609db6
15 changed files with 244 additions and 2559 deletions

View File

@ -10,14 +10,7 @@ LDFLAGS = -Tinclude/scripts/menuetos_app_v01.ld -nostdlib -L include/lib
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
#include Makethird
THIRD_LIBS := $(FREETYPE_LIB)
THIRD_LIBS += $(JBIG2DEC_LIB)
THIRD_LIBS += $(JPEG_LIB)
THIRD_LIBS += $(OPENJPEG_LIB)
THIRD_LIBS += $(ZLIB_LIB)
THIRD_LIBS := $(FREETYPE_LIB) $(JBIG2DEC_LIB) $(JPEG_LIB) $(OPENJPEG_LIB) $(ZLIB_LIB)
ifeq "$(verbose)" ""
QUIET_AR = @ echo ' ' ' ' AR $@ ;
@ -54,8 +47,6 @@ $(OUT)/%.o : apps/%.c fitz/fitz.h pdf/mupdf.h | $(OUT)
$(OUT)/%.o : scripts/%.c | $(OUT)
$(CC_CMD)
.PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
# --- Fitz and MuPDF libraries ---
FITZ_LIB := $(OUT)/libfitz.a
@ -68,12 +59,10 @@ $(FITZ_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o))
$(MUPDF_LIB) : $(addprefix $(OUT)/, $(MUPDF_SRC:%.c=%.o))
libs: $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
@ echo MuPDF and underlying libraries built
# --- Generated CMAP and FONT files ---
CMAPDUMP := scripts/cmapdump
# FONTDUMP := scripts/fontdump
CMAP_CNS_SRC := $(wildcard cmaps/cns/*)
CMAP_GB_SRC := $(wildcard cmaps/gb/*)
@ -115,10 +104,6 @@ $(OUT)/cmapdump.o : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c
# --- Tools and Apps ---
PDF_APPS := $(addprefix $(OUT)/, pdfdraw pdfclean pdfextract pdfinfo pdfshow)
$(PDF_APPS) : $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
MUPDF := $(OUT)/mupdf
$(MUPDF) : $(MUPDF_LIB) $(FITZ_LIB) $(THIRD_LIBS)
ifeq "$(NOX11)" ""

View File

@ -436,10 +436,50 @@ int kol_clip_set(int n, char buffer[])
asm volatile ("int $0x40"::"a"(54), "b"(2), "c"(n), "d"(buffer));
}
int kos_random(int num)
{
srand(kol_time_tick());
return rand() % num;
}
int kos_get_mouse_wheels(void)
{
int val;
asm ("int $0x40":"=a"(val):"a"(37),"b"(7));
return val;
};
struct blit_call
{
int dstx;
int dsty;
int w;
int h;
int srcx;
int srcy;
int srcw;
int srch;
unsigned char *d;
int stride;
};
void kos_blit(int dstx, int dsty, int w, int h, int srcx,
int srcy,int srcw, int srch, int stride, char *d)
{
struct blit_call image;
image.dstx=dstx;
image.dsty=dsty;
image.w=w;
image.h=h;
image.srcx=srcx;
image.srcy=srcy;
image.srcw=srcw;
image.srch=srch;
image.stride=stride;
image.d=d;
asm ("int $0x40"::"a"(73),"b"(0),"c"(&image));
}

View File

@ -14,6 +14,33 @@
#define FILENAME_MAX 1024
#define BT_DEL 0x80000000
#define BT_HIDE 0x40000000
#define BT_NOFRAME 0x20000000
#define evReDraw 1
#define evKey 2
#define evButton 3
#define evMouse 6
#define evNetwork 8
#define ASCII_KEY_LEFT 176
#define ASCII_KEY_RIGHT 179
#define ASCII_KEY_DOWN 177
#define ASCII_KEY_UP 178
#define ASCII_KEY_HOME 180
#define ASCII_KEY_END 181
#define ASCII_KEY_PGDN 183
#define ASCII_KEY_PGUP 184
#define ASCII_KEY_BS 8
#define ASCII_KEY_TAB 9
#define ASCII_KEY_ENTER 13
#define ASCII_KEY_ESC 27
#define ASCII_KEY_DEL 182
#define ASCII_KEY_INS 185
#define ASCII_KEY_SPACE 032
#pragma pack(push,1)
typedef struct
{

View File

@ -6,79 +6,11 @@
#include "icons/allbtns.h"
#include "kolibri.c"
// need to be a part of menuet/os.h
#define BT_DEL 0x80000000
#define BT_HIDE 0x40000000
#define BT_NOFRAME 0x20000000
#define evReDraw 1
#define evKey 2
#define evButton 3
#define evMouse 6
#define evNetwork 8
#define ASCII_KEY_LEFT 176
#define ASCII_KEY_RIGHT 179
#define ASCII_KEY_DOWN 177
#define ASCII_KEY_UP 178
#define ASCII_KEY_HOME 180
#define ASCII_KEY_END 181
#define ASCII_KEY_PGDN 183
#define ASCII_KEY_PGUP 184
#define ASCII_KEY_BS 8
#define ASCII_KEY_TAB 9
#define ASCII_KEY_ENTER 13
#define ASCII_KEY_ESC 27
#define ASCII_KEY_DEL 182
#define ASCII_KEY_INS 185
#define ASCII_KEY_SPACE 032
struct blit_call
{
int dstx;
int dsty;
int w;
int h;
int srcx;
int srcy;
int srcw;
int srch;
unsigned char *d;
int stride;
};
void blit(int dstx, int dsty, int w, int h, int srcx, int srcy,int srcw, int srch, int stride, char *d) //Вызов сисфункции Blitter
{
struct blit_call image;
image.dstx=dstx;
image.dsty=dsty;
image.w=w;
image.h=h;
image.srcx=srcx;
image.srcy=srcy;
image.srcw=srcw;
image.srch=srch;
image.stride=stride;
image.d=d;
asm ("int $0x40"::"a"(73),"b"(0),"c"(&image));
}
void run_app()
{
return;
}
int __menuet__get_mouse_wheels(void)
{
int val;
asm ("int $0x40":"=a"(val):"a"(37),"b"(7));
return val;
};
/*==== DATA ====*/
static char Title[1024] = "uPDF";
@ -195,7 +127,7 @@ void winblit(pdfapp_t *app)
gapp.panx = 0;
if (gapp.image->n == 4) {
blit(window_center + Form.client_left,
kos_blit(window_center + Form.client_left,
Form.client_top + TOOLBAR_HEIGHT,
Form.client_width,
Form.client_height - TOOLBAR_HEIGHT,
@ -221,7 +153,7 @@ void winblit(pdfapp_t *app)
d[3] = *s++;
d += 4;
}
blit(window_center + Form.client_left,
kos_blit(window_center + Form.client_left,
Form.client_top + TOOLBAR_HEIGHT,
Form.client_width,
Form.client_height - TOOLBAR_HEIGHT,
@ -240,29 +172,186 @@ void winblit(pdfapp_t *app)
void DrawPageSides(void)
{
if (Form.client_width > gapp.image->w) window_center = (Form.client_width - gapp.image->w) / 2; else window_center = 0;
if (gapp.image->h < Form.client_height - TOOLBAR_HEIGHT) draw_h = gapp.image->h - gapp.pany; else draw_h = Form.client_height - TOOLBAR_HEIGHT;
if (gapp.image->w < Form.client_width)
{
if (gapp.image->h < Form.client_height - TOOLBAR_HEIGHT) {
draw_h = gapp.image->h - gapp.pany;
} else {
draw_h = Form.client_height - TOOLBAR_HEIGHT;
}
if (gapp.image->w < Form.client_width) {
window_center = (Form.client_width - gapp.image->w) / 2;
draw_w = gapp.image->w + 2;
kol_paint_bar(0, TOOLBAR_HEIGHT, window_center-1, Form.client_height - TOOLBAR_HEIGHT, DOCUMENT_BG);
kol_paint_bar(window_center-1, TOOLBAR_HEIGHT, 1, draw_h, DOCUMENT_BORDER);
kol_paint_bar(window_center + gapp.image->w, TOOLBAR_HEIGHT, 1, draw_h, DOCUMENT_BORDER);
kol_paint_bar(window_center + gapp.image->w+1, TOOLBAR_HEIGHT, Form.client_width - window_center - gapp.image->w - 1, Form.client_height - TOOLBAR_HEIGHT, DOCUMENT_BG);
}
if (gapp.image->w < Form.client_width)
{
draw_w = gapp.image->w + 2;
}
else
{
} else {
window_center = 1;
draw_w = Form.client_width;
}
kol_paint_bar(window_center - 1, gapp.image->h - gapp.pany + TOOLBAR_HEIGHT, draw_w, 1, DOCUMENT_BORDER);
kol_paint_bar(window_center - 1, gapp.image->h - gapp.pany + TOOLBAR_HEIGHT + 1, draw_w, Form.client_height - gapp.image->h - TOOLBAR_HEIGHT + gapp.pany - 1, DOCUMENT_BG);
kol_paint_bar(window_center - 1, gapp.image->h - gapp.pany + TOOLBAR_HEIGHT + 1,
draw_w, Form.client_height - gapp.image->h - TOOLBAR_HEIGHT + gapp.pany - 1, DOCUMENT_BG);
}
void GetNewPageNumber(void)
{
new_page_number = gapp.pageno;
key_mode_enter_page_number = 1;
HandleNewPageNumber(0);
}
void HandleNewPageNumber(unsigned char key)
{
char label_new_page[8];
if ((key >= '0') && (key <= '9'))
{
new_page_number = new_page_number * 10 + key - '0';
}
if (key == ASCII_KEY_BS)
{
new_page_number /= 10;
}
if (key == ASCII_KEY_ENTER)
{
ApplyNewPageNumber();
return;
}
if (key==ASCII_KEY_ESC)
{
key_mode_enter_page_number = 0;
DrawWindow();
return;
}
itoa(new_page_number, label_new_page, 10);
strcat(label_new_page, "_");
kol_paint_bar(show_area_x, 6, show_area_w, 22, 0xFDF88E);
__menuet__write_text(show_area_x + show_area_w/2 - strlen(label_new_page)*6/2, 14, 0x000000, label_new_page, strlen(label_new_page));
if (new_page_number > gapp.pagecount) ApplyNewPageNumber();
}
void ApplyNewPageNumber(void)
{
key_mode_enter_page_number = 0;
gapp.pageno = new_page_number -1;
pdfapp_onkey(&gapp, ']');
}
void DrawPagination(void)
{
char pages_display[12];
kol_paint_bar(show_area_x, 6, show_area_w, 22, 0xF4F4F4);
sprintf (pages_display, "%d/%d", gapp.pageno, gapp.pagecount);
__menuet__write_text(show_area_x + show_area_w/2 - strlen(pages_display)*6/2, 14, 0x000000, pages_display, strlen(pages_display));
}
void DrawToolbarButton(int x, char image_id)
{
__menuet__make_button(x, 5, 26-1, 24-1, 10 + image_id + BT_HIDE, 0);
__menuet__putimage(x, 5, 26, 24, image_id * 24 * 26 * 3 + toolbar_image);
}
void DrawWindow(void)
{
kol_paint_bar(0, 0, Form.client_width, TOOLBAR_HEIGHT - 1, 0xe1e1e1); // bar on the top (buttons holder)
kol_paint_bar(0, TOOLBAR_HEIGHT - 1, Form.client_width, 1, 0x7F7F7F);
DrawToolbarButton(8,0); //open_folder
DrawToolbarButton(42,1); //magnify -
DrawToolbarButton(67,2); //magnify +
DrawToolbarButton(101,6); //rotate left
DrawToolbarButton(126,7); //rotate right
DrawToolbarButton(Form.client_width - 160,3); //show help
show_area_x = Form.client_width - show_area_w - 34;
DrawToolbarButton(show_area_x - 26,4); //prev page
DrawToolbarButton(show_area_x + show_area_w,5); //nex page
__menuet__make_button(show_area_x-1, 5, show_area_w+1, 23, 20 + BT_HIDE, 0xA4A4A4);
kol_paint_bar(show_area_x, 5, show_area_w, 1, 0xA4A4A4);
kol_paint_bar(show_area_x, 28, show_area_w, 1, 0xA4A4A4);
winblit(&gapp);
DrawPageSides();
}
/* Actions */
void PageScrollDown(void)
{
//pdfapp_onkey(&gapp, 'k'); //move down
if (gapp.image->h - gapp.pany - SCROLL_H < Form.client_height - TOOLBAR_HEIGHT)
{
pdfapp_onkey(&gapp, '.');
}
else {
gapp.pany += SCROLL_H;
winblit(&gapp);
}
}
void PageScrollUp(void)
{
//pdfapp_onkey(&gapp, 'j'); //move up
if (gapp.pany >= SCROLL_H) {
gapp.pany -= SCROLL_H;
winblit(&gapp);
}
else {
//not very nice way of using do_not_blit, but it simple
if (gapp.pageno == 1) return;
do_not_blit = 1;
pdfapp_onkey(&gapp, ',');
do_not_blit = 0;
gapp.pany = gapp.image->h - SCROLL_H - Form.client_height + TOOLBAR_HEIGHT;
if (gapp.pany < 0) gapp.pany = 0;
//sprintf (debugstr, "gapp.pany: %d \n", gapp.pany);
//kol_board_puts(debugstr);
winblit(&gapp);
}
}
void RunApp(char app[], char param[])
{
kol_struct70 r;
r.p00 = 7;
r.p04 = 0;
r.p08 = param;
r.p12 = 0;
r.p16 = 0;
r.p20 = 0;
r.p21 = app;
kol_file_70(&r);
}
void PageZoomIn(void)
{
pdfapp_onkey(&gapp, '+');
DrawPageSides();
}
void PageZoomOut(void)
{
pdfapp_onkey(&gapp, '-');
DrawPageSides();
}
void PageRotateLeft(void)
{
pdfapp_onkey(&gapp, 'L');
DrawPageSides();
}
void PageRotateRight(void)
{
pdfapp_onkey(&gapp, 'R');
DrawPageSides();
}
int main (void)
{
@ -270,7 +359,7 @@ int main (void)
char* original_command_line = *(char**)0x1C;
if (*original_command_line == 0) {
kol_board_puts("Running uPDF without any param");
kol_board_puts("uPDF: no param set, showing OpenDialog");
RunOpenApp();
__menuet__sys_exit();
}
@ -362,7 +451,7 @@ int main (void)
break;
case evMouse:
if (mouse_wheels_state = __menuet__get_mouse_wheels())
if (mouse_wheels_state = kos_get_mouse_wheels())
{
if (mouse_wheels_state==1) { PageScrollDown(); PageScrollDown(); }
if (mouse_wheels_state==-1) { PageScrollUp(); PageScrollUp(); }
@ -374,165 +463,3 @@ int main (void)
}
}
}
void GetNewPageNumber(void)
{
new_page_number = gapp.pageno;
key_mode_enter_page_number = 1;
HandleNewPageNumber(0);
}
void HandleNewPageNumber(unsigned char key)
{
char label_new_page[8];
if ((key >= '0') && (key <= '9'))
{
new_page_number = new_page_number * 10 + key - '0';
}
if (key == ASCII_KEY_BS)
{
new_page_number /= 10;
}
if (key == ASCII_KEY_ENTER)
{
ApplyNewPageNumber();
return;
}
if (key==ASCII_KEY_ESC)
{
key_mode_enter_page_number = 0;
DrawWindow();
return;
}
itoa(new_page_number, label_new_page, 10);
strcat(label_new_page, "_");
kol_paint_bar(show_area_x, 6, show_area_w, 22, 0xFDF88E);
__menuet__write_text(show_area_x + show_area_w/2 - strlen(label_new_page)*6/2, 14, 0x000000, label_new_page, strlen(label_new_page));
if (new_page_number > gapp.pagecount) ApplyNewPageNumber();
}
void ApplyNewPageNumber(void)
{
key_mode_enter_page_number = 0;
gapp.pageno = new_page_number -1;
pdfapp_onkey(&gapp, ']');
}
void DrawPagination(void)
{
char pages_display[12];
kol_paint_bar(show_area_x, 6, show_area_w, 22, 0xF4F4F4);
sprintf (pages_display, "%d/%d", gapp.pageno, gapp.pagecount);
__menuet__write_text(show_area_x + show_area_w/2 - strlen(pages_display)*6/2, 14, 0x000000, pages_display, strlen(pages_display));
}
void DrawWindow(void)
{
kol_paint_bar(0, 0, Form.client_width, TOOLBAR_HEIGHT - 1, 0xe1e1e1); // bar on the top (buttons holder)
kol_paint_bar(0, TOOLBAR_HEIGHT - 1, Form.client_width, 1, 0x7F7F7F);
DrawToolbarButton(8,0); //open_folder
DrawToolbarButton(42,1); //magnify -
DrawToolbarButton(67,2); //magnify +
DrawToolbarButton(101,6); //rotate left
DrawToolbarButton(126,7); //rotate right
DrawToolbarButton(Form.client_width - 160,3); //show help
show_area_x = Form.client_width - show_area_w - 34;
DrawToolbarButton(show_area_x - 26,4); //prev page
DrawToolbarButton(show_area_x + show_area_w,5); //nex page
__menuet__make_button(show_area_x-1, 5, show_area_w+1, 23, 20 + BT_HIDE, 0xA4A4A4);
kol_paint_bar(show_area_x, 5, show_area_w, 1, 0xA4A4A4);
kol_paint_bar(show_area_x, 28, show_area_w, 1, 0xA4A4A4);
winblit(&gapp);
DrawPageSides();
}
void DrawToolbarButton(int x, char image_id)
{
__menuet__make_button(x, 5, 26-1, 24-1, 10 + image_id + BT_HIDE, 0);
__menuet__putimage(x, 5, 26, 24, image_id * 24 * 26 * 3 + toolbar_image);
}
/* Actions */
void PageScrollDown(void)
{
//pdfapp_onkey(&gapp, 'k'); //move down
if (gapp.image->h - gapp.pany - SCROLL_H < Form.client_height - TOOLBAR_HEIGHT)
{
pdfapp_onkey(&gapp, '.');
}
else {
gapp.pany += SCROLL_H;
winblit(&gapp);
}
}
void PageScrollUp(void)
{
//pdfapp_onkey(&gapp, 'j'); //move up
if (gapp.pany >= SCROLL_H) {
gapp.pany -= SCROLL_H;
winblit(&gapp);
}
else {
//not very nice way of using do_not_blit, but it simple
if (gapp.pageno == 1) return;
do_not_blit = 1;
pdfapp_onkey(&gapp, ',');
do_not_blit = 0;
gapp.pany = gapp.image->h - SCROLL_H - Form.client_height + TOOLBAR_HEIGHT;
if (gapp.pany < 0) gapp.pany = 0;
//sprintf (debugstr, "gapp.pany: %d \n", gapp.pany);
//kol_board_puts(debugstr);
winblit(&gapp);
}
}
void RunApp(char app[], char param[])
{
kol_struct70 r;
r.p00 = 7;
r.p04 = 0;
r.p08 = param;
r.p12 = 0;
r.p16 = 0;
r.p20 = 0;
r.p21 = app;
kol_file_70(&r);
}
void PageZoomIn(void)
{
pdfapp_onkey(&gapp, '+');
DrawPageSides();
}
void PageZoomOut(void)
{
pdfapp_onkey(&gapp, '-');
DrawPageSides();
}
void PageRotateLeft(void)
{
pdfapp_onkey(&gapp, 'L');
DrawPageSides();
}
void PageRotateRight(void)
{
pdfapp_onkey(&gapp, 'R');
DrawPageSides();
}

View File

@ -1,775 +0,0 @@
/*
* PDF cleaning tool: general purpose pdf syntax washer.
*
* Rewrite PDF with pretty printed objects.
* Garbage collect unreachable objects.
* Inflate compressed streams.
* Create subset documents.
*
* TODO: linearize document for fast web view
*/
#include "fitz.h"
#include "mupdf.h"
static FILE *out = NULL;
static char *uselist = NULL;
static int *ofslist = NULL;
static int *genlist = NULL;
static int *renumbermap = NULL;
static int dogarbage = 0;
static int doexpand = 0;
static int doascii = 0;
static pdf_xref *xref = NULL;
void die(fz_error error)
{
fz_catch(error, "aborting");
if (xref)
pdf_free_xref(xref);
exit(1);
}
static void usage(void)
{
fprintf(stderr,
"usage: pdfclean [options] input.pdf [output.pdf] [pages]\n"
"\t-p -\tpassword\n"
"\t-g\tgarbage collect unused objects\n"
"\t-gg\tin addition to -g compact xref table\n"
"\t-ggg\tin addition to -gg merge duplicate objects\n"
"\t-d\tdecompress streams\n"
"\t-a\tascii hex encode binary streams\n"
"\tpages\tcomma separated list of ranges\n");
exit(1);
}
/*
* Garbage collect objects not reachable from the trailer.
*/
static void sweepref(fz_obj *ref);
static void sweepobj(fz_obj *obj)
{
int i;
if (fz_is_indirect(obj))
sweepref(obj);
else if (fz_is_dict(obj))
for (i = 0; i < fz_dict_len(obj); i++)
sweepobj(fz_dict_get_val(obj, i));
else if (fz_is_array(obj))
for (i = 0; i < fz_array_len(obj); i++)
sweepobj(fz_array_get(obj, i));
}
static void sweepref(fz_obj *obj)
{
int num = fz_to_num(obj);
int gen = fz_to_gen(obj);
if (num < 0 || num >= xref->len)
return;
if (uselist[num])
return;
uselist[num] = 1;
/* Bake in /Length in stream objects */
if (pdf_is_stream(xref, num, gen))
{
fz_obj *len = fz_dict_gets(obj, "Length");
if (fz_is_indirect(len))
{
uselist[fz_to_num(len)] = 0;
len = fz_resolve_indirect(len);
fz_dict_puts(obj, "Length", len);
}
}
sweepobj(fz_resolve_indirect(obj));
}
/*
* Scan for and remove duplicate objects (slow)
*/
static void removeduplicateobjs(void)
{
int num, other;
for (num = 1; num < xref->len; num++)
{
/* Only compare an object to objects preceeding it */
for (other = 1; other < num; other++)
{
fz_obj *a, *b;
if (num == other || !uselist[num] || !uselist[other])
continue;
/*
* Comparing stream objects data contents would take too long.
*
* pdf_is_stream calls pdf_cache_object and ensures
* that the xref table has the objects loaded.
*/
if (pdf_is_stream(xref, num, 0) || pdf_is_stream(xref, other, 0))
continue;
a = xref->table[num].obj;
b = xref->table[other].obj;
a = fz_resolve_indirect(a);
b = fz_resolve_indirect(b);
if (fz_objcmp(a, b))
continue;
/* Keep the lowest numbered object */
renumbermap[num] = MIN(num, other);
renumbermap[other] = MIN(num, other);
uselist[MAX(num, other)] = 0;
/* One duplicate was found, do not look for another */
break;
}
}
}
/*
* Renumber objects sequentially so the xref is more compact
*/
static void compactxref(void)
{
int num, newnum;
/*
* Update renumbermap in-place, clustering all used
* objects together at low object ids. Objects that
* already should be renumbered will have their new
* object ids be updated to reflect the compaction.
*/
newnum = 1;
for (num = 1; num < xref->len; num++)
{
if (uselist[num] && renumbermap[num] == num)
renumbermap[num] = newnum++;
else if (renumbermap[num] != num)
renumbermap[num] = renumbermap[renumbermap[num]];
}
}
/*
* Update indirect objects according to renumbering established when
* removing duplicate objects and compacting the xref.
*/
static void renumberobj(fz_obj *obj)
{
int i;
if (fz_is_dict(obj))
{
for (i = 0; i < fz_dict_len(obj); i++)
{
fz_obj *key = fz_dict_get_key(obj, i);
fz_obj *val = fz_dict_get_val(obj, i);
if (fz_is_indirect(val))
{
val = fz_new_indirect(renumbermap[fz_to_num(val)], 0, xref);
fz_dict_put(obj, key, val);
fz_drop_obj(val);
}
else
{
renumberobj(val);
}
}
}
else if (fz_is_array(obj))
{
for (i = 0; i < fz_array_len(obj); i++)
{
fz_obj *val = fz_array_get(obj, i);
if (fz_is_indirect(val))
{
val = fz_new_indirect(renumbermap[fz_to_num(val)], 0, xref);
fz_array_put(obj, i, val);
fz_drop_obj(val);
}
else
{
renumberobj(val);
}
}
}
}
static void renumberobjs(void)
{
pdf_xref_entry *oldxref;
int newlen;
int num;
/* Apply renumber map to indirect references in all objects in xref */
renumberobj(xref->trailer);
for (num = 0; num < xref->len; num++)
{
fz_obj *obj = xref->table[num].obj;
if (fz_is_indirect(obj))
{
obj = fz_new_indirect(renumbermap[fz_to_num(obj)], 0, xref);
pdf_update_object(xref, num, 0, obj);
fz_drop_obj(obj);
}
else
{
renumberobj(obj);
}
}
/* Create new table for the reordered, compacted xref */
oldxref = xref->table;
xref->table = fz_calloc(xref->len, sizeof(pdf_xref_entry));
xref->table[0] = oldxref[0];
/* Move used objects into the new compacted xref */
newlen = 0;
for (num = 1; num < xref->len; num++)
{
if (uselist[num])
{
if (newlen < renumbermap[num])
newlen = renumbermap[num];
xref->table[renumbermap[num]] = oldxref[num];
}
else
{
if (oldxref[num].obj)
fz_drop_obj(oldxref[num].obj);
}
}
fz_free(oldxref);
/* Update the used objects count in compacted xref */
xref->len = newlen + 1;
/* Update list of used objects to fit with compacted xref */
for (num = 1; num < xref->len; num++)
uselist[num] = 1;
}
/*
* Recreate page tree to only retain specified pages.
*/
static void retainpages(int argc, char **argv)
{
fz_error error;
fz_obj *oldroot, *root, *pages, *kids, *countobj, *parent;
/* Load the old page tree */
error = pdf_load_page_tree(xref);
if (error)
die(fz_rethrow(error, "cannot load page tree"));
/* Keep only pages/type entry to avoid references to unretained pages */
oldroot = fz_dict_gets(xref->trailer, "Root");
pages = fz_dict_gets(oldroot, "Pages");
root = fz_new_dict(2);
fz_dict_puts(root, "Type", fz_dict_gets(oldroot, "Type"));
fz_dict_puts(root, "Pages", fz_dict_gets(oldroot, "Pages"));
pdf_update_object(xref, fz_to_num(oldroot), fz_to_gen(oldroot), root);
fz_drop_obj(root);
/* Create a new kids array with only the pages we want to keep */
parent = fz_new_indirect(fz_to_num(pages), fz_to_gen(pages), xref);
kids = fz_new_array(1);
/* Retain pages specified */
while (argc - fz_optind)
{
int page, spage, epage;
char *spec, *dash;
char *pagelist = argv[fz_optind];
spec = fz_strsep(&pagelist, ",");
while (spec)
{
dash = strchr(spec, '-');
if (dash == spec)
spage = epage = pdf_count_pages(xref);
else
spage = epage = atoi(spec);
if (dash)
{
if (strlen(dash) > 1)
epage = atoi(dash + 1);
else
epage = pdf_count_pages(xref);
}
if (spage > epage)
page = spage, spage = epage, epage = page;
if (spage < 1)
spage = 1;
if (epage > pdf_count_pages(xref))
epage = pdf_count_pages(xref);
for (page = spage; page <= epage; page++)
{
fz_obj *pageobj = xref->page_objs[page-1];
fz_obj *pageref = xref->page_refs[page-1];
fz_dict_puts(pageobj, "Parent", parent);
/* Store page object in new kids array */
fz_array_push(kids, pageref);
}
spec = fz_strsep(&pagelist, ",");
}
fz_optind++;
}
fz_drop_obj(parent);
/* Update page count and kids array */
countobj = fz_new_int(fz_array_len(kids));
fz_dict_puts(pages, "Count", countobj);
fz_drop_obj(countobj);
fz_dict_puts(pages, "Kids", kids);
fz_drop_obj(kids);
}
/*
* Make sure we have loaded objects from object streams.
*/
static void preloadobjstms(void)
{
fz_error error;
fz_obj *obj;
int num;
for (num = 0; num < xref->len; num++)
{
if (xref->table[num].type == 'o')
{
error = pdf_load_object(&obj, xref, num, 0);
if (error)
die(error);
fz_drop_obj(obj);
}
}
}
/*
* Save streams and objects to the output
*/
static inline int isbinary(int c)
{
if (c == '\n' || c == '\r' || c == '\t')
return 0;
return c < 32 || c > 127;
}
static int isbinarystream(fz_buffer *buf)
{
int i;
for (i = 0; i < buf->len; i++)
if (isbinary(buf->data[i]))
return 1;
return 0;
}
static fz_buffer *hexbuf(unsigned char *p, int n)
{
static const char hex[16] = "0123456789abcdef";
fz_buffer *buf;
int x = 0;
buf = fz_new_buffer(n * 2 + (n / 32) + 2);
while (n--)
{
buf->data[buf->len++] = hex[*p >> 4];
buf->data[buf->len++] = hex[*p & 15];
if (++x == 32)
{
buf->data[buf->len++] = '\n';
x = 0;
}
p++;
}
buf->data[buf->len++] = '>';
buf->data[buf->len++] = '\n';
return buf;
}
static void addhexfilter(fz_obj *dict)
{
fz_obj *f, *dp, *newf, *newdp;
fz_obj *ahx, *nullobj;
ahx = fz_new_name("ASCIIHexDecode");
nullobj = fz_new_null();
newf = newdp = NULL;
f = fz_dict_gets(dict, "Filter");
dp = fz_dict_gets(dict, "DecodeParms");
if (fz_is_name(f))
{
newf = fz_new_array(2);
fz_array_push(newf, ahx);
fz_array_push(newf, f);
f = newf;
if (fz_is_dict(dp))
{
newdp = fz_new_array(2);
fz_array_push(newdp, nullobj);
fz_array_push(newdp, dp);
dp = newdp;
}
}
else if (fz_is_array(f))
{
fz_array_insert(f, ahx);
if (fz_is_array(dp))
fz_array_insert(dp, nullobj);
}
else
f = ahx;
fz_dict_puts(dict, "Filter", f);
if (dp)
fz_dict_puts(dict, "DecodeParms", dp);
fz_drop_obj(ahx);
fz_drop_obj(nullobj);
if (newf)
fz_drop_obj(newf);
if (newdp)
fz_drop_obj(newdp);
}
static void copystream(fz_obj *obj, int num, int gen)
{
fz_error error;
fz_buffer *buf, *tmp;
fz_obj *newlen;
error = pdf_load_raw_stream(&buf, xref, num, gen);
if (error)
die(error);
if (doascii && isbinarystream(buf))
{
tmp = hexbuf(buf->data, buf->len);
fz_drop_buffer(buf);
buf = tmp;
addhexfilter(obj);
newlen = fz_new_int(buf->len);
fz_dict_puts(obj, "Length", newlen);
fz_drop_obj(newlen);
}
fprintf(out, "%d %d obj\n", num, gen);
fz_fprint_obj(out, obj, !doexpand);
fprintf(out, "stream\n");
fwrite(buf->data, 1, buf->len, out);
fprintf(out, "endstream\nendobj\n\n");
fz_drop_buffer(buf);
}
static void expandstream(fz_obj *obj, int num, int gen)
{
fz_error error;
fz_buffer *buf, *tmp;
fz_obj *newlen;
error = pdf_load_stream(&buf, xref, num, gen);
if (error)
die(error);
fz_dict_dels(obj, "Filter");
fz_dict_dels(obj, "DecodeParms");
if (doascii && isbinarystream(buf))
{
tmp = hexbuf(buf->data, buf->len);
fz_drop_buffer(buf);
buf = tmp;
addhexfilter(obj);
}
newlen = fz_new_int(buf->len);
fz_dict_puts(obj, "Length", newlen);
fz_drop_obj(newlen);
fprintf(out, "%d %d obj\n", num, gen);
fz_fprint_obj(out, obj, !doexpand);
fprintf(out, "stream\n");
fwrite(buf->data, 1, buf->len, out);
fprintf(out, "endstream\nendobj\n\n");
fz_drop_buffer(buf);
}
static void writeobject(int num, int gen)
{
fz_error error;
fz_obj *obj;
fz_obj *type;
error = pdf_load_object(&obj, xref, num, gen);
if (error)
die(error);
/* skip ObjStm and XRef objects */
if (fz_is_dict(obj))
{
type = fz_dict_gets(obj, "Type");
if (fz_is_name(type) && !strcmp(fz_to_name(type), "ObjStm"))
{
uselist[num] = 0;
fz_drop_obj(obj);
return;
}
if (fz_is_name(type) && !strcmp(fz_to_name(type), "XRef"))
{
uselist[num] = 0;
fz_drop_obj(obj);
return;
}
}
if (!pdf_is_stream(xref, num, gen))
{
fprintf(out, "%d %d obj\n", num, gen);
fz_fprint_obj(out, obj, !doexpand);
fprintf(out, "endobj\n\n");
}
else
{
if (doexpand && !pdf_is_jpx_image(obj))
expandstream(obj, num, gen);
else
copystream(obj, num, gen);
}
fz_drop_obj(obj);
}
static void writexref(void)
{
fz_obj *trailer;
fz_obj *obj;
int startxref;
int num;
startxref = ftell(out);
fprintf(out, "xref\n0 %d\n", xref->len);
for (num = 0; num < xref->len; num++)
{
if (uselist[num])
fprintf(out, "%010d %05d n \n", ofslist[num], genlist[num]);
else
fprintf(out, "%010d %05d f \n", ofslist[num], genlist[num]);
}
fprintf(out, "\n");
trailer = fz_new_dict(5);
obj = fz_new_int(xref->len);
fz_dict_puts(trailer, "Size", obj);
fz_drop_obj(obj);
obj = fz_dict_gets(xref->trailer, "Info");
if (obj)
fz_dict_puts(trailer, "Info", obj);
obj = fz_dict_gets(xref->trailer, "Root");
if (obj)
fz_dict_puts(trailer, "Root", obj);
obj = fz_dict_gets(xref->trailer, "ID");
if (obj)
fz_dict_puts(trailer, "ID", obj);
fprintf(out, "trailer\n");
fz_fprint_obj(out, trailer, !doexpand);
fprintf(out, "\n");
fz_drop_obj(trailer);
fprintf(out, "startxref\n%d\n%%%%EOF\n", startxref);
}
static void writepdf(void)
{
int lastfree;
int num;
for (num = 0; num < xref->len; num++)
{
if (xref->table[num].type == 'f')
genlist[num] = xref->table[num].gen;
if (xref->table[num].type == 'n')
genlist[num] = xref->table[num].gen;
if (xref->table[num].type == 'o')
genlist[num] = 0;
if (dogarbage && !uselist[num])
continue;
if (xref->table[num].type == 'n' || xref->table[num].type == 'o')
{
uselist[num] = 1;
ofslist[num] = ftell(out);
writeobject(num, genlist[num]);
}
}
/* Construct linked list of free object slots */
lastfree = 0;
for (num = 0; num < xref->len; num++)
{
if (!uselist[num])
{
genlist[num]++;
ofslist[lastfree] = num;
lastfree = num;
}
}
writexref();
}
int main(int argc, char **argv)
{
fz_error error;
char *infile;
char *outfile = "out.pdf";
char *password = "";
int c, num;
int subset;
while ((c = fz_getopt(argc, argv, "adgp:")) != -1)
{
switch (c)
{
case 'p': password = fz_optarg; break;
case 'g': dogarbage ++; break;
case 'd': doexpand ++; break;
case 'a': doascii ++; break;
default: usage(); break;
}
}
if (argc - fz_optind < 1)
usage();
infile = argv[fz_optind++];
if (argc - fz_optind > 0 &&
(strstr(argv[fz_optind], ".pdf") || strstr(argv[fz_optind], ".PDF")))
{
outfile = argv[fz_optind++];
}
subset = 0;
if (argc - fz_optind > 0)
subset = 1;
error = pdf_open_xref(&xref, infile, password);
if (error)
die(fz_rethrow(error, "cannot open input file '%s'", infile));
out = fopen(outfile, "wb");
if (!out)
die(fz_throw("cannot open output file '%s'", outfile));
fprintf(out, "%%PDF-%d.%d\n", xref->version / 10, xref->version % 10);
fprintf(out, "%%\316\274\341\277\246\n\n");
uselist = fz_calloc(xref->len + 1, sizeof(char));
ofslist = fz_calloc(xref->len + 1, sizeof(int));
genlist = fz_calloc(xref->len + 1, sizeof(int));
renumbermap = fz_calloc(xref->len + 1, sizeof(int));
for (num = 0; num < xref->len; num++)
{
uselist[num] = 0;
ofslist[num] = 0;
genlist[num] = 0;
renumbermap[num] = num;
}
/* Make sure any objects hidden in compressed streams have been loaded */
preloadobjstms();
/* Only retain the specified subset of the pages */
if (subset)
retainpages(argc, argv);
/* Sweep & mark objects from the trailer */
if (dogarbage >= 1)
sweepobj(xref->trailer);
/* Coalesce and renumber duplicate objects */
if (dogarbage >= 3)
removeduplicateobjs();
/* Compact xref by renumbering and removing unused objects */
if (dogarbage >= 2)
compactxref();
/* Make renumbering affect all indirect references and update xref */
if (dogarbage >= 2)
renumberobjs();
writepdf();
if (fclose(out))
die(fz_throw("cannot close output file '%s'", outfile));
fz_free(uselist);
fz_free(ofslist);
fz_free(genlist);
fz_free(renumbermap);
pdf_free_xref(xref);
fz_flush_warnings();
return 0;
}

File diff suppressed because it is too large Load Diff

View File

@ -1,240 +0,0 @@
/*
* pdfshow -- the ultimate pdf debugging tool
*/
#include "fitz.h"
#include "mupdf.h"
static pdf_xref *xref = NULL;
static int showbinary = 0;
static int showdecode = 1;
static int showcolumn;
void die(fz_error error)
{
fz_catch(error, "aborting");
if (xref)
pdf_free_xref(xref);
exit(1);
}
static void usage(void)
{
fprintf(stderr, "usage: pdfshow [options] file.pdf [grepable] [xref] [trailer] [pagetree] [object numbers]\n");
fprintf(stderr, "\t-b\tprint streams as binary data\n");
fprintf(stderr, "\t-e\tprint encoded streams (don't decode)\n");
fprintf(stderr, "\t-p\tpassword\n");
exit(1);
}
static void showtrailer(void)
{
if (!xref)
die(fz_throw("no file specified"));
printf("trailer\n");
fz_debug_obj(xref->trailer);
printf("\n");
}
static void showxref(void)
{
if (!xref)
die(fz_throw("no file specified"));
pdf_debug_xref(xref);
printf("\n");
}
static void showpagetree(void)
{
fz_error error;
fz_obj *ref;
int count;
int i;
if (!xref)
die(fz_throw("no file specified"));
if (!xref->page_len)
{
error = pdf_load_page_tree(xref);
if (error)
die(fz_rethrow(error, "cannot load page tree"));
}
count = pdf_count_pages(xref);
for (i = 0; i < count; i++)
{
ref = xref->page_refs[i];
printf("page %d = %d %d R\n", i + 1, fz_to_num(ref), fz_to_gen(ref));
}
printf("\n");
}
static void showsafe(unsigned char *buf, int n)
{
int i;
for (i = 0; i < n; i++) {
if (buf[i] == '\r' || buf[i] == '\n') {
putchar('\n');
showcolumn = 0;
}
else if (buf[i] < 32 || buf[i] > 126) {
putchar('.');
showcolumn ++;
}
else {
putchar(buf[i]);
showcolumn ++;
}
if (showcolumn == 79) {
putchar('\n');
showcolumn = 0;
}
}
}
static void showstream(int num, int gen)
{
fz_error error;
fz_stream *stm;
unsigned char buf[2048];
int n;
showcolumn = 0;
if (showdecode)
error = pdf_open_stream(&stm, xref, num, gen);
else
error = pdf_open_raw_stream(&stm, xref, num, gen);
if (error)
die(error);
while (1)
{
n = fz_read(stm, buf, sizeof buf);
if (n < 0)
die(n);
if (n == 0)
break;
if (showbinary)
fwrite(buf, 1, n, stdout);
else
showsafe(buf, n);
}
fz_close(stm);
}
static void showobject(int num, int gen)
{
fz_error error;
fz_obj *obj;
if (!xref)
die(fz_throw("no file specified"));
error = pdf_load_object(&obj, xref, num, gen);
if (error)
die(error);
if (pdf_is_stream(xref, num, gen))
{
if (showbinary)
{
showstream(num, gen);
}
else
{
printf("%d %d obj\n", num, gen);
fz_debug_obj(obj);
printf("stream\n");
showstream(num, gen);
printf("endstream\n");
printf("endobj\n\n");
}
}
else
{
printf("%d %d obj\n", num, gen);
fz_debug_obj(obj);
printf("endobj\n\n");
}
fz_drop_obj(obj);
}
static void showgrep(char *filename)
{
fz_error error;
fz_obj *obj;
int i;
for (i = 0; i < xref->len; i++)
{
if (xref->table[i].type == 'n' || xref->table[i].type == 'o')
{
error = pdf_load_object(&obj, xref, i, 0);
if (error)
die(error);
fz_sort_dict(obj);
printf("%s:%d: ", filename, i);
fz_fprint_obj(stdout, obj, 1);
fz_drop_obj(obj);
}
}
printf("%s:trailer: ", filename);
fz_fprint_obj(stdout, xref->trailer, 1);
}
int main(int argc, char **argv)
{
char *password = NULL; /* don't throw errors if encrypted */
char *filename;
fz_error error;
int c;
while ((c = fz_getopt(argc, argv, "p:be")) != -1)
{
switch (c)
{
case 'p': password = fz_optarg; break;
case 'b': showbinary = 1; break;
case 'e': showdecode = 0; break;
default: usage(); break;
}
}
if (fz_optind == argc)
usage();
filename = argv[fz_optind++];
error = pdf_open_xref(&xref, filename, password);
if (error)
die(fz_rethrow(error, "cannot open document: %s", filename));
if (fz_optind == argc)
showtrailer();
while (fz_optind < argc)
{
switch (argv[fz_optind][0])
{
case 't': showtrailer(); break;
case 'x': showxref(); break;
case 'p': showpagetree(); break;
case 'g': showgrep(filename); break;
default: showobject(atoi(argv[fz_optind]), 0); break;
}
fz_optind++;
}
pdf_free_xref(xref);
fz_flush_warnings();
return 0;
}

Binary file not shown.

View File

@ -1,22 +0,0 @@
FREETYPE_SRC := \
ftbase.c \
ftbbox.c \
ftbitmap.c \
ftgasp.c \
ftglyph.c \
ftinit.c \
ftstroke.c \
ftsynth.c \
ftsystem.c \
fttype1.c \
ftxf86.c \
cff.c \
psaux.c \
pshinter.c \
psnames.c \
raster.c \
sfnt.c \
smooth.c \
truetype.c \
type1.c \
type1cid.c \

View File

@ -1,18 +0,0 @@
include osrules.mak
.SUFFIXES: .asm;
OBJS = crt0.o
all: $(OBJS)
ifdef ON_WINDOWS
crt0.o: crt0_$(STUBFMT).asm
fasm crt0_$(STUBFMT).asm crt0.o
else
crt0.o: crt0_$(STUBFMT)_nounderscores.asm
fasm crt0_$(STUBFMT)_nounderscores.asm crt0.o
endif
clean:
$(RM) $(OBJS)

Binary file not shown.

View File

@ -1,58 +0,0 @@
CATCH_NULL_CALL = 0
format MS COFF
section '.text' code readable executable
public start
;EXTRN _edata
EXTRN ___menuet__app_param_area
EXTRN ___menuet__app_path_area
EXTRN ___crt1_startup
start:
public ___menuet__app_header
public ___menuet__memsize
section '.A' code readable executable
___menuet__app_header:
db 'MENUET01'
dd 0x01
if CATCH_NULL_CALL
dd do_start
else
dd ___crt1_startup
end if
; dd _edata
dd 0
___menuet__memsize:
dd 0x400000
dd app_stack
dd ___menuet__app_param_area
dd ___menuet__app_path_area
if CATCH_NULL_CALL
do_start:
mov byte [0], 0xE9
mov dword [1], _libc_null_call-5
call ___crt1_startup
; Handle exit if __crt1_startup returns (shouldn't happen)
mov eax,-1
int 0x40
end if
if CATCH_NULL_CALL
EXTRN ___libc_null_call
_libc_null_call:
push eax
push ebx
push ecx
push edx
push esi
push edi
push ebp
call ___libc_null_call
mov eax,-1
int 0x40
end if
section '.bss' readable writeable
rd 0x20000
app_stack:

View File

@ -1,56 +0,0 @@
CATCH_NULL_CALL = 0
format ELF
section '.text' executable
public start
EXTRN _edata
EXTRN ___menuet__app_param_area
EXTRN ___menuet__app_path_area
EXTRN ___crt1_startup
start:
public ___menuet__app_header
public ___menuet__memsize
___menuet__app_header:
db 'MENUET01'
dd 0x01
if CATCH_NULL_CALL
dd do_start
else
dd ___crt1_startup
end if
dd _edata
___menuet__memsize:
dd 0x800000
dd app_stack
dd ___menuet__app_param_area
dd ___menuet__app_path_area
if CATCH_NULL_CALL
do_start:
mov byte [0], 0xE9
mov dword [1], _libc_null_call-5
call ___crt1_startup
; Handle exit if __crt1_startup returns (shouldn't happen)
mov eax,-1
int 0x40
end if
if CATCH_NULL_CALL
EXTRN ___libc_null_call
_libc_null_call:
push eax
push ebx
push ecx
push edx
push esi
push edi
push ebp
call ___libc_null_call
mov eax,-1
int 0x40
end if
section '.bss' writeable
rd 0x20000
app_stack:

View File

@ -1,56 +0,0 @@
CATCH_NULL_CALL = 0
format ELF
section '.text' executable
public start
EXTRN edata
EXTRN __menuet__app_param_area
EXTRN __menuet__app_path_area
EXTRN __crt1_startup
start:
public __menuet__app_header
public __menuet__memsize
__menuet__app_header:
db 'MENUET01'
dd 0x01
if CATCH_NULL_CALL
dd do_start
else
dd __crt1_startup
end if
dd edata
__menuet__memsize:
dd 0x800000
dd app_stack
dd __menuet__app_param_area
dd __menuet__app_path_area
if CATCH_NULL_CALL
do_start:
mov byte [0], 0xE9
mov dword [1], _libc_null_call-5
call __crt1_startup
; Handle exit if __crt1_startup returns (shouldn't happen)
mov eax,-1
int 0x40
end if
if CATCH_NULL_CALL
EXTRN __libc_null_call
_libc_null_call:
push eax
push ebx
push ecx
push edx
push esi
push edi
push ebp
call __libc_null_call
mov eax,-1
int 0x40
end if
section '.bss' writeable
rd 4096*4
app_stack:

View File

@ -1,58 +0,0 @@
ifdef windir
ON_WINDOWS = 1
else
ifdef WINDIR
ON_WINDOWS = 1
endif
endif
ifndef ON_WINDOWS
VERSION_OS = linux
NEED_UNDERSCORES = undef
EXESUFFIX =
RM = rm -f
MV = mv
D_ECHO = echo
LIBDIR = $(MENUETDEV)/lib
ASMFMT = elf
else
ifdef HOME
VERSION_OS = cygwin
NEED_UNDERSCORES = define
EXESUFFIX = .exe
RM = rm -f
MV = mv
D_ECHO = echo
LIBDIR = $(MENUETDEV)/lib
ASMFMT = elf
else
VERSION_OS = MinGW
NEED_UNDERSCORES = define
EXESUFFIX = .exe
RM = del
MV = move
D_ECHO = echo.
ON_MINGW = 1
LIBDIR = $(MENUETDEV)\lib
ASMFMT = coff
endif
endif
HAS_DEVENV = 0
GPP_TOOLNAME = g++
STUBFMT = elf
MMKDEP = $(MENUETDEV)/linuxtools/mmkdep
MGCC = $(MENUETDEV)/linuxtools/mgcc
MGPP = $(MENUETDEV)/linuxtools/mgpp
MLD = $(MENUETDEV)/linuxtools/mld
MCHMEM = $(MENUETDEV)/linuxtools/mchmem
GCC32OPT =
AS32OPT =
LD32OPT =
ifneq (,$(findstring 64,$(shell gcc -dumpmachine)))
GCC32OPT = -m32
AS32OPT = --32
LD32OPT = -m$(ASMFMT)_i386
endif