← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Source/FreeImage/PluginJP2.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/PluginJP2.cpp
164
164
                        io->seek_proc(handle, start_pos, SEEK_SET);
165
165
                        src = (BYTE*)malloc(file_length * sizeof(BYTE));
166
166
                        if(!src) {
167
 
                                throw "Memory allocation failed";
 
167
                                throw FI_MSG_ERROR_MEMORY;
168
168
                        }
169
169
                        if(io->read_proc(src, 1, file_length, handle) < 1) {
170
170
                                throw "Error while reading input stream";
247
247
                // set encoding parameters to default values
248
248
                opj_set_default_encoder_parameters(&parameters);
249
249
 
 
250
                parameters.tcp_numlayers = 0;
250
251
                // if no rate entered, apply a 16:1 rate by default
251
252
                if(flags == JP2_DEFAULT) {
252
253
                        parameters.tcp_rates[0] = (float)16;