← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Source/LibJPEG/jdcoefct.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/jdcoefct.c
187
187
        useful_width = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
188
188
                                                    : compptr->last_col_width;
189
189
        output_ptr = output_buf[compptr->component_index] +
190
 
          yoffset * compptr->DCT_scaled_size;
 
190
          yoffset * compptr->DCT_v_scaled_size;
191
191
        start_col = MCU_col_num * compptr->MCU_sample_width;
192
192
        for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
193
193
          if (cinfo->input_iMCU_row < last_iMCU_row ||
197
197
              (*inverse_DCT) (cinfo, compptr,
198
198
                              (JCOEFPTR) coef->MCU_buffer[blkn+xindex],
199
199
                              output_ptr, output_col);
200
 
              output_col += compptr->DCT_scaled_size;
 
200
              output_col += compptr->DCT_h_scaled_size;
201
201
            }
202
202
          }
203
203
          blkn += compptr->MCU_width;
204
 
          output_ptr += compptr->DCT_scaled_size;
 
204
          output_ptr += compptr->DCT_v_scaled_size;
205
205
        }
206
206
      }
207
207
    }
362
362
        (*inverse_DCT) (cinfo, compptr, (JCOEFPTR) buffer_ptr,
363
363
                        output_ptr, output_col);
364
364
        buffer_ptr++;
365
 
        output_col += compptr->DCT_scaled_size;
 
365
        output_col += compptr->DCT_h_scaled_size;
366
366
      }
367
 
      output_ptr += compptr->DCT_scaled_size;
 
367
      output_ptr += compptr->DCT_v_scaled_size;
368
368
    }
369
369
  }
370
370
 
654
654
        DC4 = DC5; DC5 = DC6;
655
655
        DC7 = DC8; DC8 = DC9;
656
656
        buffer_ptr++, prev_block_row++, next_block_row++;
657
 
        output_col += compptr->DCT_scaled_size;
 
657
        output_col += compptr->DCT_h_scaled_size;
658
658
      }
659
 
      output_ptr += compptr->DCT_scaled_size;
 
659
      output_ptr += compptr->DCT_v_scaled_size;
660
660
    }
661
661
  }
662
662