Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto/epdf
Dir : e17/proto/epdf/src/bin
Modified Files:
epdf_esmart_test.c epdf_evas_test.c
Log Message:
* src/bin/epdf_esmart_test.c: (main):
* src/bin/epdf_evas_test.c: (main):
correctly init / shutdown the efl
improve the sizing of the ecore_evas
* src/lib/epdf_document.cpp:
* src/lib/epdf_index.cpp:
* src/lib/epdf_page.cpp:
* src/lib/epdf_page_transition.cpp:
include correctly config.h
* src/lib/ewl_pdf.c: (ewl_pdf_init), (ewl_pdf_file_set),
(ewl_pdf_page_set), (ewl_pdf_page_get), (ewl_pdf_pdf_size_get),
(ewl_pdf_orientation_set), (ewl_pdf_orientation_get),
(ewl_pdf_scale_set), (ewl_pdf_scale_get), (ewl_pdf_page_next),
(ewl_pdf_page_previous), (ewl_pdf_search_text_set),
(ewl_pdf_search_first_page_set),
(ewl_pdf_search_is_case_sensitive), (ewl_pdf_search_next),
(ewl_pdf_pdf_document_get), (ewl_pdf_pdf_page_get),
(ewl_pdf_pdf_index_get), (ewl_pdf_configure_cb),
(ewl_pdf_reveal_cb), (ewl_pdf_destroy_cb):
* src/lib/ewl_pdf.h:
render in the configure callback and not in the reveal one.
formatting
* src/plugins/epsilon/epsilon_thumbnailer.c:
(epsilon_generate_thumb):
remove uneeded variable and render the fisrt page
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/epdf_esmart_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- epdf_esmart_test.c 21 May 2008 13:07:08 -0000 1.5
+++ epdf_esmart_test.c 22 May 2008 04:43:14 -0000 1.6
@@ -20,29 +20,30 @@
Evas_Object *o;
Evas_Object *bg;
char *filename;
+ double hscale;
+ double vscale;
int page_number;
int width;
int height;
+ int ee_width;
+ int ee_height;
- if (argc < 3)
- {
- printf ("\nUsage: %s filename page_number\n\n", argv[0]);
- exit (-1);
- }
+ if (argc < 3) {
+ printf ("\nUsage: %s filename page_number\n\n", argv[0]);
+ return EXIT_FAILURE;
+ }
filename = argv[1];
sscanf (argv[2], "%d", &page_number);
- if (!evas_init()) return -1;
if (!ecore_init()) {
evas_shutdown ();
- return -1;
+ return EXIT_FAILURE;
}
if (!ecore_evas_init()) {
ecore_shutdown ();
- evas_shutdown ();
- return -1;
+ return EXIT_FAILURE;
}
ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 0, 0);
@@ -64,9 +65,9 @@
if (!esmart_pdf_init (o)) {
ecore_evas_shutdown ();
ecore_shutdown ();
- evas_shutdown ();
- return -1;
+ return EXIT_FAILURE;
}
+
esmart_pdf_file_set (o, filename);
esmart_pdf_page_set (o, page_number);
esmart_pdf_render (o);
@@ -74,14 +75,18 @@
evas_object_show (o);
esmart_pdf_size_get (o, &width, &height);
- ecore_evas_resize(ee, width, height);
- evas_object_resize(bg, width, height);
+ esmart_ps_scale_get (o, &hscale, &vscale);
+ ee_width = (int)(width * hscale);
+ ee_height = (int)(height * vscale);
+
+ ecore_evas_resize(ee, ee_width, ee_height);
+ evas_object_resize(bg, ee_width, ee_height);
ecore_main_loop_begin ();
+ evas_object_del (o);
ecore_evas_shutdown ();
ecore_shutdown ();
- evas_shutdown ();
return 0;
}
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/epdf_evas_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- epdf_evas_test.c 21 May 2008 13:07:08 -0000 1.10
+++ epdf_evas_test.c 22 May 2008 04:43:14 -0000 1.11
@@ -56,15 +56,16 @@
document_info_print (document, page);
- if (!evas_init()) return -1;
if (!ecore_init()) {
- evas_shutdown ();
+ epdf_page_delete (page);
+ epdf_document_delete (document);
return EXIT_FAILURE;
}
if (!ecore_evas_init()) {
- evas_shutdown ();
ecore_shutdown ();
+ epdf_page_delete (page);
+ epdf_document_delete (document);
return EXIT_FAILURE;
}
@@ -76,8 +77,10 @@
if (!ee) {
printf ("Can not find Software X11 engine. Trying DirectDraw
engine...\n");
printf ("Exiting...\n");
- evas_shutdown ();
+ ecore_evas_shutdown ();
ecore_shutdown ();
+ epdf_page_delete (page);
+ epdf_document_delete (document);
return EXIT_FAILURE;
}
}
@@ -102,7 +105,6 @@
ecore_evas_shutdown ();
ecore_shutdown ();
- evas_shutdown ();
return EXIT_SUCCESS;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
