← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Source/FreeImage/J2KHelper.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/J2KHelper.cpp
73
73
                                numcomps = 1;
74
74
                        } else {
75
75
                                // unknown type
76
 
                                throw "Unsupported format";
 
76
                                throw FI_MSG_ERROR_UNSUPPORTED_FORMAT;
77
77
                        }
78
78
                }
79
79
 
104
104
                                        break;
105
105
                        }
106
106
                } else {
107
 
                        throw "Unsupported format";
 
107
                        throw FI_MSG_ERROR_UNSUPPORTED_FORMAT;
108
108
                }
109
109
                if(!dib) {
110
 
                        throw "DIB allocation failed";
 
110
                        throw FI_MSG_ERROR_DIB_MEMORY;
111
111
                }
112
112
                
113
113
                if(image->comps[0].prec <= 8) {
310
310
 
311
311
                return dib;
312
312
 
313
 
        } catch(char *text) {
 
313
        } catch(const char *text) {
314
314
                if(dib) FreeImage_Unload(dib);
315
315
                FreeImage_OutputMessageProc(format_id, text);
316
316
                return NULL;
392
392
                // create the image 
393
393
                image = opj_image_create(numcomps, &cmptparm[0], color_space);
394
394
                if(!image) {
395
 
                        throw "DIB allocation failed";
 
395
                        throw FI_MSG_ERROR_DIB_MEMORY;
396
396
                }
397
397
 
398
398
                // set image offset and reference grid