← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/pageitem_imageframe.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/pageitem_imageframe.cpp
66
66
                                p->fillPath();
67
67
                        }
68
68
                        p->save();
69
 
                        if (imageClip.size() != 0)
70
 
                        {
71
 
                                p->setupPolygon(&imageClip);
72
 
                                p->setClipPath();
73
 
                        }
74
 
                        p->setupPolygon(&PoLine);
75
 
                        p->setClipPath();
76
69
                        if (Pfile.isEmpty())
77
70
                        {
78
71
                                if ((Frame) && (m_Doc->guidesSettings.framesShown))
131
124
                                }
132
125
                                else
133
126
                                {
 
127
                                        p->setupPolygon(&PoLine);
 
128
                                        p->setClipPath();
134
129
                                        if (imageFlippedH())
135
130
                                        {
136
131
                                                p->translate(Width, 0);
141
136
                                                p->translate(0, Height);
142
137
                                                p->scale(1, -1);
143
138
                                        }
 
139
                                        if (imageClip.size() != 0)
 
140
                                        {
 
141
                                                p->setupPolygon(&imageClip);
 
142
                                                p->setClipPath();
 
143
                                        }
144
144
                                        p->translate(LocalX*LocalScX, LocalY*LocalScY);
145
145
                                        p->scale(LocalScX, LocalScY);
146
146
                                        if (pixm.imgInfo.lowResType != 0)
352
352
                        fileT = new QLabel(infoGroup);
353
353
                        if (isInlineImage)
354
354
                                fileT->setText( tr("Embedded Image missing"));
 
355
                        else if (extensionIndicatesPDF(fi.suffix().toLower()))
 
356
                                fileT->setText(fi.fileName() + " " + tr("missing or corrupt"));
355
357
                        else
356
358
                                fileT->setText(fi.fileName() + " " + tr("missing"));
357
359
                        infoGroupLayout->addWidget( fileT, 1, 1 );
513
515
                        QFileInfo fi = QFileInfo(Pfile);
514
516
                        if (isInlineImage)
515
517
                                htmlText.append( tr("Embedded Image missing") + "<br/>");
 
518
                        else if (extensionIndicatesPDF(fi.suffix().toLower()))
 
519
                                htmlText.append( tr("File:") + " " + fi.fileName() + " " + tr("missing or corrupt") + "<br/>");
516
520
                        else
517
521
                                htmlText.append( tr("File:") + " " + fi.fileName() + " " + tr("missing") + "<br/>");
518
522
                }