X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=pdf2swf%2Fpdf2swf.cc;h=c943c691848a51ccf5c8262e0037c2f0811b0274;hb=ca2c2fd23adb5aadc0a40c2469f7855fbf1dd440;hp=a5e7cf81f911a5761562aa294ebbca5e243528e0;hpb=335b6b2b798d308f333c371caae0bfc7628506db;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index a5e7cf8..c943c69 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -33,9 +33,7 @@
 #endif
 #include "../lib/args.h"
 #include "SWFOutputDev.h"
-extern "C" {
 #include "log.h"
-}
 
 #ifndef WIN32
 #define FONTDIR SWFTOOLS_DATADIR "/fonts"
@@ -132,40 +130,41 @@ int args_callback_option(char*name,char*val) {
     }
     else if (!strcmp(name, "S"))
     {
-	pdfswf_drawonlyshapes();
+	pdfswf_setparameter("drawonlyshapes", "1");
 	return 0;
     }
     else if (!strcmp(name, "i"))
     {
-	pdfswf_ignoredraworder();
+	pdfswf_setparameter("ignoredraworder", "1");
 	return 0;
     }
     else if (!strcmp(name, "z"))
     {
-	pdfswf_enablezlib();
+	pdfswf_setparameter("enablezlib", "1");
 	return 0;
     }
     else if (!strcmp(name, "n"))
     {
-	pdfswf_linksopennewwindow();
+	pdfswf_setparameter("opennewwindow", "1");
 	return 0;
     }
     else if (!strcmp(name, "t"))
     {
-	pdfswf_insertstop();
+	pdfswf_setparameter("insertstop", "1");
 	return 0;
     }
     else if (!strcmp(name, "T"))
     {
-	int i = atoi(val);
 	if(!strcasecmp(val, "mx"))
-	    i = 6;
-	pdfswf_setversion(i);
+	    pdfswf_setparameter("flashversion", "6");
+	else
+	    pdfswf_setparameter("flashversion", val);
+
 	return 1;
     }
     else if (!strcmp(name, "f"))
     {
-	pdfswf_storeallcharacters();
+	pdfswf_setparameter("storeallcharacters", "1");
 	return 0;
     }
     else if (!strcmp(name, "F"))
@@ -226,10 +225,10 @@ int args_callback_option(char*name,char*val) {
     else if (!strcmp(name, "j"))
     {
 	if(name[1]) {
-	    pdfswf_jpegquality(atoi(&name[1]));
+	    pdfswf_setparameter("jpegquality", &name[1]);
 	    return 0;
 	} else {
-	    pdfswf_jpegquality(atoi(val));
+	    pdfswf_setparameter("jpegquality", val);
 	    return 1;
 	}
     }
@@ -343,7 +342,7 @@ void args_callback_usage(char*name)
 }
 
 #ifdef HAVE_DIRENT_H
-void addfontdir(char* dirname, int*numfonts)
+static void addfontdir(char* dirname, int*numfonts)
 {
     if(!numfonts)
 	msg("<verbose> Adding %s to search path\n", dirname);
@@ -353,7 +352,7 @@ void addfontdir(char* dirname, int*numfonts)
 	msg("<warning> Couldn't open directory %s\n", dirname);
 	return;
     }
-    dirent*ent;
+    struct dirent*ent;
     while(1) {
 	ent = readdir (dir);
 	if (!ent) 
@@ -392,7 +391,7 @@ void addfontdir(char* dirname, int*numfonts)
 }
 #endif
 
-char* stripfilename(char*filename, char*newext)
+static char* stripfilename(char*filename, char*newext)
 {
     char*last1 = strrchr(filename, '/');
     char*last2 = strrchr(filename, '\\');
@@ -482,18 +481,29 @@ int main(int argn, char *argv[])
     msg("<error> Couldn't find any fonts!");
 #endif
 
-    pdfswf_init(filename, password);
-    pdfswf_setoutputfilename(outputname);
+    pdf_doc_t* pdf = pdf_init(filename, password);
+    if(!pdf) {
+        msg("<error> Couldn't open %s", filename);
+        exit(1);
+    }
+    swf_output_t* swf = swf_output_init();
 
-    int pages = pdfswf_numpages();
-    for(t = 1; t <= pages; t++) 
+    for(t = 1; t <= pdf->num_pages; t++) 
     {
-	if(is_in_range(t, pagerange))
-	pdfswf_convertpage(t);
+	if(is_in_range(t, pagerange)) {
+            /* for links: FIXME */
+            pdfswf_preparepage(t);
+        }
+	if(is_in_range(t, pagerange)) {
+            pdf_page_t*page = pdf_getpage(pdf, t);
+	    pdf_page_render(page, swf);
+            pdf_page_destroy(page);
+        }
     }
-    pdfswf_performconversion();
+    swf_output_save(swf, outputname);
+    swf_output_destroy(swf);
 
-    pdfswf_close();
+    pdf_destroy(pdf);
 
     if(viewer || preloader) {
 #ifndef SYSTEM_BACKTICKS
@@ -528,4 +538,3 @@ int main(int argn, char *argv[])
     return 0;
 }
 
-