stefan pushed a commit to branch master.

http://git.enlightenment.org/core/evas_generic_loaders.git/commit/?id=43d6926fbd61d73bdfb15d6d5aded3da7fa80bc7

commit 43d6926fbd61d73bdfb15d6d5aded3da7fa80bc7
Author: Stefan Schmidt <ste...@osg.samsung.com>
Date:   Tue Nov 10 16:10:19 2015 +0100

    pdf: avoid shadowing a global varibale by renaming oe in local scope
    
    The global page variable is actually a poppler type and the local one only 
the
    page number as int.
---
 src/bin/pdf/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/pdf/main.cpp b/src/bin/pdf/main.cpp
index e33e18b..6b1de13 100644
--- a/src/bin/pdf/main.cpp
+++ b/src/bin/pdf/main.cpp
@@ -214,7 +214,7 @@ main(int argc, char **argv)
    int i;
    int size_w = 0, size_h = 0;
    int head_only = 0;
-   int page = 0;
+   int page_num = 0;
 
    if (argc < 2) return -1;
    // file is ALWAYS first arg, other options come after
@@ -227,7 +227,7 @@ main(int argc, char **argv)
         else if (!strcmp(argv[i], "-key"))
           {
              i++;
-             page = atoi(argv[i]);
+             page_num = atoi(argv[i]);
              i++;
           }
         else if (!strcmp(argv[i], "-opt-scale-down-by"))
@@ -251,7 +251,7 @@ main(int argc, char **argv)
      }
 
    D("dpi....: %f\n", dpi);
-   D("page...: %d\n", page);
+   D("page...: %d\n", page_num);
 
    // This is a funny hack to call an external tool to generate a pdf that 
will then be processed by poppler
    extension = strrchr(file, '.');
@@ -306,7 +306,7 @@ main(int argc, char **argv)
 
    // Now process the pdf (or the generated pdf)
    D("poppler_file_init\n");
-   if (!poppler_init(file, page, size_w, size_h))
+   if (!poppler_init(file, page_num, size_w, size_h))
      return -1;
    D("poppler_file_init done\n");
 

-- 


Reply via email to