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

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index a5e7cf8..824657b 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -132,40 +132,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 +227,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;
 	}
     }
@@ -482,18 +483,29 @@ int main(int argn, char *argv[])
     msg("<error> Couldn't find any fonts!");
 #endif
 
-    pdfswf_init(filename, password);
-    pdfswf_setoutputfilename(outputname);
-
-    int pages = pdfswf_numpages();
-    for(t = 1; t <= pages; t++) 
-    {
-	if(is_in_range(t, pagerange))
-	pdfswf_convertpage(t);
+    pdf_doc_t* pdf = pdf_init(filename, password);
+    if(!pdf) {
+        msg("<error> Couldn't open %s", filename);
+        exit(1);
     }
-    pdfswf_performconversion();
+    swf_output_t* swf = swf_output_init();
 
-    pdfswf_close();
+    for(t = 1; t <= pdf->num_pages; 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);
+        }
+    }
+    swf_output_save(swf, outputname);
+    swf_output_destroy(swf);
+
+    pdf_destroy(pdf);
 
     if(viewer || preloader) {
 #ifndef SYSTEM_BACKTICKS