← Back to branch summary

~ubuntu-branches/ubuntu/trusty/scribus/trusty

« back to all changes in this revision

Viewing changes to scribus/util_color.cpp

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2013-05-16 20:34:07 UTC
  • mfrom: (1.1.13) (32.1.2 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130516203407-ztj7ebsivoo41dih
Tags: 1.4.2.dfsg+r18267-1ubuntu2
Avoid qreal/double type clashes on ARM.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/util_color.cpp
734
734
                else
735
735
                {
736
736
                        FileLoader fl(fileName);
737
 
                        int test = fl.TestFile();
 
737
                        int test = fl.testFile();
738
738
                        if ((test == FORMATID_SLA134IMPORT) || (test == FORMATID_SLA13XIMPORT) || (test == FORMATID_SLA12XIMPORT))
739
739
                        {
740
740
                                ColorList LColors;
741
 
                                if (fl.ReadColors(fileName, LColors))
 
741
                                if (fl.readColors(LColors))
742
742
                                {
743
743
                                        ColorList::Iterator it;
744
744
                                        for (it = LColors.begin(); it != LColors.end(); ++it)