← Back to branch summary

~ubuntu-branches/ubuntu/trusty/freeimage/trusty-proposed

« back to all changes in this revision

Viewing changes to .pc/disable_embedded_libraries.patch/Source/FreeImage/J2KHelper.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Howard
  • Date: 2014-01-13 21:57:45 UTC
  • mfrom: (8.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140113215745-3y21c8ro0ih30hfg
Tags: 3.15.4-1
http://bugs.debian.org/650485
* QA Upload
* New upstream minor release 
  - Includes fix to build on !linux (Closes: #650485)
* Refreshed patches (line endings had to change)
  - Remove document-mode.patch (accepted upstream)
* Lintian fixes: S-V 3.9.5, DM-Upload-Allowed removed
* Remove document-mode.patch (accepted upstream)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/disable_embedded_libraries.patch/Source/FreeImage/J2KHelper.cpp
347
347
                                        color_space = CLRSPC_GRAY;
348
348
                                        break;
349
349
                                case FIC_RGB:
350
 
                                        numcomps = 3;
351
 
                                        color_space = CLRSPC_SRGB;
 
350
                                        if(FreeImage_GetBPP(dib) == 32) {
 
351
                                                // 32-bit image with a fully opaque layer
 
352
                                                numcomps = 4;
 
353
                                                color_space = CLRSPC_SRGB;
 
354
                                        } else {
 
355
                                                // 24-bit image
 
356
                                                numcomps = 3;
 
357
                                                color_space = CLRSPC_SRGB;
 
358
                                        }
352
359
                                        break;
353
360
                                case FIC_RGBALPHA:
354
361
                                        numcomps = 4;