← Back to branch summary

~ubuntu-branches/ubuntu/karmic/lcms/karmic

« back to all changes in this revision

Viewing changes to src/cmsmatsh.c

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2009-04-03 13:55:00 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20090403135500-psa3ox0my6u6a5cp
Tags: 1.18.dfsg-0ubuntu1
* New upstream release
* Remove 11_security_CVE-2009-0581_0723_0733.dpatch, security 
  issues fixed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cmsmatsh.c
144
144
       LPMATSHAPER NewMatShaper;
145
145
       int i, AllLinear;
146
146
 
 
147
           if (Matrix == NULL) return NULL;
 
148
           for (i=0; i < 3; i++) {
 
149
           
 
150
                   if (Tables[i] == NULL) return NULL;
 
151
           }
 
152
 
147
153
       NewMatShaper = (LPMATSHAPER) _cmsMalloc(sizeof(MATSHAPER));
148
154
       if (NewMatShaper)
149
155
              ZeroMemory(NewMatShaper, sizeof(MATSHAPER));
160
166
                     NewMatShaper -> dwFlags |= MATSHAPER_HASMATRIX;
161
167
 
162
168
       // Now, on the table characteristics
163
 
 
164
169
       cmsCalcL16Params(Tables[0] -> nEntries, &NewMatShaper -> p16);
165
170
 
166
171
       // Copy tables
167
172
 
168
173
       AllLinear = 0;
169
 
       for (i=0; i < 3; i++)
170
 
       {
 
174
       for (i=0; i < 3; i++) {
 
175
 
171
176
        LPWORD PtrW;
172
177
 
173
178
        PtrW = (LPWORD) _cmsMalloc(sizeof(WORD) * NewMatShaper -> p16.nSamples);