← Back to branch summary

~cosme/ubuntu/precise/freeimage/freeimage-3.15.1

« back to all changes in this revision

Viewing changes to Source/FreeImage/PluginRAS.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Cosme Domínguez Díaz
  • Date: 2010-07-20 13:42:15 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100720134215-xt1454zaedv3b604
Tags: 3.13.1-0ubuntu1
https://launchpad.net/bugs/607800
* New upstream release. Closes: (LP: #607800)
 - Updated debian/freeimage-get-orig-source script.
 - Removing no longer necessary debian/patches/* and
   the patch system in debian/rules.
 - Updated debian/rules to work with the new Makefiles.
 - Drop from -O3 to -O2 and use lzma compression saves
   ~10 MB of free space. 
* lintian stuff
 - fixed debhelper-but-no-misc-depends
 - fixed ldconfig-symlink-missing-for-shlib

Show diffs side-by-side

added added

removed removed

Lines of Context:
Source/FreeImage/PluginRAS.cpp
219
219
 
220
220
                        // Verify SUN identifier
221
221
 
222
 
                        if (header.magic != RAS_MAGIC)
223
 
                                throw "Invalid magic number";
 
222
                        if (header.magic != RAS_MAGIC) {
 
223
                                throw FI_MSG_ERROR_MAGIC_NUMBER;
 
224
                        }
224
225
 
225
226
                        // Allocate a new DIB
226
227
 
239
240
                                        break;
240
241
                        }
241
242
 
242
 
                        if (dib == NULL)
243
 
                                throw "DIB allocation failed";
 
243
                        if (dib == NULL) {
 
244
                                throw FI_MSG_ERROR_DIB_MEMORY;
 
245
                        }
244
246
 
245
247
                        // Check the file format
246
248
 
265
267
                                        break;
266
268
 
267
269
                                default:
268
 
                                        throw "Unsupported Sun rasterfile";
 
270
                                        throw FI_MSG_ERROR_UNSUPPORTED_FORMAT;
269
271
                        }
270
272
 
271
273
                        // set up the colormap if needed