From cfd4c514cb6fa894aba13a1b550fc41a5756bb71 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 12 May 2010 11:58:01 +0000 Subject: [PATCH] Improved the indentation/replaced tabs --- include/osgWidget/PdfReader | 32 ++++----- src/osgPlugins/pdf/ReaderWriterPDF.cpp | 96 +++++++++++++------------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/include/osgWidget/PdfReader b/include/osgWidget/PdfReader index cbeb329bf..763bb0979 100644 --- a/include/osgWidget/PdfReader +++ b/include/osgWidget/PdfReader @@ -59,11 +59,11 @@ struct GeometryHints osg::Vec3 position; osg::Vec3 widthVec; osg::Vec3 heightVec; - + osg::Vec4 backgroundColor; - + AspectRatioPolicy aspectRatioPolicy; - + unsigned int widthResolution; unsigned int heightResolution; @@ -79,21 +79,21 @@ class PdfImage : public osg::Image _pageNum(0), _nextPageKeyEvent('n'), _previousPageKeyEvent('p') {} - + void setBackgroundColor(const osg::Vec4& backgroundColor) { _backgroundColor = backgroundColor; } const osg::Vec4& getBackgroundColor() const { return _backgroundColor; } int getPageNum() const { return _pageNum; } - - virtual int getNumOfPages() = 0; - + + virtual int getNumOfPages() = 0; + virtual bool page(int pageNum) = 0; bool previous() { return page(_pageNum-1); } - + bool next() { return page(_pageNum+1); @@ -104,17 +104,17 @@ class PdfImage : public osg::Image void setPreviousPageKeyEvent(int key) { _previousPageKeyEvent = key; } int getPreviousPageKeyEvent() const { return _previousPageKeyEvent; } - + protected: - + virtual ~PdfImage() {} - + osg::Vec4 _backgroundColor; int _pageNum; int _nextPageKeyEvent; int _previousPageKeyEvent; - + }; @@ -122,11 +122,11 @@ class PdfImage : public osg::Image class OSGWIDGET_EXPORT PdfReader : public osg::Geode { public: - + PdfReader() {} PdfReader(const std::string& filename, const GeometryHints& hints = GeometryHints()); - + bool assign(PdfImage* pdfImage, const GeometryHints& hints = GeometryHints()); bool open(const std::string& filename, const GeometryHints& hints = GeometryHints()); @@ -134,11 +134,11 @@ class OSGWIDGET_EXPORT PdfReader : public osg::Geode bool page(int pageNum); bool previous(); - + bool next(); protected: - + osg::ref_ptr _pdfImage; }; diff --git a/src/osgPlugins/pdf/ReaderWriterPDF.cpp b/src/osgPlugins/pdf/ReaderWriterPDF.cpp index 2887f668e..8a1757df1 100644 --- a/src/osgPlugins/pdf/ReaderWriterPDF.cpp +++ b/src/osgPlugins/pdf/ReaderWriterPDF.cpp @@ -1,4 +1,4 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1999-2008 Robert Osfield +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1999-2008 Robert Osfield * * This software is open source and may be redistributed and/or modified under * the terms of the GNU General Public License (GPL) version 2.0. @@ -24,13 +24,13 @@ class CairoImage : public osg::Referenced { public: - + CairoImage(osg::Image* image): _image(image), _surface(0), _context(0) {} - - + + void create(int width, int height) { if (_image->data() && width==_image->s() && height==_image->t()) @@ -45,25 +45,25 @@ class CairoImage : public osg::Referenced _image->setPixelFormat(GL_BGRA); _image->setDataVariance(osg::Object::DYNAMIC); _image->setOrigin(osg::Image::TOP_LEFT); - - + + // create a cairo surface for this image data _surface = cairo_image_surface_create_for_data( _image->data(), CAIRO_FORMAT_ARGB32, width, height, _image->getRowSizeInBytes()); - + // create a context for the surface _context = cairo_create(_surface); - } - + } + void destroy() { if (_surface) cairo_surface_destroy(_surface); - if (_context) cairo_destroy(_context); + if (_context) cairo_destroy(_context); } - + cairo_surface_t* getSurface() { return _surface; } const cairo_surface_t* getSurface() const { return _surface; } @@ -85,51 +85,51 @@ class CairoImage : public osg::Referenced class PopplerPdfImage : public osgWidget::PdfImage { public: - + PopplerPdfImage(): _doc(0) { - _cairoImage = new CairoImage(this); + _cairoImage = new CairoImage(this); } - + virtual ~PopplerPdfImage() { _cairoImage = 0; - + if (_doc) { - g_object_unref(_doc); + g_object_unref(_doc); } } - + PopplerDocument* _doc; - - int getNumOfPages() { return _doc ? poppler_document_get_n_pages(_doc) : 0; } + + int getNumOfPages() { return _doc ? poppler_document_get_n_pages(_doc) : 0; } bool open(const std::string& filename) { osg::notify(osg::NOTICE)<<"open("<=getNumOfPages()) return false; - PopplerPage* page = poppler_document_get_page(_doc, pageNum); + PopplerPage* page = poppler_document_get_page(_doc, pageNum); + + if(!page) return false; - if(!page) return false; - _pageNum = pageNum; double w = 0.0f; @@ -207,7 +207,7 @@ class PopplerPdfImage : public osgWidget::PdfImage osg::clearImageToColor(this, _backgroundColor); cairo_save(_cairoImage->getContext()); - + cairo_rectangle(_cairoImage->getContext(), 0.0, 0.0, double(s()), double(t())); cairo_scale(_cairoImage->getContext(), double(s())/w, double(t())/h); poppler_page_render(page, _cairoImage->getContext()); @@ -215,9 +215,9 @@ class PopplerPdfImage : public osgWidget::PdfImage cairo_restore(_cairoImage->getContext()); dirty(); - + return true; - } + } protected: @@ -230,12 +230,12 @@ class PopplerPdfImage : public osgWidget::PdfImage class ReaderWriterPDF : public osgDB::ReaderWriter { public: - + ReaderWriterPDF() { supportsExtension("pdf","PDF plugin"); } - + virtual const char* className() const { return "PDF plugin"; } virtual osgDB::ReaderWriter::ReadResult readObject(const std::string& file, const osgDB::ReaderWriter::Options* options) const @@ -255,25 +255,25 @@ class ReaderWriterPDF : public osgDB::ReaderWriter { return osgDB::ReaderWriter::ReadResult::FILE_NOT_FOUND; } - + osg::ref_ptr image = new PopplerPdfImage; image->setDataVariance(osg::Object::DYNAMIC); - + image->setOrigin(osg::Image::TOP_LEFT); if (!image->open(file)) { return "Could not open "+file; } - + return image.get(); } - + virtual osgDB::ReaderWriter::ReadResult readNode(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const { osgDB::ReaderWriter::ReadResult result = readImage(fileName, options); if (!result.validImage()) return result; - + osg::ref_ptr pdfReader = new osgWidget::PdfReader(); if (pdfReader->assign(dynamic_cast(result.getImage())))