Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\XPM.cxx
Last modified2004-09-28 13:17:26.001 +0200
Size6.8 Kb (317 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\XPM.cxx
Last modified2006-03-16 13:07:08.000 +0100
Size6.9 Kb (323 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged3317
Inserted26
Deleted00
Ignored00
Changed00



   Comparison Details  

102 skipped lines
103U103U    height = atoi(line0);
104U104U    line0 = NextField(line0);
105U105U    nColours = atoi(line0);
  106A    line0 = NextField(line0);
  107A    if (atoi(line0) != 1) {
  108A        // Only one char per pixel is supported
  109A        return;
  110A    }
106U111U    codes = new char[nColours];
107U112U    colours = new ColourPair[nColours];
108U113U 
152 skipped lines
261U266U    for (int i = 0; i < len; i++) {
262U267U        if (set[i]->GetId() == id) {
263U268U        set[i]->Init(textForm);
  269A        set[i]->CopyDesiredColours();
264U270U        return;
265U271U        }
266U272U    }
51 skipped lines

   Text comparison Options  

Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

UExample of unchanged line
CExample of modified line
AExample of added line
RExample of removed line
IExample of ignored line
Modified text
Added text
Removed text

This report has been generated by Ellié Computing Merge on 2006-09-07 16:23:46.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.