← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/freeimage/oneiric

« back to all changes in this revision

Viewing changes to Source/LibJPEG/jcmarker.c

  • 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/LibJPEG/jcmarker.c
285
285
  emit_2bytes(cinfo, 3 * cinfo->num_components + 2 + 5 + 1); /* length */
286
286
 
287
287
  /* Make sure image isn't bigger than SOF field can handle */
288
 
  if ((long) cinfo->image_height > 65535L ||
289
 
      (long) cinfo->image_width > 65535L)
 
288
  if ((long) cinfo->jpeg_height > 65535L ||
 
289
      (long) cinfo->jpeg_width > 65535L)
290
290
    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) 65535);
291
291
 
292
292
  emit_byte(cinfo, cinfo->data_precision);
293
 
  emit_2bytes(cinfo, (int) cinfo->image_height);
294
 
  emit_2bytes(cinfo, (int) cinfo->image_width);
 
293
  emit_2bytes(cinfo, (int) cinfo->jpeg_height);
 
294
  emit_2bytes(cinfo, (int) cinfo->jpeg_width);
295
295
 
296
296
  emit_byte(cinfo, cinfo->num_components);
297
297
 
529
529
 
530
530
  /* Emit the proper SOF marker */
531
531
  if (cinfo->arith_code) {
532
 
    emit_sof(cinfo, M_SOF9);    /* SOF code for arithmetic coding */
 
532
    if (cinfo->progressive_mode)
 
533
      emit_sof(cinfo, M_SOF10); /* SOF code for progressive arithmetic */
 
534
    else
 
535
      emit_sof(cinfo, M_SOF9);  /* SOF code for sequential arithmetic */
533
536
  } else {
534
537
    if (cinfo->progressive_mode)
535
538
      emit_sof(cinfo, M_SOF2);  /* SOF code for progressive Huffman */