Changeset 9158 for OpenSceneGraph/trunk/examples/osgpdf/osgpdf.cpp

Timestamp:

11/12/08 15:57:30 (5 years ago)

Author:

robert

Message:

Improved filepath handling, and increased the image resolution for better rendering quality

Files:

• OpenSceneGraph/trunk/examples/osgpdf/osgpdf.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/examples/osgpdf/osgpdf.cpp

@@ -7 +7 @@
 #include <osgViewer/ViewerEventHandlers>
 
+#include <osgDB/FileUtils>
+#include <osgDB/FileNameUtils>
 #include <osgDB/ReadFile>
 
@@ -94 +96 @@
         {
             osg::notify(osg::NOTICE)<<"open("<<filename<<")"<<std::endl;
+            
+            std::string foundFile = osgDB::findDataFile(filename);
+            if (foundFile.empty())
+            {
+                osg::notify(osg::NOTICE)<<"could not find filename="<<filename<<std::endl;
+                return false;
+            }
+            
+            osg::notify(osg::NOTICE)<<"foundFile = "<<foundFile<<std::endl;
+            foundFile = osgDB::getRealPath(foundFile);
+            osg::notify(osg::NOTICE)<<"foundFile = "<<foundFile<<std::endl;
 
             static bool gTypeInit = false;
@@ -99 +112 @@
             if(!gTypeInit)
             {
-                    g_type_init();
-
-                    gTypeInit = true;
+                g_type_init();
+
+                gTypeInit = true;
             }
-
-            PopplerDocument* doc = poppler_document_new_from_file(filename.c_str(), NULL, NULL);
+            
+            std::string uri = std::string("file:") + foundFile;
+
+            PopplerDocument* doc = poppler_document_new_from_file(uri.c_str(), NULL, NULL);
             if (!doc) 
             {
-                osg::notify(osg::NOTICE)<<" could not open("<<filename<<")"<<std::endl;
+                osg::notify(osg::NOTICE)<<" could not open("<<filename<<"), uri="<<uri<<std::endl;
 
                 return false;
@@ -171 +186 @@
             poppler_page_get_size(page, &w, &h);
 
-            create((unsigned int)(w),(unsigned int)(h));
+            create((unsigned int)(w*2.0),(unsigned int)(h*2.0));
 
             double r = 1.0;
@@ -181 +196 @@
             
                 cairo_set_source_rgba(_context, r, g, b, a);
-                cairo_rectangle(_context, 0.0, 0.0, w, h);
+                cairo_rectangle(_context, 0.0, 0.0, double(s()), double(t()));
                 cairo_fill(_context);
 
+                cairo_scale(_context, double(s())/w, double(t())/h);
+
                 poppler_page_render(page, getContext());
             
+
             cairo_restore(_context);