← Back to branch summary

~ubuntu-branches/ubuntu/precise/poppler/precise-security

« back to all changes in this revision

Viewing changes to qt4/src/poppler-private.h

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-03-08 10:46:40 UTC
  • mfrom: (1.5.5) (4.3.2 experimental)
  • Revision ID: package-import@ubuntu.com-20110308104640-de1rwygu2cx2t0yt
Tags: 0.16.3-1ubuntu1
* Merge with Debian experimental. Remaining Ubuntu changes:
  - debian/control: Lower poppler-data to Suggests: (handled by
    language-selector).
  - Add 10_fix-a4-page-shift-on-brother-ps-printers.patch: Fix page shifts
    when printing on A4 paper with Brother PostScript printers.
    (LP #293832)
  - debian/control, debian/rules: Disable OpenJPEG, it's in universe.

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt4/src/poppler-private.h
1
1
/* poppler-private.h: qt interface to poppler
2
2
 * Copyright (C) 2005, Net Integration Technologies, Inc.
3
3
 * Copyright (C) 2005, 2008, Brad Hards <bradh@frogmouth.net>
4
 
 * Copyright (C) 2006-2009 by Albert Astals Cid <aacid@kde.org>
 
4
 * Copyright (C) 2006-2009, 2011 by Albert Astals Cid <aacid@kde.org>
5
5
 * Copyright (C) 2007-2009 by Pino Toscano <pino@kde.org>
6
6
 * Inspired on code by
7
7
 * Copyright (C) 2004 by Albert Astals Cid <tsdgeos@terra.es>
89
89
                init(ownerPassword, userPassword);
90
90
            }
91
91
        
92
 
        void init(GooString *ownerPassword, GooString *userPassword)
93
 
            {
94
 
                m_fontInfoIterator = 0;
95
 
                m_backend = Document::SplashBackend;
96
 
                m_outputDev = 0;
97
 
                paperColor = Qt::white;
98
 
                m_hints = 0;
99
 
                m_optContentModel = 0;
100
 
                // It might be more appropriate to delete these in PDFDoc
101
 
                delete ownerPassword;
102
 
                delete userPassword;
103
 
                
104
 
                if ( count == 0 )
105
 
                {
106
 
                        globalParams = new GlobalParams();
107
 
                        setErrorFunction(qt4ErrorFunction);
108
 
                }
109
 
                count ++;
110
 
            }
 
92
        void init(GooString *ownerPassword, GooString *userPassword);
111
93
        
112
 
        ~DocumentData()
113
 
        {
114
 
                qDeleteAll(m_embeddedFiles);
115
 
                delete (OptContentModel *)m_optContentModel;
116
 
                delete doc;
117
 
                delete m_outputDev;
118
 
                delete m_fontInfoIterator;
119
 
                
120
 
                count --;
121
 
                if ( count == 0 ) delete globalParams;
122
 
        }
 
94
        ~DocumentData();
123
95
        
124
96
        OutputDev *getOutputDev()
125
97
        {