Changeset 1651


Ignore:
Timestamp:
02/06/12 11:36:33 (2 years ago)
Author:
philmoz
Message:

Merged revision(s) 1650 from trunk:
Fix for potential incorrect bad pixel detection along bottom edge of sensor.

Location:
branches/release-1_0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/release-1_0

    • Property svn:mergeinfo changed
      /trunkmerged: 1650
  • branches/release-1_0/core/dng.c

    r1557 r1651  
    597597            { 
    598598                unsigned short l; 
    599                 for (l=0; l<7; l++) if (get_raw_pixel(c[0],c[1]+l+1)!=0) break; 
     599                for (l=0; l<7 && (c[1]+l+1)<CAM_ACTIVE_AREA_Y2; l++) if (get_raw_pixel(c[0],c[1]+l+1)!=0) break; 
    600600                c[1] = c[1] | (l << 13); 
    601601                if (f) fwrite(c, 1, 4, f); 
Note: See TracChangeset for help on using the changeset viewer.